Block gamepad input to games while the Windows/Xbox Game Bar is active, since it cannot do so itself.

Author: Kaldaien

CHANGELOG.txt

@@ -1,4 +1,11 @@
-26.4.18.2
+26.4.18.3
+=========
++ Block gamepad input to games while the Windows/Xbox Game Bar is active,
+    since it cannot do so itself.
++ Prevent toggling SK's control panel while another overlay is active and
+    SK is hiding itself.
+
+26.4.18.2
 =========
  + Fixed weird problem with Galaxy's DRM (not an April Fool's joke this time);
      gog_1_112::UnauthorizedAccessError would continuously throw exceptions if

include/SpecialK/DLL_VERSION.H

@@ -3,8 +3,8 @@
 #define SK_YEAR  26
 #define SK_MONTH 4
 #define SK_DATE  18
-#define SK_REV_N 2
-#define SK_REV   2
+#define SK_REV_N 3
+#define SK_REV   3
 
 #ifndef _A2
 #define _A2(a)     #a

include/imgui/imgui_user.inl

@@ -1624,6 +1624,13 @@ SK_ImGui_ToggleEx ( bool& toggle_ui,
   if (SK_ImGuiEx_Visible)
     return SK_ImGui_Active ();
 
+  // Do not allow toggling SK's overlay while another overlay is hiding SK.
+  if ( config.platform.overlay_hides_sk_osd &&
+       SK_GetStoreOverlayState (true) )
+  {
+    return false;
+  }
+
   //
   // Only allow one toggle per-frame, even if we wind up calling
   //   this function multiple times to translate HID to XInput...

src/core.cpp

@@ -5352,6 +5352,14 @@ SK_GetStoreOverlayState (bool bReal) noexcept
       SK_Platform_GetOverlayState (bReal) ||
       SK_ReShadeAddOn_IsOverlayActive ();
 
+    // The Xbox overlay cannot block PlayStation controller input to games,
+    //   but Special K can... so if it's open, update gamepad capture state.
+    //
+    //  Normally we would want the eopposite behavior, because most overlays
+    //    run inside the game process, but Xbox's overlay is external.
+    if (ret && SK_Xbox_GetOverlayState (true))
+           SK_ImGui_WantGamepadCapture (true);
+
     s_LastState.store (ret);
     s_LastFrame.store (SK_GetFramesDrawn ());
 

src/input/input.cpp

@@ -59,10 +59,16 @@ SK_ImGui_WantGamepadCapture (bool update) noexcept
     return false;
   }
 
-  if (! SK_GImDefaultContext ())
+  // Xbox Overlay skips this scenario, whether or not ImGui can draw anything,
+  //   we nmed to block input to the game on Xbox's behalf, since game bar does
+  //     not run any code inside the game to do this itself.
+  if (! SK_Xbox_GetOverlayState (true))
   {
-    capture.store (false);
-    return false;
+    if (! SK_GImDefaultContext ())
+    {
+      capture.store (false);
+      return false;
+    }
   }
 
   auto _Return = [](BOOL bCapture) ->

src/storefront/xbox.cpp

@@ -80,10 +80,12 @@ SK_Xbox_GetOverlayState (bool real)
 
   // This is a heavy API that requires IPC, ensure this is done at most
   //   a single time per-frame...
-  static bool   last_state =      false;
-  static UINT64 last_frame = UINT64_MAX;
+  static bool   last_state = false;
+  static UINT64 last_frame =     0;
 
-  if (last_frame == SK_GetFramesDrawn ())
+  // Actually, throttle it even more... once every 10 frames.
+  //  - It's not cheap, and a callback would be better.
+  if (last_frame > SK_GetFramesDrawn () - 10)
     return last_state;
 
   if (SK_GameBar_Statics != nullptr)