rg_gui: Changed rg_keyboard_map_t to match #220

Author: ducalex

components/retro-go/rg_gui.c

@@ -1054,7 +1054,7 @@ char *rg_gui_input_str(const char *title, const char *message, const char *defau
     return default_value ? strdup(default_value) : NULL;
 }
 
-void rg_gui_draw_keyboard(const rg_keyboard_map_t *map, size_t cursor)
+void rg_gui_draw_keyboard(const rg_keyboard_layout_t *map, size_t cursor)
 {
     RG_ASSERT_ARG(map);
 
@@ -1072,9 +1072,9 @@ void rg_gui_draw_keyboard(const rg_keyboard_map_t *map, size_t cursor)
     {
         int x = x_pos + 8 + (i % map->columns) * 16;
         int y = y_pos + 8 + (i / map->columns) * 16;
-        if (!map->data[i])
+        if (!map->layout[i])
             continue;
-        buf[0] = map->data[i];
+        buf[0] = map->layout[i];
         rg_gui_draw_text(x + 1, y + 1, 14, buf, C_BLACK, i == cursor ? C_CYAN : C_IVORY, RG_TEXT_ALIGN_CENTER);
     }
 }

components/retro-go/rg_gui.h

@@ -122,7 +122,7 @@ void rg_gui_draw_dialog(const char *header, const rg_gui_option_t *options, int
 void rg_gui_draw_image(int x_pos, int y_pos, int width, int height, bool resample, const rg_image_t *img);
 void rg_gui_draw_hourglass(void); // This should be moved to system or display...
 void rg_gui_draw_status_bars(void);
-void rg_gui_draw_keyboard(const rg_keyboard_map_t *map, size_t cursor);
+void rg_gui_draw_keyboard(const rg_keyboard_layout_t *map, size_t cursor);
 void rg_gui_draw_message(const char *format, ...);
 
 intptr_t rg_gui_dialog(const char *title, const rg_gui_option_t *options, int selected_index);

components/retro-go/rg_input.c

@@ -432,18 +432,16 @@ const char *rg_input_get_key_mapping(rg_key_t key)
     return NULL;
 }
 
-const rg_keyboard_map_t virtual_map1 = {
+const rg_keyboard_layout_t virtual_map1 = {
+    .layout = "0123456789"
+              "ABCDEFGHIJ"
+              "KLMNOPQRST"
+              "UVWXYZ ,. ",
     .columns = 10,
     .rows = 4,
-    .data = {
-        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-        'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
-        'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
-        'U', 'V', 'W', 'X', 'Y', 'Z', ' ', ',', '.', ' ',
-    }
 };
 
-int rg_input_read_keyboard(const rg_keyboard_map_t *map)
+int rg_input_read_keyboard(const rg_keyboard_layout_t *map)
 {
     int cursor = -1;
     int count = map->columns * map->rows;
@@ -459,7 +457,7 @@ int rg_input_read_keyboard(const rg_keyboard_map_t *map)
         int prev_cursor = cursor;
 
         if (joystick & RG_KEY_A)
-            return map->data[cursor];
+            return map->layout[cursor];
         if (joystick & RG_KEY_B)
             break;
 

components/retro-go/rg_input.h

@@ -90,9 +90,12 @@ typedef struct
 
 typedef struct
 {
-    size_t columns, rows;
-    char data[];
-} rg_keyboard_map_t;
+    const char *layout;
+    size_t columns;
+    size_t rows;
+    bool is_upper;
+    bool is_symbols;
+} rg_keyboard_layout_t;
 
 void rg_input_init(void);
 void rg_input_deinit(void);
@@ -101,7 +104,7 @@ bool rg_input_wait_for_key(rg_key_t mask, bool pressed, int timeout_ms);
 const char *rg_input_get_key_name(rg_key_t key);
 const char *rg_input_get_key_mapping(rg_key_t key);
 uint32_t rg_input_read_gamepad(void);
-int rg_input_read_keyboard(const rg_keyboard_map_t *map);
+int rg_input_read_keyboard(const rg_keyboard_layout_t *map);
 rg_battery_t rg_input_read_battery(void);
 bool rg_input_read_gamepad_raw(uint32_t *out);
 bool rg_input_read_keyboard_raw(int *out);

retro-core/main/main_sms.c

@@ -6,15 +6,10 @@ static rg_app_t *app;
 static rg_surface_t *updates[2];
 static rg_surface_t *currentUpdate;
 
-const rg_keyboard_map_t coleco_keyboard = {
+const rg_keyboard_layout_t coleco_keyboard = {
+    .layout = "123" "456" "789" "*0#",
     .columns = 3,
     .rows = 4,
-    .data = {
-        '1', '2', '3',
-        '4', '5', '6',
-        '7', '8', '9',
-        '*', '0', '#',
-    },
 };
 
 static const char *SETTING_PALETTE = "palette";