webOS: magic remote improvements for text entry

Author: cscd98

input/common/wayland_common_webos.c

@@ -809,6 +809,7 @@ void wl_keyboard_handle_key_webos(void *data,
    int value = (state == WL_KEYBOARD_KEY_STATE_PRESSED) ? 1 : 0;
    gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data;
    uint32_t keysym            = key;
+   input_driver_state_t *input_st = input_state_get_ptr();
 
    /* Handle 'duplicate' inputs that correspond
     * to the same RETROK_* key */
@@ -830,6 +831,12 @@ void wl_keyboard_handle_key_webos(void *data,
       case KEY_WAYLAND_WEBOS_BLUE:
          keysym = KEY_A;
          break;
+      case KEY_ENTER:
+         /* When in menu and in virtual keyboard entry,
+          * map magic remote wheel button click to LCTRL for character selection */
+         if (input_st && (input_st->flags & INP_FLAG_KB_MAPPING_BLOCKED))
+            keysym = KEY_LEFTCTRL;
+         break;
       case KEY_OK:
       case KEY_SELECT:
          keysym = KEY_ENTER;

input/drivers/sdl_input.c

@@ -466,6 +466,9 @@ static void sdl_input_poll(void *data)
          unsigned code = input_keymaps_translate_keysym_to_rk(
                event.key.keysym.sym);
 #ifdef WEBOS
+         input_driver_state_t *input_st = input_state_get_ptr();
+         bool osk_active = input_st && (input_st->flags & INP_FLAG_KB_MAPPING_BLOCKED);
+
          switch ((int) event.key.keysym.scancode)
          {
             case SDL_WEBOS_SCANCODE_BACK:
@@ -489,6 +492,14 @@ static void sdl_input_poll(void *data)
             case SDL_WEBOS_SCANCODE_EXIT:
                code = RETROK_F1;
                break;
+            case SDL_SCANCODE_RIGHT:
+            case SDL_SCANCODE_LEFT:
+            case SDL_SCANCODE_DOWN:
+            case SDL_SCANCODE_UP:
+               /* navigation only, skip text insertion */
+               if (osk_active)
+                  return;
+               break;
             default:
                break;
          }