pointer focus works now
This commit is contained in:
parent
7590c4d27b
commit
d09d3dc0f3
3 changed files with 19 additions and 8 deletions
|
|
@ -186,12 +186,23 @@ void CCompositor::focusWindow(CWindow* pWindow) {
|
|||
if (m_sWLRSeat->keyboard_state.focused_surface == PWINDOWSURFACE)
|
||||
return; // Don't focus when already focused on this.
|
||||
|
||||
// Unfocus last window
|
||||
if (m_pLastFocus && windowValidMapped(m_pLastFocus))
|
||||
g_pXWaylandManager->activateSurface(g_pXWaylandManager->getWindowSurface(m_pLastFocus), false);
|
||||
if (m_sWLRSeat->keyboard_state.focused_surface){
|
||||
const auto XDGSURFACE = wlr_xdg_surface_from_wlr_surface(m_sWLRSeat->keyboard_state.focused_surface);
|
||||
if (XDGSURFACE)
|
||||
wlr_xdg_toplevel_set_activated(XDGSURFACE->toplevel, false);
|
||||
|
||||
const auto XWLSURFACE = wlr_xwayland_surface_from_wlr_surface(m_sWLRSeat->keyboard_state.focused_surface);
|
||||
if (XWLSURFACE)
|
||||
wlr_xwayland_surface_activate(XWLSURFACE, false);
|
||||
}
|
||||
|
||||
const auto KEYBOARD = wlr_seat_get_keyboard(m_sWLRSeat);
|
||||
wlr_seat_keyboard_notify_enter(m_sWLRSeat, PWINDOWSURFACE, KEYBOARD->keycodes, KEYBOARD->num_keycodes, &KEYBOARD->modifiers);
|
||||
|
||||
g_pXWaylandManager->activateSurface(PWINDOWSURFACE, true);
|
||||
if (m_pLastFocus && windowValidMapped(m_pLastFocus))
|
||||
g_pXWaylandManager->activateSurface(g_pXWaylandManager->getWindowSurface(m_pLastFocus), false);
|
||||
|
||||
m_pLastFocus = pWindow;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue