Changeset 67fecc3 in buchla-emu for emu/sdl.c

Timestamp:

09/09/2017 11:11:32 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

0d83ce8

Parents:

e26a632 (diff), 18cbd53 (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.

git-author:

Thomas Lopatic <thomas@…> (09/09/2017 11:11:27 PM)

git-committer:

Thomas Lopatic <thomas@…> (09/09/2017 11:11:32 PM)

Message:

Merge LCD emulation.

File:

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

emu/sdl.c

@@ -27 +27 @@
 
 static sdl_func_t sdl_funcs[] = {
-        ser_sdl, vid_sdl
+        lcd_sdl, ser_sdl, vid_sdl
 };
 
@@ -161 +161 @@
                                 }
                                 else if (win == vid_win) {
-                                        kbd_key(&ev.key, true);
+                                        kbd_key(&ev.key, true, true);
+                                }
+                                else if (win == lcd_win) {
+                                        kbd_key(&ev.key, false, true);
                                 }
 
@@ -171 +174 @@
 
                                 if (win == vid_win) {
-                                        kbd_key(&ev.key, false);
+                                        kbd_key(&ev.key, true, false);
+                                }
+                                else if (win == lcd_win) {
+                                        kbd_key(&ev.key, false, false);
                                 }