blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #223 from versusvoid/xwayland-activate 

Activate only active xwayland views
This commit is contained in:
Drew DeVault 2017-10-06 09:34:48 -04:00 committed by GitHub
parent d1c26059d2 528f000a7a
commit 6aafc2f61a
3 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rootston/cursor.c
View File

@ -137,11 +137,14 @@ static void set_view_focus(struct roots_input *input,
size_t index = 0; size_t index = 0;
for (size_t i = 0; i < desktop->views->length; ++i) { for (size_t i = 0; i < desktop->views->length; ++i) {
struct roots_view *_view = desktop->views->items[i]; struct roots_view *_view = desktop->views->items[i];
view_activate(_view, _view == view); if (_view != view) {
view_activate(_view, false);
}
if (view == _view) { if (view == _view) {
index = i; index = i;
} }
} }
view_activate(view, true);
// TODO: list_swap // TODO: list_swap
list_del(desktop->views, index); list_del(desktop->views, index);
list_add(desktop->views, view); list_add(desktop->views, view);

4
rootston/xwayland.c
View File

@ -39,8 +39,12 @@ static void handle_request_configure(struct wl_listener *listener, void *data) {
} }
static void activate(struct roots_view *view, bool active) { static void activate(struct roots_view *view, bool active) {
if (active) {
wlr_xwayland_surface_activate(view->desktop->xwayland, wlr_xwayland_surface_activate(view->desktop->xwayland,
view->xwayland_surface); view->xwayland_surface);
} else {
wlr_xwayland_surface_activate(view->desktop->xwayland, NULL);
}
} }
void handle_xwayland_surface(struct wl_listener *listener, void *data) { void handle_xwayland_surface(struct wl_listener *listener, void *data) {

6
xwayland/xwm.c
View File

@ -705,6 +705,7 @@ static void xcb_init_wm(struct wlr_xwm *xwm) {
void wlr_xwayland_surface_activate(struct wlr_xwayland *wlr_xwayland, void wlr_xwayland_surface_activate(struct wlr_xwayland *wlr_xwayland,
struct wlr_xwayland_surface *surface) { struct wlr_xwayland_surface *surface) {
struct wlr_xwm *xwm = wlr_xwayland->xwm; struct wlr_xwm *xwm = wlr_xwayland->xwm;
if (surface) {
xcb_client_message_event_t m = {0}; xcb_client_message_event_t m = {0};
m.response_type = XCB_CLIENT_MESSAGE; m.response_type = XCB_CLIENT_MESSAGE;
m.format = 32; m.format = 32;
@ -718,6 +719,11 @@ void wlr_xwayland_surface_activate(struct wlr_xwayland *wlr_xwayland,
surface->window_id, XCB_CURRENT_TIME); surface->window_id, XCB_CURRENT_TIME);
xcb_configure_window_checked(xwm->xcb_conn, surface->window_id, xcb_configure_window_checked(xwm->xcb_conn, surface->window_id,
XCB_CONFIG_WINDOW_STACK_MODE, (uint32_t[]){XCB_STACK_MODE_ABOVE}); 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); xcb_flush(xwm->xcb_conn);
} }