Changeset 81d7cdc in buchla-emu

Timestamp:

09/09/2017 03:16:51 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

18cbd53

Parents:

1b30217

Message:

Support LCD buttons.

Location:

emu

Files:

• all.h (modified) (2 diffs)
• kbd.c (modified) (2 diffs)
• lcd.c (modified) (4 diffs)
• sdl.c (modified) (2 diffs)

emu/all.h

@@ -69 +69 @@
 extern uint32_t vid_win;
 extern uint32_t ser_win;
+extern uint32_t lcd_win;
 
 extern void sdl_init(void);
@@ -164 +165 @@
 extern void kbd_write(uint32_t off, int32_t sz, uint32_t val);
 
-extern void kbd_key(SDL_KeyboardEvent *ev, bool dn);
+extern void kbd_key(SDL_KeyboardEvent *ev, bool vid, bool dn);

emu/kbd.c

@@ -119 +119 @@
 #endif
 
-void kbd_key(SDL_KeyboardEvent *ev, bool dn)
+static void vid_key(SDL_KeyboardEvent *ev, bool dn)
 {
         if ((ev->keysym.mod & KMOD_SHIFT) != 0 &&
@@ -173 +173 @@
 }
 
+static void lcd_key(SDL_KeyboardEvent *ev, bool dn)
+{
+        if ((ev->keysym.mod & KMOD_CTRL) != 0 &&
+                        ev->keysym.sym >= SDLK_a && ev->keysym.sym <= SDLK_n) {
+                int32_t i = ev->keysym.sym - SDLK_a;
+                ver2("kbd lcd %d %s", i, dn ? "dn" : "up");
+
+                if (dn) {
+                        but_on(39 + i);
+                }
+                else {
+                        but_off(39 + i);
+                }
+        }
+}
+
+void kbd_key(SDL_KeyboardEvent *ev, bool vid, bool dn)
+{
+        if (vid) {
+                vid_key(ev, dn);
+        }
+        else {
+                lcd_key(ev, dn);
+        }
+}
+
 void kbd_init(void)
 {

emu/lcd.c

@@ -64 +64 @@
 
 static SDL_Window *win;
+uint32_t lcd_win;
+
 static SDL_Renderer *ren;
 static SDL_atomic_t frame;
@@ -116 +118 @@
         for (int32_t y = 0; y < TXT_H; ++y) {
                 char line[TXT_W + 1];
+                line[TXT_W] = 0;
 
                 if (SDL_LockMutex(cpu_mutex) < 0) {
@@ -132 +135 @@
                         }
                 }
-
-                line[TXT_W] = 0;
 
                 SDL_Surface *lin = TTF_RenderText_Blended(fon, line, TXT_FGR);
@@ -207 +208 @@
         }
 
+        lcd_win = SDL_GetWindowID(win);
+
+        if (lcd_win == 0) {
+                fail("SDL_GetWindowID() failed: %s", SDL_GetError());
+        }
+
         ren = SDL_CreateRenderer(win, -1, 0);
 

emu/sdl.c

@@ -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);
                                 }