From 4d7ff3cb48d1057765d7307081d8387648ab59b1 Mon Sep 17 00:00:00 2001
From: Versus Void <versusvoid@gmail.com>
Date: Fri, 6 Oct 2017 13:57:25 +0300
Subject: Activate only active xwayland views Fix #217
---
rootston/xwayland.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
(limited to 'rootston')
diff --git a/rootston/xwayland.c b/rootston/xwayland.c
index 7ecc4d4f..59bb2632 100644
--- a/rootston/xwayland.c
+++ b/rootston/xwayland.c
@@ -39,8 +39,10 @@ static void handle_request_configure(struct wl_listener *listener, void *data) {
}
static void activate(struct roots_view *view, bool active) {
- wlr_xwayland_surface_activate(view->desktop->xwayland,
- view->xwayland_surface);
+ if (active) {
+ wlr_xwayland_surface_activate(view->desktop->xwayland,
+ view->xwayland_surface);
+ }
}
void handle_xwayland_surface(struct wl_listener *listener, void *data) {
--
cgit v1.2.3
From 528f000a7a5ed8b26a14ca09263dc0e7024aba8f Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Fri, 6 Oct 2017 09:34:22 -0400
Subject: Deactivate xwayland when focus leaves there
---
rootston/cursor.c | 5 ++++-
rootston/xwayland.c | 2 ++
xwayland/xwm.c | 32 +++++++++++++++++++-------------
3 files changed, 25 insertions(+), 14 deletions(-)
(limited to 'rootston')
diff --git a/rootston/cursor.c b/rootston/cursor.c
index eec8eb5d..0ca45f16 100644
--- a/rootston/cursor.c
+++ b/rootston/cursor.c
@@ -137,11 +137,14 @@ static void set_view_focus(struct roots_input *input,
size_t index = 0;
for (size_t i = 0; i < desktop->views->length; ++i) {
struct roots_view *_view = desktop->views->items[i];
- view_activate(_view, _view == view);
+ if (_view != view) {
+ view_activate(_view, false);
+ }
if (view == _view) {
index = i;
}
}
+ view_activate(view, true);
// TODO: list_swap
list_del(desktop->views, index);
list_add(desktop->views, view);
diff --git a/rootston/xwayland.c b/rootston/xwayland.c
index 59bb2632..bb8ced8e 100644
--- a/rootston/xwayland.c
+++ b/rootston/xwayland.c
@@ -42,6 +42,8 @@ static void activate(struct roots_view *view, bool active) {
if (active) {
wlr_xwayland_surface_activate(view->desktop->xwayland,
view->xwayland_surface);
+ } else {
+ wlr_xwayland_surface_activate(view->desktop->xwayland, NULL);
}
}
diff --git a/xwayland/xwm.c b/xwayland/xwm.c
index a4091d1f..3322f505 100644
--- a/xwayland/xwm.c
+++ b/xwayland/xwm.c
@@ -705,19 +705,25 @@ static void xcb_init_wm(struct wlr_xwm *xwm) {
void wlr_xwayland_surface_activate(struct wlr_xwayland *wlr_xwayland,
struct wlr_xwayland_surface *surface) {
struct wlr_xwm *xwm = wlr_xwayland->xwm;
- xcb_client_message_event_t m = {0};
- m.response_type = XCB_CLIENT_MESSAGE;
- m.format = 32;
- m.window = surface->window_id;
- m.type = xwm->atoms[WM_PROTOCOLS];
- m.data.data32[0] = xwm->atoms[WM_TAKE_FOCUS];
- m.data.data32[1] = XCB_TIME_CURRENT_TIME;
- xcb_send_event_checked(xwm->xcb_conn, 0, surface->window_id,
- XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT, (char*)&m);
- xcb_set_input_focus_checked(xwm->xcb_conn, XCB_INPUT_FOCUS_POINTER_ROOT,
- surface->window_id, XCB_CURRENT_TIME);
- xcb_configure_window_checked(xwm->xcb_conn, surface->window_id,
- XCB_CONFIG_WINDOW_STACK_MODE, (uint32_t[]){XCB_STACK_MODE_ABOVE});
+ if (surface) {
+ xcb_client_message_event_t m = {0};
+ m.response_type = XCB_CLIENT_MESSAGE;
+ m.format = 32;
+ m.window = surface->window_id;
+ m.type = xwm->atoms[WM_PROTOCOLS];
+ m.data.data32[0] = xwm->atoms[WM_TAKE_FOCUS];
+ m.data.data32[1] = XCB_TIME_CURRENT_TIME;
+ xcb_send_event_checked(xwm->xcb_conn, 0, surface->window_id,
+ XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT, (char*)&m);
+ xcb_set_input_focus_checked(xwm->xcb_conn, XCB_INPUT_FOCUS_POINTER_ROOT,
+ surface->window_id, XCB_CURRENT_TIME);
+ xcb_configure_window_checked(xwm->xcb_conn, surface->window_id,
+ XCB_CONFIG_WINDOW_STACK_MODE, (uint32_t[]){XCB_STACK_MODE_ABOVE});
+ } else {
+ wlr_log(L_DEBUG, "Deactivating xwayland");
+ xcb_set_input_focus_checked(xwm->xcb_conn, XCB_INPUT_FOCUS_NONE,
+ -1, XCB_CURRENT_TIME);
+ }
xcb_flush(xwm->xcb_conn);
}
--
cgit v1.2.3