nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-25 08:32:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

xwm: handle focus in

Browse Source
This commit is contained in:
Tony Crisci 2017-10-26 11:54:39 -04:00
parent 930ab06857
commit 32b848bd46
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
xwayland/xwm.c
View File

@ -746,6 +746,21 @@ static void handle_client_message(struct wlr_xwm *xwm,
}
}
static void handle_focus_in(struct wlr_xwm *xwm,
xcb_focus_in_event_t *ev) {
// Do not interfere with grabs
if (ev->mode == XCB_NOTIFY_MODE_GRAB ||
ev->mode == XCB_NOTIFY_MODE_UNGRAB) {
return;
}
// Do not let X clients change the focus behind the compositor's
// back. Reset the focus to the old one if it changed.
if (!xwm->focus_surface || ev->event != xwm->focus_surface->window_id) {
xwm_send_focus_window(xwm, xwm->focus_surface);
}
}
/* This is in xcb/xcb_event.h, but pulling xcb-util just for a constant
* others redefine anyway is meh
*/
@ -786,6 +801,9 @@ static int x11_event_handler(int fd, uint32_t mask, void *data) {
case XCB_CLIENT_MESSAGE:
handle_client_message(xwm, (xcb_client_message_event_t *)event);
break;
case XCB_FOCUS_IN:
handle_focus_in(xwm, (xcb_focus_in_event_t *)event);
break;
default:
wlr_log(L_DEBUG, "X11 event: %d",
event->response_type & XCB_EVENT_RESPONSE_TYPE_MASK);