diff options
author | Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-06-30 23:51:21 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-30 23:51:21 +1000 |
commit | 62a7b762aca206c0992bda51153fd0cfb4f41636 (patch) | |
tree | 97bd9df31669270fae15b677229f38c99db4cac0 | |
parent | Merge pull request #2174 from martinetd/view-from-surface (diff) | |
parent | xdg_shell: listen to fullscreen request on map (diff) | |
download | sway-62a7b762aca206c0992bda51153fd0cfb4f41636.tar.gz sway-62a7b762aca206c0992bda51153fd0cfb4f41636.tar.zst sway-62a7b762aca206c0992bda51153fd0cfb4f41636.zip |
Merge pull request #2180 from martinetd/xdg_fullscreen
xdg_shell: listen to fullscreen request on map
-rw-r--r-- | sway/desktop/xdg_shell.c | 56 | ||||
-rw-r--r-- | sway/desktop/xdg_shell_v6.c | 56 |
2 files changed, 56 insertions, 56 deletions
diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c index 5b40d903..82db4076 100644 --- a/sway/desktop/xdg_shell.c +++ b/sway/desktop/xdg_shell.c | |||
@@ -203,6 +203,29 @@ static void handle_new_popup(struct wl_listener *listener, void *data) { | |||
203 | popup_create(wlr_popup, &xdg_shell_view->view); | 203 | popup_create(wlr_popup, &xdg_shell_view->view); |
204 | } | 204 | } |
205 | 205 | ||
206 | static void handle_request_fullscreen(struct wl_listener *listener, void *data) { | ||
207 | struct sway_xdg_shell_view *xdg_shell_view = | ||
208 | wl_container_of(listener, xdg_shell_view, request_fullscreen); | ||
209 | struct wlr_xdg_toplevel_set_fullscreen_event *e = data; | ||
210 | struct wlr_xdg_surface *xdg_surface = | ||
211 | xdg_shell_view->view.wlr_xdg_surface; | ||
212 | struct sway_view *view = &xdg_shell_view->view; | ||
213 | |||
214 | if (!sway_assert(xdg_surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL, | ||
215 | "xdg_shell requested fullscreen of surface with role %i", | ||
216 | xdg_surface->role)) { | ||
217 | return; | ||
218 | } | ||
219 | if (!xdg_surface->mapped) { | ||
220 | return; | ||
221 | } | ||
222 | |||
223 | view_set_fullscreen(view, e->fullscreen); | ||
224 | |||
225 | struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE); | ||
226 | arrange_and_commit(ws); | ||
227 | } | ||
228 | |||
206 | static void handle_unmap(struct wl_listener *listener, void *data) { | 229 | static void handle_unmap(struct wl_listener *listener, void *data) { |
207 | struct sway_xdg_shell_view *xdg_shell_view = | 230 | struct sway_xdg_shell_view *xdg_shell_view = |
208 | wl_container_of(listener, xdg_shell_view, unmap); | 231 | wl_container_of(listener, xdg_shell_view, unmap); |
@@ -216,6 +239,7 @@ static void handle_unmap(struct wl_listener *listener, void *data) { | |||
216 | 239 | ||
217 | wl_list_remove(&xdg_shell_view->commit.link); | 240 | wl_list_remove(&xdg_shell_view->commit.link); |
218 | wl_list_remove(&xdg_shell_view->new_popup.link); | 241 | wl_list_remove(&xdg_shell_view->new_popup.link); |
242 | wl_list_remove(&xdg_shell_view->request_fullscreen.link); | ||
219 | } | 243 | } |
220 | 244 | ||
221 | static void handle_map(struct wl_listener *listener, void *data) { | 245 | static void handle_map(struct wl_listener *listener, void *data) { |
@@ -248,6 +272,10 @@ static void handle_map(struct wl_listener *listener, void *data) { | |||
248 | xdg_shell_view->new_popup.notify = handle_new_popup; | 272 | xdg_shell_view->new_popup.notify = handle_new_popup; |
249 | wl_signal_add(&xdg_surface->events.new_popup, | 273 | wl_signal_add(&xdg_surface->events.new_popup, |
250 | &xdg_shell_view->new_popup); | 274 | &xdg_shell_view->new_popup); |
275 | |||
276 | xdg_shell_view->request_fullscreen.notify = handle_request_fullscreen; | ||
277 | wl_signal_add(&xdg_surface->toplevel->events.request_fullscreen, | ||
278 | &xdg_shell_view->request_fullscreen); | ||
251 | } | 279 | } |
252 | 280 | ||
253 | static void handle_destroy(struct wl_listener *listener, void *data) { | 281 | static void handle_destroy(struct wl_listener *listener, void *data) { |
@@ -261,34 +289,10 @@ static void handle_destroy(struct wl_listener *listener, void *data) { | |||
261 | wl_list_remove(&xdg_shell_view->destroy.link); | 289 | wl_list_remove(&xdg_shell_view->destroy.link); |
262 | wl_list_remove(&xdg_shell_view->map.link); | 290 | wl_list_remove(&xdg_shell_view->map.link); |
263 | wl_list_remove(&xdg_shell_view->unmap.link); | 291 | wl_list_remove(&xdg_shell_view->unmap.link); |
264 | wl_list_remove(&xdg_shell_view->request_fullscreen.link); | ||
265 | view->wlr_xdg_surface = NULL; | 292 | view->wlr_xdg_surface = NULL; |
266 | view_destroy(view); | 293 | view_destroy(view); |
267 | } | 294 | } |
268 | 295 | ||
269 | static void handle_request_fullscreen(struct wl_listener *listener, void *data) { | ||
270 | struct sway_xdg_shell_view *xdg_shell_view = | ||
271 | wl_container_of(listener, xdg_shell_view, request_fullscreen); | ||
272 | struct wlr_xdg_toplevel_set_fullscreen_event *e = data; | ||
273 | struct wlr_xdg_surface *xdg_surface = | ||
274 | xdg_shell_view->view.wlr_xdg_surface; | ||
275 | struct sway_view *view = &xdg_shell_view->view; | ||
276 | |||
277 | if (!sway_assert(xdg_surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL, | ||
278 | "xdg_shell requested fullscreen of surface with role %i", | ||
279 | xdg_surface->role)) { | ||
280 | return; | ||
281 | } | ||
282 | if (!xdg_surface->mapped) { | ||
283 | return; | ||
284 | } | ||
285 | |||
286 | view_set_fullscreen(view, e->fullscreen); | ||
287 | |||
288 | struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE); | ||
289 | arrange_and_commit(ws); | ||
290 | } | ||
291 | |||
292 | struct sway_view *view_from_wlr_xdg_surface( | 296 | struct sway_view *view_from_wlr_xdg_surface( |
293 | struct wlr_xdg_surface *xdg_surface) { | 297 | struct wlr_xdg_surface *xdg_surface) { |
294 | return xdg_surface->data; | 298 | return xdg_surface->data; |
@@ -329,9 +333,5 @@ void handle_xdg_shell_surface(struct wl_listener *listener, void *data) { | |||
329 | xdg_shell_view->destroy.notify = handle_destroy; | 333 | xdg_shell_view->destroy.notify = handle_destroy; |
330 | wl_signal_add(&xdg_surface->events.destroy, &xdg_shell_view->destroy); | 334 | wl_signal_add(&xdg_surface->events.destroy, &xdg_shell_view->destroy); |
331 | 335 | ||
332 | xdg_shell_view->request_fullscreen.notify = handle_request_fullscreen; | ||
333 | wl_signal_add(&xdg_surface->toplevel->events.request_fullscreen, | ||
334 | &xdg_shell_view->request_fullscreen); | ||
335 | |||
336 | xdg_surface->data = xdg_shell_view; | 336 | xdg_surface->data = xdg_shell_view; |
337 | } | 337 | } |
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c index c794e23a..0d3c1644 100644 --- a/sway/desktop/xdg_shell_v6.c +++ b/sway/desktop/xdg_shell_v6.c | |||
@@ -198,6 +198,29 @@ static void handle_new_popup(struct wl_listener *listener, void *data) { | |||
198 | popup_create(wlr_popup, &xdg_shell_v6_view->view); | 198 | popup_create(wlr_popup, &xdg_shell_v6_view->view); |
199 | } | 199 | } |
200 | 200 | ||
201 | static void handle_request_fullscreen(struct wl_listener *listener, void *data) { | ||
202 | struct sway_xdg_shell_v6_view *xdg_shell_v6_view = | ||
203 | wl_container_of(listener, xdg_shell_v6_view, request_fullscreen); | ||
204 | struct wlr_xdg_toplevel_v6_set_fullscreen_event *e = data; | ||
205 | struct wlr_xdg_surface_v6 *xdg_surface = | ||
206 | xdg_shell_v6_view->view.wlr_xdg_surface_v6; | ||
207 | struct sway_view *view = &xdg_shell_v6_view->view; | ||
208 | |||
209 | if (!sway_assert(xdg_surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL, | ||
210 | "xdg_shell_v6 requested fullscreen of surface with role %i", | ||
211 | xdg_surface->role)) { | ||
212 | return; | ||
213 | } | ||
214 | if (!xdg_surface->mapped) { | ||
215 | return; | ||
216 | } | ||
217 | |||
218 | view_set_fullscreen(view, e->fullscreen); | ||
219 | |||
220 | struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE); | ||
221 | arrange_and_commit(ws); | ||
222 | } | ||
223 | |||
201 | static void handle_unmap(struct wl_listener *listener, void *data) { | 224 | static void handle_unmap(struct wl_listener *listener, void *data) { |
202 | struct sway_xdg_shell_v6_view *xdg_shell_v6_view = | 225 | struct sway_xdg_shell_v6_view *xdg_shell_v6_view = |
203 | wl_container_of(listener, xdg_shell_v6_view, unmap); | 226 | wl_container_of(listener, xdg_shell_v6_view, unmap); |
@@ -211,6 +234,7 @@ static void handle_unmap(struct wl_listener *listener, void *data) { | |||
211 | 234 | ||
212 | wl_list_remove(&xdg_shell_v6_view->commit.link); | 235 | wl_list_remove(&xdg_shell_v6_view->commit.link); |
213 | wl_list_remove(&xdg_shell_v6_view->new_popup.link); | 236 | wl_list_remove(&xdg_shell_v6_view->new_popup.link); |
237 | wl_list_remove(&xdg_shell_v6_view->request_fullscreen.link); | ||
214 | } | 238 | } |
215 | 239 | ||
216 | static void handle_map(struct wl_listener *listener, void *data) { | 240 | static void handle_map(struct wl_listener *listener, void *data) { |
@@ -243,6 +267,10 @@ static void handle_map(struct wl_listener *listener, void *data) { | |||
243 | xdg_shell_v6_view->new_popup.notify = handle_new_popup; | 267 | xdg_shell_v6_view->new_popup.notify = handle_new_popup; |
244 | wl_signal_add(&xdg_surface->events.new_popup, | 268 | wl_signal_add(&xdg_surface->events.new_popup, |
245 | &xdg_shell_v6_view->new_popup); | 269 | &xdg_shell_v6_view->new_popup); |
270 | |||
271 | xdg_shell_v6_view->request_fullscreen.notify = handle_request_fullscreen; | ||
272 | wl_signal_add(&xdg_surface->toplevel->events.request_fullscreen, | ||
273 | &xdg_shell_v6_view->request_fullscreen); | ||
246 | } | 274 | } |
247 | 275 | ||
248 | static void handle_destroy(struct wl_listener *listener, void *data) { | 276 | static void handle_destroy(struct wl_listener *listener, void *data) { |
@@ -252,34 +280,10 @@ static void handle_destroy(struct wl_listener *listener, void *data) { | |||
252 | wl_list_remove(&xdg_shell_v6_view->destroy.link); | 280 | wl_list_remove(&xdg_shell_v6_view->destroy.link); |
253 | wl_list_remove(&xdg_shell_v6_view->map.link); | 281 | wl_list_remove(&xdg_shell_v6_view->map.link); |
254 | wl_list_remove(&xdg_shell_v6_view->unmap.link); | 282 | wl_list_remove(&xdg_shell_v6_view->unmap.link); |
255 | wl_list_remove(&xdg_shell_v6_view->request_fullscreen.link); | ||
256 | view->wlr_xdg_surface_v6 = NULL; | 283 | view->wlr_xdg_surface_v6 = NULL; |
257 | view_destroy(view); | 284 | view_destroy(view); |
258 | } | 285 | } |
259 | 286 | ||
260 | static void handle_request_fullscreen(struct wl_listener *listener, void *data) { | ||
261 | struct sway_xdg_shell_v6_view *xdg_shell_v6_view = | ||
262 | wl_container_of(listener, xdg_shell_v6_view, request_fullscreen); | ||
263 | struct wlr_xdg_toplevel_v6_set_fullscreen_event *e = data; | ||
264 | struct wlr_xdg_surface_v6 *xdg_surface = | ||
265 | xdg_shell_v6_view->view.wlr_xdg_surface_v6; | ||
266 | struct sway_view *view = &xdg_shell_v6_view->view; | ||
267 | |||
268 | if (!sway_assert(xdg_surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL, | ||
269 | "xdg_shell_v6 requested fullscreen of surface with role %i", | ||
270 | xdg_surface->role)) { | ||
271 | return; | ||
272 | } | ||
273 | if (!xdg_surface->mapped) { | ||
274 | return; | ||
275 | } | ||
276 | |||
277 | view_set_fullscreen(view, e->fullscreen); | ||
278 | |||
279 | struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE); | ||
280 | arrange_and_commit(ws); | ||
281 | } | ||
282 | |||
283 | struct sway_view *view_from_wlr_xdg_surface_v6( | 287 | struct sway_view *view_from_wlr_xdg_surface_v6( |
284 | struct wlr_xdg_surface_v6 *xdg_surface_v6) { | 288 | struct wlr_xdg_surface_v6 *xdg_surface_v6) { |
285 | return xdg_surface_v6->data; | 289 | return xdg_surface_v6->data; |
@@ -320,9 +324,5 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) { | |||
320 | xdg_shell_v6_view->destroy.notify = handle_destroy; | 324 | xdg_shell_v6_view->destroy.notify = handle_destroy; |
321 | wl_signal_add(&xdg_surface->events.destroy, &xdg_shell_v6_view->destroy); | 325 | wl_signal_add(&xdg_surface->events.destroy, &xdg_shell_v6_view->destroy); |
322 | 326 | ||
323 | xdg_shell_v6_view->request_fullscreen.notify = handle_request_fullscreen; | ||
324 | wl_signal_add(&xdg_surface->toplevel->events.request_fullscreen, | ||
325 | &xdg_shell_v6_view->request_fullscreen); | ||
326 | |||
327 | xdg_surface->data = xdg_shell_v6_view; | 327 | xdg_surface->data = xdg_shell_v6_view; |
328 | } | 328 | } |