diff options
author | emersion <contact@emersion.fr> | 2018-04-28 20:44:42 +0100 |
---|---|---|
committer | emersion <contact@emersion.fr> | 2018-04-28 20:44:42 +0100 |
commit | 3fd8897abe94c34b6457da3209f978b55719a7e2 (patch) | |
tree | d50dc742d8b8bcc2da07c3a784aaa0064a473646 /sway/desktop/xdg_shell_v6.c | |
parent | Merge pull request #1866 from ggreer/swaybar-cmd-sh (diff) | |
download | sway-3fd8897abe94c34b6457da3209f978b55719a7e2.tar.gz sway-3fd8897abe94c34b6457da3209f978b55719a7e2.tar.zst sway-3fd8897abe94c34b6457da3209f978b55719a7e2.zip |
Don't call view_set_fullscreen on unmapped xwayland views
Diffstat (limited to 'sway/desktop/xdg_shell_v6.c')
-rw-r--r-- | sway/desktop/xdg_shell_v6.c | 9 |
1 files changed, 5 insertions, 4 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); |