Changeset ca77925 in buchla-emu for emu

Timestamp:

09/04/2017 05:55:08 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

e26a632, f51359c

Parents:

fffab34

Message:

More accurate key up/down.

Location:

emu

Files:

• all.h (modified) (1 diff)
• kbd.c (modified) (2 diffs)
• sdl.c (modified) (2 diffs)

emu/all.h

@@ -162 +162 @@
 extern void kbd_write(uint32_t off, int32_t sz, uint32_t val);
 
-extern void kbd_text(SDL_TextInputEvent *ev);
-extern void kbd_key(SDL_KeyboardEvent *ev);
+extern void kbd_key(SDL_KeyboardEvent *ev, bool dn);

emu/kbd.c

@@ -119 +119 @@
 #endif
 
-void kbd_key(SDL_KeyboardEvent *ev)
-{
-        static bool on[24];
-
+void kbd_key(SDL_KeyboardEvent *ev, bool dn)
+{
         if ((ev->keysym.mod & KMOD_SHIFT) != 0 &&
                         ev->keysym.sym >= SDLK_a && ev->keysym.sym <= SDLK_x) {
                 int32_t i = ev->keysym.sym - SDLK_a;
-                on[i] = !on[i];
-
-                if (on[i]) {
+                ver2("kbd key %d %s", i, dn ? "dn" : "up");
+
+                if (dn) {
                         key_touch(1 + i, 0x7f);
                 }
@@ -135 +133 @@
                 }
 
-                ver2("kbd key %d %s", i, on[i] ? "on" : "off");
-        }
-}
-
-void kbd_text(SDL_TextInputEvent *ev)
-{
-        for (int32_t i = 0; ev->text[i] != 0; ++i) {
-                if (ev->text[i] >= '0' && ev->text[i] <= '9') {
-                        ver2("kbd dat %c", ev->text[i]);
-                        int32_t sig = 60 + ev->text[i] - '0';
-                        but_on(sig);
-                        but_off(sig);
-                        continue;
-                }
-
-                switch (ev->text[i]) {
-                case 'x':
-                        ver2("kbd x");
-                        but_on(70);
-                        but_off(70);
+                return;
+        }
+
+        int32_t sig;
+
+        if (ev->keysym.sym >= SDLK_0 && ev->keysym.sym <= '9') {
+                int32_t i = ev->keysym.sym - SDLK_0;
+                ver2("kbd dat %d %s", i, dn ? "dn" : "up");
+                sig = 60 + i;
+        }
+        else {
+                switch (ev->keysym.sym) {
+                case SDLK_x:
+                        ver2("kbd x %s", dn ? "dn" : "up");
+                        sig = 70;
                         break;
 
-                case 'e':
-                        ver2("kbd e");
-                        but_on(71);
-                        but_off(71);
+                case SDLK_e:
+                        ver2("kbd e %s", dn ? "dn" : "up");
+                        sig = 71;
                         break;
 
-                case 'm':
-                        ver2("kbd m");
-                        but_on(72);
-                        but_off(72);
+                case SDLK_m:
+                        ver2("kbd m %s", dn ? "dn" : "up");
+                        sig = 72;
                         break;
-                }
+
+                default:
+                        return;
+                }
+        }
+
+        if (dn) {
+                but_on(sig);
+        }
+        else {
+                but_off(sig);
         }
 }

emu/sdl.c

@@ -150 +150 @@
                                         ser_text(&ev.text);
                                 }
-                                else if (win == vid_win) {
-                                        kbd_text(&ev.text);
-                                }
 
                                 continue;
@@ -164 +161 @@
                                 }
                                 else if (win == vid_win) {
-                                        kbd_key(&ev.key);
+                                        kbd_key(&ev.key, true);
+                                }
+
+                                continue;
+                        }
+
+                        if (ev.type == SDL_KEYUP) {
+                                ver("sdl ev key up %d", (int32_t)ev.key.keysym.sym);
+
+                                if (win == vid_win) {
+                                        kbd_key(&ev.key, false);
                                 }