diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-04-17 08:11:50 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-04-17 08:11:50 +1000 |
commit | bfd5834f4c1046c234ceaae212e65e045cd51460 (patch) | |
tree | fc789c66bd9c20bfc30307c3f675d9c4079b5c4c /sway/desktop | |
parent | Implement fullscreen. (diff) | |
download | sway-bfd5834f4c1046c234ceaae212e65e045cd51460.tar.gz sway-bfd5834f4c1046c234ceaae212e65e045cd51460.tar.zst sway-bfd5834f4c1046c234ceaae212e65e045cd51460.zip |
Feedback for fullscreen.
Diffstat (limited to 'sway/desktop')
-rw-r--r-- | sway/desktop/output.c | 6 | ||||
-rw-r--r-- | sway/desktop/xwayland.c | 12 |
2 files changed, 2 insertions, 16 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index b86f20e8..dc2f6380 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
@@ -287,11 +287,9 @@ static void render_output(struct sway_output *output, struct timespec *when, | |||
287 | render_container(output, workspace); | 287 | render_container(output, workspace); |
288 | 288 | ||
289 | render_unmanaged(output, &root_container.sway_root->xwayland_unmanaged); | 289 | render_unmanaged(output, &root_container.sway_root->xwayland_unmanaged); |
290 | |||
291 | render_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP]); | ||
292 | render_layer(output, | ||
293 | &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY]); | ||
294 | } | 290 | } |
291 | render_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP]); | ||
292 | render_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY]); | ||
295 | 293 | ||
296 | renderer_end: | 294 | renderer_end: |
297 | if (root_container.sway_root->debug_tree) { | 295 | if (root_container.sway_root->debug_tree) { |
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index 716d8882..963c5a0e 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c | |||
@@ -25,15 +25,6 @@ static void unmanaged_handle_request_configure(struct wl_listener *listener, | |||
25 | ev->width, ev->height); | 25 | ev->width, ev->height); |
26 | } | 26 | } |
27 | 27 | ||
28 | static void unmanaged_handle_request_fullscreen(struct wl_listener *listener, | ||
29 | void *data) { | ||
30 | struct sway_xwayland_view *xwayland_view = | ||
31 | wl_container_of(listener, xwayland_view, request_fullscreen); | ||
32 | struct sway_view *view = &xwayland_view->view; | ||
33 | struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface; | ||
34 | view_set_fullscreen(view, xsurface->fullscreen); | ||
35 | } | ||
36 | |||
37 | static void unmanaged_handle_commit(struct wl_listener *listener, void *data) { | 28 | static void unmanaged_handle_commit(struct wl_listener *listener, void *data) { |
38 | struct sway_xwayland_unmanaged *surface = | 29 | struct sway_xwayland_unmanaged *surface = |
39 | wl_container_of(listener, surface, commit); | 30 | wl_container_of(listener, surface, commit); |
@@ -115,9 +106,6 @@ static struct sway_xwayland_unmanaged *create_unmanaged( | |||
115 | wl_signal_add(&xsurface->events.request_configure, | 106 | wl_signal_add(&xsurface->events.request_configure, |
116 | &surface->request_configure); | 107 | &surface->request_configure); |
117 | surface->request_configure.notify = unmanaged_handle_request_configure; | 108 | surface->request_configure.notify = unmanaged_handle_request_configure; |
118 | wl_signal_add(&xsurface->events.request_fullscreen, | ||
119 | &surface->request_fullscreen); | ||
120 | surface->request_fullscreen.notify = unmanaged_handle_request_fullscreen; | ||
121 | wl_signal_add(&xsurface->events.map, &surface->map); | 109 | wl_signal_add(&xsurface->events.map, &surface->map); |
122 | surface->map.notify = unmanaged_handle_map; | 110 | surface->map.notify = unmanaged_handle_map; |
123 | wl_signal_add(&xsurface->events.unmap, &surface->unmap); | 111 | wl_signal_add(&xsurface->events.unmap, &surface->unmap); |