diff options
| author | vaxerski <43317083+vaxerski@users.noreply.github.com> | 2022-03-19 10:53:39 +0100 |
|---|---|---|
| committer | vaxerski <43317083+vaxerski@users.noreply.github.com> | 2022-03-19 10:53:39 +0100 |
| commit | d09d3dc0f354ff1263aca4ecce233aa735c173fc (patch) | |
| tree | 155e99f6957487e323b82ecadc7735328ab7987d /src/managers | |
| parent | 7590c4d27bb2b44b5a86370cbc8d5cd5215eaadc (diff) | |
pointer focus works now
Diffstat (limited to 'src/managers')
| -rw-r--r-- | src/managers/InputManager.cpp | 4 | ||||
| -rw-r--r-- | src/managers/XWaylandManager.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/managers/InputManager.cpp b/src/managers/InputManager.cpp index 1b438ba9..93318e58 100644 --- a/src/managers/InputManager.cpp +++ b/src/managers/InputManager.cpp @@ -22,7 +22,7 @@ void CInputManager::onMouseMoved(wlr_event_pointer_motion* e) { void CInputManager::onMouseWarp(wlr_event_pointer_motion_absolute* e) { wlr_cursor_warp_absolute(g_pCompositor->m_sWLRCursor, e->device, e->x, e->y); - m_vMouseCoords = Vector2D(e->x, e->y); + m_vMouseCoords = Vector2D(g_pCompositor->m_sWLRCursor->x, g_pCompositor->m_sWLRCursor->y); m_vWLRMouseCoords = m_vMouseCoords; mouseMoveUnified(e->time_msec); @@ -45,7 +45,7 @@ void CInputManager::mouseMoveUnified(uint32_t time) { g_pCompositor->focusWindow(PWINDOW); - Vector2D surfaceLocal = m_vMouseCoords - PWINDOW->m_vPosition; + Vector2D surfaceLocal = m_vWLRMouseCoords - PWINDOW->m_vPosition; wlr_seat_pointer_notify_enter(g_pCompositor->m_sWLRSeat, g_pXWaylandManager->getWindowSurface(PWINDOW), surfaceLocal.x, surfaceLocal.y); wlr_seat_pointer_notify_motion(g_pCompositor->m_sWLRSeat, time, surfaceLocal.x, surfaceLocal.y); diff --git a/src/managers/XWaylandManager.cpp b/src/managers/XWaylandManager.cpp index 5a0a38aa..1c28ec35 100644 --- a/src/managers/XWaylandManager.cpp +++ b/src/managers/XWaylandManager.cpp @@ -76,9 +76,9 @@ void CHyprXWaylandManager::setWindowStyleTiled(CWindow* pWindow, uint32_t edgez) wlr_xdg_toplevel_set_tiled(pWindow->m_uSurface.xdg->toplevel, edgez); } -wlr_surface* CHyprXWaylandManager::surfaceAt(CWindow* pWindow, const Vector2D& client, Vector2D& server) { - if (pWindow->m_bIsX11) - return wlr_surface_surface_at(pWindow->m_uSurface.xwayland->surface, client.x, client.y, &server.x, &server.y); +wlr_surface* CHyprXWaylandManager::surfaceAt(CWindow* pWindow, const Vector2D& client, Vector2D& surface) { + if (pWindow->m_bIsX11) + return wlr_surface_surface_at(pWindow->m_uSurface.xwayland->surface, client.x, client.y, &surface.x, &surface.y); - return wlr_xdg_surface_surface_at(pWindow->m_uSurface.xdg, client.x, client.y, &server.x, &server.y); + return wlr_xdg_surface_surface_at(pWindow->m_uSurface.xdg, client.x, client.y, &surface.x, &surface.y); }
\ No newline at end of file |