Revert "feat: enhance desk entry handling for touch-triggered events"

This reverts commit d4d53b5.

Author: nbolton

src/lib/platform/MSWindowsDesks.cpp

@@ -201,9 +201,9 @@ void MSWindowsDesks::disable()
   m_isOnScreen = m_isPrimary;
 }
 
-void MSWindowsDesks::enter(bool touchTriggered)
+void MSWindowsDesks::enter()
 {
-  sendMessage(DESKFLOW_MSG_ENTER, touchTriggered ? 1 : 0, 0);
+  sendMessage(DESKFLOW_MSG_ENTER, 0, 0);
 }
 
 void MSWindowsDesks::leave(HKL keyLayout)
@@ -685,7 +685,7 @@ void setCursorVisibility(bool visible)
   LOG_ERR("unable to set cursor visibility after %d attempts", attempts);
 }
 
-void MSWindowsDesks::deskEnter(Desk *desk, bool touchTriggered)
+void MSWindowsDesks::deskEnter(Desk *desk)
 {
   registerTouchRawInput(desk->m_window, false);
 
@@ -713,19 +713,11 @@ void MSWindowsDesks::deskEnter(Desk *desk, bool touchTriggered)
   SetWindowPos(desk->m_window, HWND_BOTTOM, 0, 0, 0, 0,
                SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_HIDEWINDOW);
 
-  // Always restore the ShowCursor counter (deskLeave decremented it).
   setCursorVisibility(true);
 
-  if (touchTriggered) {
-    // Touch-triggered enter: keep cursor invisible. SetCursor(NULL)
-    // draws nothing; the cursor becomes visible naturally when the
-    // user moves the mouse (apps set cursor shape via WM_SETCURSOR).
-    SetCursor(NULL);
-  } else {
-    HCURSOR arrow = LoadCursor(NULL, IDC_ARROW);
-    SetClassLongPtr(desk->m_window, GCLP_HCURSOR, reinterpret_cast<LONG_PTR>(arrow));
-    SetCursor(arrow);
-  }
+  HCURSOR arrow = LoadCursor(NULL, IDC_ARROW);
+  SetClassLongPtr(desk->m_window, GCLP_HCURSOR, reinterpret_cast<LONG_PTR>(arrow));
+  SetCursor(arrow);
 
   // restore the foreground window
   // XXX -- this raises the window to the top of the Z-order.  we
@@ -1119,7 +1111,7 @@ void MSWindowsDesks::deskThread(void *vdesk)
 
     case DESKFLOW_MSG_ENTER:
       m_isOnScreen = true;
-      deskEnter(desk, msg.wParam != 0);
+      deskEnter(desk);
       break;
 
     case DESKFLOW_MSG_LEAVE:

src/lib/platform/MSWindowsDesks.h

@@ -96,7 +96,7 @@ class MSWindowsDesks
   /*!
   Prepares a desk for when the cursor enters it.
   */
-  void enter(bool touchTriggered = false);
+  void enter();
 
   //! Notify of leaving a desk
   /*!
@@ -229,7 +229,7 @@ class MSWindowsDesks
   void deskMouseMove(SInt32 x, SInt32 y) const;
   void deskFakeTouchClick(SInt32 x, SInt32 y) const;
   void deskMouseRelativeMove(SInt32 dx, SInt32 dy) const;
-  void deskEnter(Desk *desk, bool touchTriggered = false);
+  void deskEnter(Desk *desk);
   void deskLeave(Desk *desk, HKL keyLayout);
   void deskThread(void *vdesk);
 

src/lib/platform/MSWindowsScreen.cpp

@@ -294,9 +294,7 @@ void MSWindowsScreen::disable()
 
 void MSWindowsScreen::enter()
 {
-  bool touchEnter = m_touchTriggeredEnter;
-  m_touchTriggeredEnter = false;
-  m_desks->enter(touchEnter);
+  m_desks->enter();
   if (m_isPrimary) {
     // enable special key sequences on win95 family
     enableSpecialKeys(true);
@@ -994,7 +992,6 @@ bool MSWindowsScreen::onPreDispatch(HWND hwnd, UINT message, WPARAM wParam, LPAR
       SInt32 y = static_cast<SInt32>(lParam);
       if (m_isPrimary) {
         LOG((CLOG_INFO "hook: touch activating primary at %d,%d", x, y));
-        m_touchTriggeredEnter = true;
         sendEvent(m_events->forIPrimaryScreen().touchActivatedPrimary(),
                   MotionInfo::alloc(x, y));
       } else {

src/lib/platform/MSWindowsScreen.h

@@ -364,7 +364,6 @@ class MSWindowsScreen : public PlatformScreen
   MSWindowsPowerManager m_powerManager;
 
   bool m_touchActivateScreen;
-  bool m_touchTriggeredEnter = false;
 
   Stopwatch m_touchDebounceTimer;
   static constexpr double kTouchDebounceTime = 0.15;