Changeset f51359c in buchla-emu for emu/sdl.c

Timestamp:

09/05/2017 09:49:45 AM (7 years ago)

Author:

Alexander Heinrich <alex.heinrich@…>

Branches:

master

Children:

c8a92ef

Parents:

5475ecf (diff), ca77925 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​ssh://bob.lopatic.de:11501/home/git/buchla-emu into lcda

File:

• emu/sdl.c (modified) (4 diffs)

emu/sdl.c

@@ -67 +67 @@
 
         bool rel_mod = false;
+        uint32_t win = 0;
 
         while (SDL_AtomicGet(&run) != 0) {
@@ -101 +102 @@
                                 SDL_AtomicSet(&run, 0);
                                 continue;
+                        }
+
+                        if (ev.type == SDL_WINDOWEVENT) {
+                                if (ev.window.event == SDL_WINDOWEVENT_FOCUS_GAINED) {
+                                        ver("sdl ev win %u", ev.window.windowID);
+                                        win = ev.window.windowID;
+                                }
                         }
 
@@ -138 +146 @@
                         if (ev.type == SDL_TEXTINPUT) {
                                 ver("sdl ev text input %d", ev.text.text[0]);
-                                ser_text(&ev.text);
+
+                                if (win == ser_win) {
+                                        ser_text(&ev.text);
+                                }
+
                                 continue;
                         }
@@ -144 +156 @@
                         if (ev.type == SDL_KEYDOWN) {
                                 ver("sdl ev key down %d", (int32_t)ev.key.keysym.sym);
-                                ser_key(&ev.key);
+
+                                if (win == ser_win) {
+                                        ser_key(&ev.key);
+                                }
+                                else if (win == vid_win) {
+                                        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);
+                                }
+
                                 continue;
                         }