Changeset 199 for libcaca/trunk/src/blit.cTweet

Timestamp:

Nov 19, 2003, 6:32:10 PM (19 years ago)

Author:

Sam Hocevar

Message:

• src/io.c: + Renamed sdl_get_key() into sdl_get_event(). + Handle mouse clicks.
• src/caca.c: + Activate the terminal's mouse handling if supported.

File:

• libcaca/trunk/src/blit.c (modified) (3 diffs)

libcaca/trunk/src/blit.c

@@ -102 +102 @@
     }
 
-    //pitch = (3 * w + 3) / 4 * 4;
-    pitch = 4 * w;
+    pitch = (3 * w + 3) / 4 * 4;
+    //pitch = 4 * w;
 
     for(y = y1 > 0 ? y1 : 0; y <= y2 && y <= (int)caca_get_height(); y++)
@@ -115 +115 @@
             int fromx = w * (x - x1) / (x2 - x1 + 1);
             int fromy = h * (y - y1) / (y2 - y1 + 1);
-            //int r = ((unsigned char *)pixels)[3 * fromx + pitch * fromy];
-            //int g = ((unsigned char *)pixels)[3 * fromx + 1 + pitch * fromy];
-            //int b = ((unsigned char *)pixels)[3 * fromx + 2 + pitch * fromy];
-            int b = ((unsigned char *)pixels)[4 * fromx + pitch * fromy];
-            int g = ((unsigned char *)pixels)[4 * fromx + 1 + pitch * fromy];
-            int r = ((unsigned char *)pixels)[4 * fromx + 2 + pitch * fromy];
+            int r = ((unsigned char *)pixels)[3 * fromx + pitch * fromy];
+            int g = ((unsigned char *)pixels)[3 * fromx + 1 + pitch * fromy];
+            int b = ((unsigned char *)pixels)[3 * fromx + 2 + pitch * fromy];
+            //int b = ((unsigned char *)pixels)[4 * fromx + pitch * fromy];
+            //int g = ((unsigned char *)pixels)[4 * fromx + 1 + pitch * fromy];
+            //int r = ((unsigned char *)pixels)[4 * fromx + 2 + pitch * fromy];
             int hue, sat, val;
 
@@ -143 +143 @@
                     hue = 1280 + 256 * (r - g) / delta;
 
-                hue = (hue + 128 + 8 * _get_dither()) / 256;
+                hue = (hue + 128 + 16 * _get_dither()) / 256;
 
                 if(val > (_get_dither() + 40) * 4)