Add logging for Z-order/focus issues

rcaelers · Sep 17, 2024 · 206370a · 206370a
1 parent 726eb6e
commit 206370a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/ui/app/platforms/windows/WindowsHarpoonLocker.cc b/ui/app/platforms/windows/WindowsHarpoonLocker.cc
@@ -23,6 +23,8 @@
 
 #include "input-monitor/Harpoon.hh"
 
+#include "debug.hh"
+
 bool
 WindowsHarpoonLocker::can_lock()
 {
@@ -41,28 +43,41 @@ WindowsHarpoonLocker::block_input(bool block)
       Harpoon::unblock_input();
     }
 
-  UINT uPreviousState;
+  UINT uPreviousState = 0;
   SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, block, &uPreviousState, 0);
 }
 
 void
 WindowsHarpoonLocker::prepare_lock()
 {
+  TRACE_ENTRY();
   active_window = GetForegroundWindow();
+
+  std::string text;
+  text.resize(GetWindowTextLengthA(active_window));
+  GetWindowTextA(active_window, text.data(), text.size() + 1);
+  TRACE_MSG("Save active window: {}", text);
 }
 
 void
 WindowsHarpoonLocker::lock()
 {
+  TRACE_ENTRY();
   block_input(TRUE);
 }
 
 void
 WindowsHarpoonLocker::unlock()
 {
+  TRACE_ENTRY();
   block_input(FALSE);
   if (active_window != nullptr)
     {
+      std::string text;
+      text.resize(GetWindowTextLengthA(active_window));
+      GetWindowTextA(active_window, text.data(), text.size() + 1);
+      TRACE_MSG("Restore active window: {}", text);
+
       SetForegroundWindow(active_window);
       active_window = nullptr;
     }

diff --git a/ui/app/toolkits/gtkmm/BreakWindow.cc b/ui/app/toolkits/gtkmm/BreakWindow.cc
@@ -104,6 +104,7 @@ BreakWindow::BreakWindow(std::shared_ptr<IApplicationContext> app,
 
       if (fullscreen_grab)
         {
+          TRACE_MSG("Fullscreen grab");
           set_app_paintable(true);
           signal_draw().connect(sigc::mem_fun(*this, &BreakWindow::on_draw), false);
           signal_screen_changed().connect(sigc::mem_fun(*this, &BreakWindow::on_screen_changed), false);
@@ -146,9 +147,16 @@ BreakWindow::BreakWindow(std::shared_ptr<IApplicationContext> app,
 
 #if defined(PLATFORM_OS_WINDOWS)
   if (WindowsForceFocus::GetForceFocusValue())
-    initial_ignore_activity = true;
+    {
+      TRACE_MSG("Force focus enabled");
+      initial_ignore_activity = true;
+    }
 
   app->get_configurator()->get_value_with_default("advanced/force_focus_on_break_start", force_focus_on_break_start, true);
+  if (force_focus_on_break_start)
+    {
+      TRACE_MSG("Force focus on break start enabled");
+    }
 #endif
 
   auto core = app->get_core();
@@ -725,6 +733,7 @@ BreakWindow::start()
   HWND hwnd = (HWND)GDK_WINDOW_HWND(gtk_widget_get_window(Gtk::Widget::gobj()));
   if (force_focus_on_break_start && this->head.is_primary())
     {
+      TRACE_MSG("Forcing window focus");
       WindowsForceFocus::ForceWindowFocus(hwnd);
     }
   // TODO: next two lines taken from original grab() function, which is called after start(). Still needed?
@@ -902,7 +911,7 @@ BreakWindow::refresh_break_window()
       if (WindowsForceFocus::GetForceFocusValue() && (head.is_primary()))
         {
           WindowsForceFocus::ForceWindowFocus(hwnd, 0); // try without blocking
-        }
+       }
     }
 }
 #endif
diff --git a/ui/app/toolkits/gtkmm/ToolkitWindows.cc b/ui/app/toolkits/gtkmm/ToolkitWindows.cc
@@ -43,8 +43,10 @@ ToolkitWindows::ToolkitWindows(int argc, char **argv)
 {
   gdk_init(nullptr, nullptr);
 #if defined(HAVE_HARPOON)
+  spdlog::info("Using Harpoon locker");
   locker = std::make_shared<WindowsHarpoonLocker>();
 #else
+  spdlog::info("Using standard locker");
   locker = std::make_shared<WindowsLocker>();
 #endif
 }