Support multi-button and WSAD joystick keyboard mapping

Author: smokku

src/systems/x65.c

@@ -393,11 +393,23 @@ void x65_key_down(x65_t* sys, int key_code) {
     CHIPS_ASSERT(sys && sys->valid);
     uint8_t m = 0;
     switch (key_code) {
-        case 0x20: m = X65_JOYSTICK_BTN; break;    // SPACE
-        case 0x08: m = X65_JOYSTICK_LEFT; break;   // CURSOR_LEFT
-        case 0x09: m = X65_JOYSTICK_RIGHT; break;  // CURSOR_RIGHT
-        case 0x0A: m = X65_JOYSTICK_DOWN; break;   // CURSOR_DOWN
-        case 0x0B: m = X65_JOYSTICK_UP; break;     // CURSOR_UP
+        case 0x20:                                  // SPACE
+        case 0x4A:                                  // J
+        case 0x5A: m = X65_JOYSTICK_BTN; break;     // Z
+        case 0x4B:                                  // K
+        case 0x58: m = X65_JOYSTICK_BTN2; break;    // X
+        case 0x4C:                                  // L
+        case 0x43: m = X65_JOYSTICK_BTN3; break;    // C
+        case 0x3B:                                  // ;
+        case 0x56: m = X65_JOYSTICK_BTN4; break;    // V
+        case 0x41:                                  // A
+        case 0x107: m = X65_JOYSTICK_LEFT; break;   // CURSOR_LEFT
+        case 0x44:                                  // D
+        case 0x106: m = X65_JOYSTICK_RIGHT; break;  // CURSOR_RIGHT
+        case 0x53:                                  // S
+        case 0x108: m = X65_JOYSTICK_DOWN; break;   // CURSOR_DOWN
+        case 0x57:                                  // W
+        case 0x109: m = X65_JOYSTICK_UP; break;     // CURSOR_UP
         default: break;
     }
     if (m != 0) {
@@ -418,11 +430,23 @@ void x65_key_up(x65_t* sys, int key_code) {
     CHIPS_ASSERT(sys && sys->valid);
     uint8_t m = 0;
     switch (key_code) {
-        case 0x20: m = X65_JOYSTICK_BTN; break;
-        case 0x08: m = X65_JOYSTICK_LEFT; break;
-        case 0x09: m = X65_JOYSTICK_RIGHT; break;
-        case 0x0A: m = X65_JOYSTICK_DOWN; break;
-        case 0x0B: m = X65_JOYSTICK_UP; break;
+        case 0x20:
+        case 0x4A:
+        case 0x5A: m = X65_JOYSTICK_BTN; break;
+        case 0x4B:
+        case 0x58: m = X65_JOYSTICK_BTN2; break;
+        case 0x4C:
+        case 0x43: m = X65_JOYSTICK_BTN3; break;
+        case 0x3B:
+        case 0x56: m = X65_JOYSTICK_BTN4; break;
+        case 0x41:
+        case 0x107: m = X65_JOYSTICK_LEFT; break;
+        case 0x44:
+        case 0x106: m = X65_JOYSTICK_RIGHT; break;
+        case 0x53:
+        case 0x108: m = X65_JOYSTICK_DOWN; break;
+        case 0x57:
+        case 0x109: m = X65_JOYSTICK_UP; break;
         default: break;
     }
     if (m != 0) {

src/systems/x65.h

@@ -66,6 +66,9 @@ typedef enum {
 #define X65_JOYSTICK_LEFT  (1 << 2)
 #define X65_JOYSTICK_RIGHT (1 << 3)
 #define X65_JOYSTICK_BTN   (1 << 5)
+#define X65_JOYSTICK_BTN2  (1 << 7)
+#define X65_JOYSTICK_BTN3  (1 << 4)
+#define X65_JOYSTICK_BTN4  (1 << 6)
 
 // special keyboard keys
 #define X65_KEY_SPACE    (0x20)  // space

src/x65.c

@@ -329,57 +329,15 @@ void app_input(const sapp_event* event) {
         return;
     }
 #endif
-    const bool shift = event->modifiers & SAPP_MODIFIER_SHIFT;
     switch (event->type) {
-        int c;
-        case SAPP_EVENTTYPE_CHAR:
-            c = (int)event->char_code;
-            if ((c > 0x20) && (c < 0x7F)) {
-                // need to invert case (unshifted is upper caps, shifted is lower caps
-                if (isupper(c)) {
-                    c = tolower(c);
-                }
-                else if (islower(c)) {
-                    c = toupper(c);
-                }
-                x65_key_down(&state.x65, c);
-                x65_key_up(&state.x65, c);
-            }
-            break;
-        case SAPP_EVENTTYPE_KEY_DOWN:
+        case SAPP_EVENTTYPE_KEY_DOWN: x65_key_down(&state.x65, event->key_code); break;
         case SAPP_EVENTTYPE_KEY_UP:
+            x65_key_up(&state.x65, event->key_code);
             if (event->key_code == SAPP_KEYCODE_Q) {
                 if (event->modifiers == SAPP_MODIFIER_SUPER || event->modifiers == SAPP_MODIFIER_CTRL) {
                     sapp_request_quit();
                 }
             }
-            switch (event->key_code) {
-                case SAPP_KEYCODE_SPACE: c = 0x20; break;
-                case SAPP_KEYCODE_LEFT: c = 0x08; break;
-                case SAPP_KEYCODE_RIGHT: c = 0x09; break;
-                case SAPP_KEYCODE_DOWN: c = 0x0A; break;
-                case SAPP_KEYCODE_UP: c = 0x0B; break;
-                case SAPP_KEYCODE_ENTER: c = 0x0D; break;
-                case SAPP_KEYCODE_BACKSPACE: c = shift ? 0x0C : 0x01; break;
-                case SAPP_KEYCODE_ESCAPE: c = shift ? 0x13 : 0x03; break;
-                case SAPP_KEYCODE_F1: c = 0xF1; break;
-                case SAPP_KEYCODE_F2: c = 0xF2; break;
-                case SAPP_KEYCODE_F3: c = 0xF3; break;
-                case SAPP_KEYCODE_F4: c = 0xF4; break;
-                case SAPP_KEYCODE_F5: c = 0xF5; break;
-                case SAPP_KEYCODE_F6: c = 0xF6; break;
-                case SAPP_KEYCODE_F7: c = 0xF7; break;
-                case SAPP_KEYCODE_F8: c = 0xF8; break;
-                default: c = 0; break;
-            }
-            if (c) {
-                if (event->type == SAPP_EVENTTYPE_KEY_DOWN) {
-                    x65_key_down(&state.x65, c);
-                }
-                else {
-                    x65_key_up(&state.x65, c);
-                }
-            }
             break;
         default: break;
     }