linus: uisimulator/x11 button-x11.c,1.22,1.23

Update of /cvsroot/rockbox/uisimulator/x11
In directory labb.contactor.se:/var/tmp/cvs-serv28298/uisimulator/x11

Modified Files:
        button-x11.c 
Log Message:
Somewhat better key combination handling

Index: button-x11.c
===================================================================
RCS file: /cvsroot/rockbox/uisimulator/x11/button-x11.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- button-x11.c        21 Jul 2004 08:29:22 -0000      1.22
+++ button-x11.c        23 Jul 2004 21:38:43 -0000      1.23
@@ -49,6 +49,8 @@
 
 extern int screenhack_handle_events(bool *release, bool *repeat);
 
+int button_state = 0;
+
 static int get_raw_button (void)
 {
     int k;
@@ -144,13 +146,22 @@
             break;
     }
 
-    if(release)
+    if(release) {
         /* return a release event */
+        button_state &= ~k;
         k |= BUTTON_REL;
+    } else {
+        if(k) {
+            button_state |= k;
+            k = button_state;
+        }
+    }
 
     if(repeat)
         k |= BUTTON_REPEAT;
 
+    if(k)
+        DEBUGF("key: %08x\n", k);
     return k;
 }
 

_______________________________________________
http://cool.haxx.se/mailman/listinfo/rockbox-cvs