From d657b59f701a65c7a85986e8d99754716468ee5b Mon Sep 17 00:00:00 2001
From: Junxuan Liao <70618504+MikeWalrus@users.noreply.github.com>
Date: Sun, 7 Apr 2024 22:15:50 +0800
Subject: IME: fix IME popup mouse inputs (again) (#5417)

`lastBoxLocal`'s size should be the actual popup's size instead of the cursor
rectangle's size. Also, the rectangle position is now relative to the popup.
(Actually fixes #5255 imho.)

One thing #3922 missed was handling focus held by buttons. Let's hope I get
it right this time.
---
 src/managers/input/InputManager.cpp | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'src/managers/input/InputManager.cpp')

diff --git a/src/managers/input/InputManager.cpp b/src/managers/input/InputManager.cpp
index 05317281..84ac00b5 100644
--- a/src/managers/input/InputManager.cpp
+++ b/src/managers/input/InputManager.cpp
@@ -171,26 +171,26 @@ void CInputManager::mouseMoveUnified(uint32_t time, bool refocus) {
     updateDragIcon();
 
     if (!m_sDrag.drag && !m_lCurrentlyHeldButtons.empty() && g_pCompositor->m_pLastFocus && m_pLastMouseSurface) {
-        if (m_bLastFocusOnLS) {
-            foundSurface       = m_pLastMouseSurface;
-            pFoundLayerSurface = g_pCompositor->getLayerSurfaceFromSurface(foundSurface);
-            if (pFoundLayerSurface) {
-                surfacePos              = g_pCompositor->getLayerSurfaceFromSurface(foundSurface)->position;
+        foundSurface       = m_pLastMouseSurface;
+        pFoundLayerSurface = g_pCompositor->getLayerSurfaceFromSurface(foundSurface);
+        if (pFoundLayerSurface) {
+            surfacePos              = pFoundLayerSurface->position;
+            m_bFocusHeldByButtons   = true;
+            m_bRefocusHeldByButtons = refocus;
+        } else {
+            CInputPopup* foundPopup = m_sIMERelay.popupFromSurface(foundSurface);
+            if (foundPopup) {
+                surfacePos              = foundPopup->globalBox().pos();
                 m_bFocusHeldByButtons   = true;
                 m_bRefocusHeldByButtons = refocus;
-            } else {
-                // ?
-                foundSurface       = nullptr;
-                pFoundLayerSurface = nullptr;
-            }
-        } else if (g_pCompositor->m_pLastWindow) {
-            foundSurface = m_pLastMouseSurface;
-            pFoundWindow = g_pCompositor->m_pLastWindow;
-
-            surfaceCoords = g_pCompositor->vectorToSurfaceLocal(mouseCoords, pFoundWindow, foundSurface);
+            } else if (g_pCompositor->m_pLastWindow) {
+                foundSurface = m_pLastMouseSurface;
+                pFoundWindow = g_pCompositor->m_pLastWindow;
 
-            m_bFocusHeldByButtons   = true;
-            m_bRefocusHeldByButtons = refocus;
+                surfaceCoords           = g_pCompositor->vectorToSurfaceLocal(mouseCoords, pFoundWindow, foundSurface);
+                m_bFocusHeldByButtons   = true;
+                m_bRefocusHeldByButtons = refocus;
+            }
         }
     }
 
-- 
cgit v1.2.3