aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Preiml <apreiml@strohwolke.at>2018-06-29 16:22:19 +0200
committerArmin Preiml <apreiml@strohwolke.at>2018-06-29 17:58:47 +0200
commitd0b3aed584ecb4cbaccb94e76ca5bcbc952075de (patch)
tree15852f9e39c6deb9290e2fa5770533ffbe91674b
parent9f1d6c58ed16bf2a7c1e4f39b38848adfe426095 (diff)
do not send focus request to a window that doesn't allow this
-rw-r--r--xwayland/xwm.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/xwayland/xwm.c b/xwayland/xwm.c
index 66a85d05..5a63ff9f 100644
--- a/xwayland/xwm.c
+++ b/xwayland/xwm.c
@@ -214,15 +214,24 @@ static void xwm_send_focus_window(struct wlr_xwm *xwm,
XCB_INPUT_FOCUS_POINTER_ROOT,
XCB_NONE, XCB_CURRENT_TIME);
return;
- } else if (xsurface->override_redirect) {
+ }
+
+ if (xsurface->override_redirect) {
return;
}
xcb_client_message_data_t message_data = { 0 };
message_data.data32[0] = xwm->atoms[WM_TAKE_FOCUS];
message_data.data32[1] = XCB_TIME_CURRENT_TIME;
- xwm_send_wm_message(xsurface, &message_data,
- XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT);
+
+ if (xsurface->hints && !xsurface->hints->input) {
+ // if the surface doesn't allow the focus request, we will send him
+ // only the take focus event. It will get the focus by itself.
+ xwm_send_wm_message(xsurface, &message_data, XCB_EVENT_MASK_NO_EVENT);
+ return;
+ }
+
+ xwm_send_wm_message(xsurface, &message_data, XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT);
xcb_set_input_focus(xwm->xcb_conn, XCB_INPUT_FOCUS_POINTER_ROOT,
xsurface->window_id, XCB_CURRENT_TIME);