overlay: allow touch mouse/lightgun to still work when controller is connected

Author: warmenhoven

input/input_driver.c

@@ -3075,6 +3075,9 @@ void input_overlay_set_alpha_mod(
    if (!ol)
       return;
 
+   if (ol->flags & INPUT_OVERLAY_GAMEPAD_HIDDEN)
+      mod = 0.0f;
+
    for (i = 0; i < ol->active->load_images_size; i++)
    {
       if (input_overlay_get_visibility(visibility, i)
@@ -3776,6 +3779,7 @@ static void input_poll_overlay(
          /* Check hitboxes only if this touch pointer
           * is not controlling a pointing device */
          if (   ol->flags & INPUT_OVERLAY_ENABLE
+             && !(ol->flags & INPUT_OVERLAY_GAMEPAD_HIDDEN)
              && !BIT16_GET(ptrdev_touch_mask, i))
             hitbox_pressed = input_overlay_poll(
                   ol, &polled_data, i, old_i,
@@ -5561,7 +5565,8 @@ static bool input_overlay_want_hidden(void)
    if (settings->bools.input_overlay_hide_in_menu)
       hide = (menu_state_get_ptr()->flags & MENU_ST_FLAG_ALIVE) != 0;
 #endif
-   if (settings->bools.input_overlay_hide_when_gamepad_connected)
+   if (settings->bools.input_overlay_hide_when_gamepad_connected
+         && !settings->bools.input_overlay_pointer_enable)
       hide = hide || (input_config_get_device_name(0) != NULL);
 
    return hide;
@@ -5661,6 +5666,16 @@ static void input_overlay_loaded(retro_task_t *task,
    if (!enable_overlay)
       input_overlay_unload();
 
+   /* Soft-hide when gamepad connected but pointer input enabled */
+   {
+      settings_t *settings = config_get_ptr();
+      if (enable_overlay
+            && settings->bools.input_overlay_hide_when_gamepad_connected
+            && settings->bools.input_overlay_pointer_enable
+            && input_config_get_device_name(0) != NULL)
+         ol->flags |= INPUT_OVERLAY_GAMEPAD_HIDDEN;
+   }
+
    input_overlay_set_eightway_diagonal_sensitivity();
 
    /* Trigger viewport recalculation - overlay may have viewport override */

input/input_overlay.h

@@ -119,7 +119,8 @@ enum INPUT_OVERLAY_FLAGS
    INPUT_OVERLAY_ENABLE  = (1 << 0),
    INPUT_OVERLAY_ALIVE   = (1 << 1),
    INPUT_OVERLAY_BLOCKED = (1 << 2),
-   INPUT_OVERLAY_IS_OSK  = (1 << 3)
+   INPUT_OVERLAY_IS_OSK  = (1 << 3),
+   INPUT_OVERLAY_GAMEPAD_HIDDEN = (1 << 4)
 };
 
 enum OVERLAY_FLAGS

runloop.c

@@ -5727,15 +5727,26 @@ static enum runloop_state_enum runloop_check_state(
          static bool last_controller_connected = false;
          bool controller_connected             = (input_config_get_device_name(0) != NULL);
 
-         if (controller_connected != last_controller_connected)
+         /* When pointer input is enabled, soft-hide instead of
+          * unloading so mouse/lightgun input remains functional.
+          * Level-triggered: enforce flag state every frame. */
+         if (   settings->bools.input_overlay_pointer_enable
+             && input_st->overlay_ptr)
+         {
+            if (controller_connected)
+               input_st->overlay_ptr->flags |=  INPUT_OVERLAY_GAMEPAD_HIDDEN;
+            else
+               input_st->overlay_ptr->flags &= ~INPUT_OVERLAY_GAMEPAD_HIDDEN;
+         }
+         else if (controller_connected != last_controller_connected)
          {
             if (controller_connected)
                input_overlay_unload();
             else
                input_overlay_init();
-
-            last_controller_connected = controller_connected;
          }
+
+         last_controller_connected = controller_connected;
       }
 
       /* Check next overlay hotkey */

tasks/task_overlay.c

@@ -375,7 +375,22 @@ static bool task_overlay_load_desc(
       for (; tmp; tmp = strtok_r(NULL, "|", &save))
       {
          if (!string_is_equal(tmp, "nul"))
-            BIT256_SET(desc->button_mask, input_config_translate_str_to_bind_id(tmp));
+         {
+            unsigned bind_id = input_config_translate_str_to_bind_id(tmp);
+            /* Retry without "_enable" suffix for overlay compat */
+            if (bind_id == RARCH_BIND_LIST_END)
+            {
+               size_t len = strlen(tmp);
+               if (len > 7 && string_is_equal(tmp + len - 7, "_enable"))
+               {
+                  char stripped[64];
+                  strlcpy(stripped, tmp, len - 7 + 1 < sizeof(stripped)
+                        ? len - 7 + 1 : sizeof(stripped));
+                  bind_id = input_config_translate_str_to_bind_id(stripped);
+               }
+            }
+            BIT256_SET(desc->button_mask, bind_id);
+         }
       }
 
       if (BIT256_GET(desc->button_mask, RARCH_OVERLAY_NEXT))