Update mouse handling to enable chording

1 files changed, 19 insertions, 7 deletions

diff --git a/src/main.c b/src/main.c
index 8a694a8..6f5034b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -199,19 +199,29 @@ handle_input(Uxn *u) {
         evaluxn(u, mempeek16(devctrl->dat, 0));
         devctrl->dat[3] = 0;
     } else if (control_method == CONTROL_MOUSE) {
-        devmouse->dat[7] = 0x00;
+        // Detect "mouse key press".
+                Uint8 flag = devmouse->dat[6];
         if (key_pressed(KEY_B) | key_hold(KEY_B)) {
-            devmouse->dat[6] |= 0x01;
-            devmouse->dat[7] = 0x01;
+            flag |= 0x01;
         } else {
-            devmouse->dat[6] &= ~0x01;
+            flag &= ~0x01;
         }
         if (key_pressed(KEY_A) | key_hold(KEY_A)) {
-            devmouse->dat[6] |= 0x10;
-            devmouse->dat[7] = 0x10;
+            flag |= 0x10;
         } else {
-            devmouse->dat[6] &= ~0x10;
+            flag &= ~0x10;
         }
+
+        // Handle chording.
+        devmouse->dat[6] = flag;
+                if(flag == 0x10 && (devmouse->dat[6] & 0x01)) {
+                        devmouse->dat[7] = 0x01;
+        }
+                if(flag == 0x01 && (devmouse->dat[6] & 0x10)) {
+                        devmouse->dat[7] = 0x10;
+        }
+
+        // Detect mouse movement.
         if (key_pressed(KEY_UP) | key_hold(KEY_UP)) {
             mouse.y = CLAMP(mouse.y - MOUSE_DELTA, 0, SCREEN_HEIGHT - 8);
         }
@@ -224,6 +234,8 @@ handle_input(Uxn *u) {
         if (key_pressed(KEY_RIGHT) | key_hold(KEY_RIGHT)) {
             mouse.x = CLAMP(mouse.x + MOUSE_DELTA, 0, SCREEN_WIDTH - 8);
         }
+
+        // Eval mouse.
         mempoke16(devmouse->dat, 0x2, mouse.x);
         mempoke16(devmouse->dat, 0x4, mouse.y);
             evaluxn(u, mempeek16(devmouse->dat, 0));