Changeset 200Tweet

Timestamp:

Nov 19, 2003, 6:49:43 PM (19 years ago)

Author:

Sam Hocevar

Message:

• src/io.c: + Fixed a bug in the mouse coordinates reporting.

Location:

libcaca/trunk/src

Files:

• blit.c (modified) (2 diffs)
• caca.c (modified) (2 diffs)
• io.c (modified) (1 diff)

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;
 

libcaca/trunk/src/caca.c

@@ -98 +98 @@
     SLang_init_tty(-1, 0, 1);
 
-    SLkp_define_keysym("\e[M", 1001);
-
     if(SLsmg_init_smg() == -1)
     {
@@ -110 +108 @@
     SLsmg_cls();
     SLtt_set_cursor_visibility(0);
-    SLtt_set_mouse_mode (1, 0);
+    SLkp_define_keysym("\e[M", 1001);
+    SLtt_set_mouse_mode(1, 0);
     SLsmg_refresh();
 

libcaca/trunk/src/io.c

@@ -103 +103 @@
             key[5] = _read_key();
 
-            event |= (int)(key[3] - ' ') << 8;
-            event |= (int)(key[4] - ' ') << 4;
+            event |= (int)(key[3] - ' ') << 16;
+            event |= (int)(key[4] - ' ') << 8;
             event |= (int)(key[5] - ' ') << 0;