diff options
| author | Vaxry <vaxry@vaxry.net> | 2023-12-12 14:58:43 +0000 |
|---|---|---|
| committer | Vaxry <vaxry@vaxry.net> | 2023-12-12 14:58:43 +0000 |
| commit | ba2af6f86d26fbf4b51aa37bf901e0118f46bbe3 (patch) | |
| tree | 2c4b6da1b4cbd2ccc9f8ec4e55d81ef8829a2aef /src | |
| parent | 1950c3fc9c807f10735b0a681aca49fd2d0d2d0b (diff) | |
focus: prefer sendMotionEventsToFocused for ensuring cursor image
Diffstat (limited to 'src')
| -rw-r--r-- | src/Compositor.cpp | 4 | ||||
| -rw-r--r-- | src/events/Layers.cpp | 2 | ||||
| -rw-r--r-- | src/events/Windows.cpp | 6 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/Compositor.cpp b/src/Compositor.cpp index 3b022a19..0eb1b00a 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp @@ -1989,7 +1989,7 @@ void CCompositor::swapActiveWorkspaces(CMonitor* pMonitorA, CMonitor* pMonitorB) updateFullscreenFadeOnWorkspace(PWORKSPACEB); updateFullscreenFadeOnWorkspace(PWORKSPACEA); - g_pInputManager->simulateMouseMovement(); + g_pInputManager->sendMotionEventsToFocused(); // event g_pEventManager->postEvent(SHyprIPCEvent{"moveworkspace", PWORKSPACEA->m_szName + "," + pMonitorB->szName}); @@ -2174,7 +2174,7 @@ void CCompositor::moveWorkspaceToMonitor(CWorkspace* pWorkspace, CMonitor* pMoni wlr_cursor_warp(m_sWLRCursor, nullptr, pMonitor->vecPosition.x + pMonitor->vecTransformedSize.x / 2, pMonitor->vecPosition.y + pMonitor->vecTransformedSize.y / 2); - g_pInputManager->simulateMouseMovement(); + g_pInputManager->sendMotionEventsToFocused(); } // finalize diff --git a/src/events/Layers.cpp b/src/events/Layers.cpp index a9d8b5d0..d6e21d9d 100644 --- a/src/events/Layers.cpp +++ b/src/events/Layers.cpp @@ -255,7 +255,7 @@ void Events::listener_unmapLayerSurface(void* owner, void* data) { (int)layersurface->layerSurface->surface->current.width, (int)layersurface->layerSurface->surface->current.height}; g_pHyprRenderer->damageBox(&geomFixed); - g_pInputManager->simulateMouseMovement(); + g_pInputManager->sendMotionEventsToFocused(); } void Events::listener_commitLayerSurface(void* owner, void* data) { diff --git a/src/events/Windows.cpp b/src/events/Windows.cpp index 2c107999..efefcbec 100644 --- a/src/events/Windows.cpp +++ b/src/events/Windows.cpp @@ -641,8 +641,7 @@ void Events::listener_mapWindow(void* owner, void* data) { g_pCompositor->setPreferredScaleForSurface(PWINDOW->m_pWLSurface.wlr(), PMONITOR->scale); g_pCompositor->setPreferredTransformForSurface(PWINDOW->m_pWLSurface.wlr(), PMONITOR->transform); - if (g_pCompositor->vectorToWindowIdeal(g_pInputManager->getMouseCoordsInternal()) == g_pCompositor->m_pLastWindow) - g_pInputManager->simulateMouseMovement(); + g_pInputManager->sendMotionEventsToFocused(); // fix some xwayland apps that don't behave nicely PWINDOW->m_vReportedSize = PWINDOW->m_vPendingReportedSize; @@ -737,8 +736,7 @@ void Events::listener_unmapWindow(void* owner, void* data) { if (PWINDOWCANDIDATE != g_pCompositor->m_pLastWindow && PWINDOWCANDIDATE) g_pCompositor->focusWindow(PWINDOWCANDIDATE); - if (g_pCompositor->vectorToWindowIdeal(g_pInputManager->getMouseCoordsInternal()) == PWINDOWCANDIDATE) - g_pInputManager->simulateMouseMovement(); + g_pInputManager->sendMotionEventsToFocused(); // CWindow::onUnmap will remove this window's active status, but we can't really do it above. if (PWINDOW == g_pCompositor->m_pLastWindow || !g_pCompositor->m_pLastWindow) { |