diff options
author | Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-04-29 09:15:29 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-29 09:15:29 +1000 |
commit | 950c451f30787d5a32cf941a19b0edb1201b3e4b (patch) | |
tree | d50dc742d8b8bcc2da07c3a784aaa0064a473646 | |
parent | Merge pull request #1866 from ggreer/swaybar-cmd-sh (diff) | |
parent | Don't call view_set_fullscreen on unmapped xwayland views (diff) | |
download | sway-950c451f30787d5a32cf941a19b0edb1201b3e4b.tar.gz sway-950c451f30787d5a32cf941a19b0edb1201b3e4b.tar.zst sway-950c451f30787d5a32cf941a19b0edb1201b3e4b.zip |
Merge pull request #1869 from emersion/xwayland-ignore-fullscreen-unmapped
Don't call view_set_fullscreen on unmapped xwayland views
-rw-r--r-- | sway/desktop/xdg_shell_v6.c | 9 | ||||
-rw-r--r-- | sway/desktop/xwayland.c | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c index fdfb9346..2aaedd6c 100644 --- a/sway/desktop/xdg_shell_v6.c +++ b/sway/desktop/xdg_shell_v6.c | |||
@@ -228,13 +228,15 @@ static void handle_request_fullscreen(struct wl_listener *listener, void *data) | |||
228 | struct sway_xdg_shell_v6_view *xdg_shell_v6_view = | 228 | struct sway_xdg_shell_v6_view *xdg_shell_v6_view = |
229 | wl_container_of(listener, xdg_shell_v6_view, request_fullscreen); | 229 | wl_container_of(listener, xdg_shell_v6_view, request_fullscreen); |
230 | struct wlr_xdg_toplevel_v6_set_fullscreen_event *e = data; | 230 | struct wlr_xdg_toplevel_v6_set_fullscreen_event *e = data; |
231 | struct wlr_xdg_surface_v6 *xdg_surface = | ||
232 | xdg_shell_v6_view->view.wlr_xdg_surface_v6; | ||
231 | 233 | ||
232 | if (!sway_assert(xdg_shell_v6_view->view.wlr_xdg_surface_v6->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL, | 234 | if (!sway_assert(xdg_surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL, |
233 | "xdg_shell_v6 requested fullscreen of surface with role %i", | 235 | "xdg_shell_v6 requested fullscreen of surface with role %i", |
234 | xdg_shell_v6_view->view.wlr_xdg_surface_v6->role)) { | 236 | xdg_surface->role)) { |
235 | return; | 237 | return; |
236 | } | 238 | } |
237 | if (!xdg_shell_v6_view->view.wlr_xdg_surface_v6->mapped) { | 239 | if (!xdg_surface->mapped) { |
238 | return; | 240 | return; |
239 | } | 241 | } |
240 | 242 | ||
@@ -267,7 +269,6 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) { | |||
267 | 269 | ||
268 | // TODO: | 270 | // TODO: |
269 | // - Look up pid and open on appropriate workspace | 271 | // - Look up pid and open on appropriate workspace |
270 | // - Criteria | ||
271 | 272 | ||
272 | xdg_shell_v6_view->map.notify = handle_map; | 273 | xdg_shell_v6_view->map.notify = handle_map; |
273 | wl_signal_add(&xdg_surface->events.map, &xdg_shell_v6_view->map); | 274 | wl_signal_add(&xdg_surface->events.map, &xdg_shell_v6_view->map); |
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index 63d9c66e..aa9e1797 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c | |||
@@ -280,6 +280,9 @@ static void handle_request_fullscreen(struct wl_listener *listener, void *data) | |||
280 | wl_container_of(listener, xwayland_view, request_fullscreen); | 280 | wl_container_of(listener, xwayland_view, request_fullscreen); |
281 | struct sway_view *view = &xwayland_view->view; | 281 | struct sway_view *view = &xwayland_view->view; |
282 | struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface; | 282 | struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface; |
283 | if (!xsurface->mapped) { | ||
284 | return; | ||
285 | } | ||
283 | view_set_fullscreen(view, xsurface->fullscreen); | 286 | view_set_fullscreen(view, xsurface->fullscreen); |
284 | } | 287 | } |
285 | 288 | ||
@@ -309,7 +312,6 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) { | |||
309 | 312 | ||
310 | // TODO: | 313 | // TODO: |
311 | // - Look up pid and open on appropriate workspace | 314 | // - Look up pid and open on appropriate workspace |
312 | // - Criteria | ||
313 | 315 | ||
314 | wl_signal_add(&xsurface->events.destroy, &xwayland_view->destroy); | 316 | wl_signal_add(&xsurface->events.destroy, &xwayland_view->destroy); |
315 | xwayland_view->destroy.notify = handle_destroy; | 317 | xwayland_view->destroy.notify = handle_destroy; |