diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-07-18 12:42:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-18 12:42:05 -0700 |
| commit | 83809cb7d24b9a9ea118476f7a9561e1e826a5b0 (patch) | |
| tree | cd4522741b756c653925f26d5e565bd03d983843 /rootston | |
| parent | ed26b19f056799b5a0b04f6388b1ee926581b14d (diff) | |
| parent | 5dca4741dfeb6d9bbd418906ed4412f7d4ba6085 (diff) | |
Merge pull request #1145 from emersion/override-redirect-updates
xwayland: handle override_redirect flag changes
Diffstat (limited to 'rootston')
| -rw-r--r-- | rootston/seat.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rootston/seat.c b/rootston/seat.c index 892faaa0..cae548d3 100644 --- a/rootston/seat.c +++ b/rootston/seat.c @@ -127,13 +127,13 @@ static void handle_tablet_tool_position(struct roots_cursor *cursor, struct wlr_surface *surface = desktop_surface_at(desktop, cursor->cursor->x, cursor->cursor->y, &sx, &sy, &view); struct roots_tablet_tool *roots_tool = tool->data; - + if (!surface) { wlr_send_tablet_v2_tablet_tool_proximity_out(roots_tool->tablet_v2_tool); /* XXX: TODO: Fallback pointer semantics */ return; } - + if (!wlr_surface_accepts_tablet_v2(tablet->tablet_v2, surface)) { wlr_send_tablet_v2_tablet_tool_proximity_out(roots_tool->tablet_v2_tool); /* XXX: TODO: Fallback pointer semantics */ @@ -217,7 +217,7 @@ static void handle_tool_tip(struct wl_listener *listener, void *data) { static void handle_tablet_tool_destroy(struct wl_listener *listener, void *data) { struct roots_tablet_tool *tool = wl_container_of(listener, tool, tool_destroy); - + wl_list_remove(&tool->link); wl_list_remove(&tool->tool_link); @@ -1124,7 +1124,7 @@ void roots_seat_set_focus(struct roots_seat *seat, struct roots_view *view) { #ifdef WLR_HAS_XWAYLAND if (view && view->type == ROOTS_XWAYLAND_VIEW && - wlr_xwayland_surface_is_unmanaged(view->xwayland_surface)) { + view->xwayland_surface->override_redirect) { return; } #endif |