diff options
Diffstat (limited to 'sway/desktop/render.c')
-rw-r--r-- | sway/desktop/render.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sway/desktop/render.c b/sway/desktop/render.c index 7da54594..46bfec6b 100644 --- a/sway/desktop/render.c +++ b/sway/desktop/render.c | |||
@@ -132,7 +132,7 @@ static void render_layer(struct sway_output *output, | |||
132 | output_layer_for_each_surface(layer_surfaces, &data.root_geo, | 132 | output_layer_for_each_surface(layer_surfaces, &data.root_geo, |
133 | render_surface_iterator, &data); | 133 | render_surface_iterator, &data); |
134 | } | 134 | } |
135 | 135 | #ifdef HAVE_XWAYLAND | |
136 | static void render_unmanaged(struct sway_output *output, | 136 | static void render_unmanaged(struct sway_output *output, |
137 | pixman_region32_t *damage, struct wl_list *unmanaged) { | 137 | pixman_region32_t *damage, struct wl_list *unmanaged) { |
138 | struct render_data data = { | 138 | struct render_data data = { |
@@ -143,7 +143,7 @@ static void render_unmanaged(struct sway_output *output, | |||
143 | output_unmanaged_for_each_surface(unmanaged, output, &data.root_geo, | 143 | output_unmanaged_for_each_surface(unmanaged, output, &data.root_geo, |
144 | render_surface_iterator, &data); | 144 | render_surface_iterator, &data); |
145 | } | 145 | } |
146 | 146 | #endif | |
147 | static void render_drag_icons(struct sway_output *output, | 147 | static void render_drag_icons(struct sway_output *output, |
148 | pixman_region32_t *damage, struct wl_list *drag_icons) { | 148 | pixman_region32_t *damage, struct wl_list *drag_icons) { |
149 | struct render_data data = { | 149 | struct render_data data = { |
@@ -866,11 +866,12 @@ void output_render(struct sway_output *output, struct timespec *when, | |||
866 | } else { | 866 | } else { |
867 | render_view_surfaces(fullscreen_view, output, damage, 1.0f); | 867 | render_view_surfaces(fullscreen_view, output, damage, 1.0f); |
868 | } | 868 | } |
869 | 869 | #ifdef HAVE_XWAYLAND | |
870 | if (fullscreen_view->type == SWAY_VIEW_XWAYLAND) { | 870 | if (fullscreen_view->type == SWAY_VIEW_XWAYLAND) { |
871 | render_unmanaged(output, damage, | 871 | render_unmanaged(output, damage, |
872 | &root_container.sway_root->xwayland_unmanaged); | 872 | &root_container.sway_root->xwayland_unmanaged); |
873 | } | 873 | } |
874 | #endif | ||
874 | } else { | 875 | } else { |
875 | float clear_color[] = {0.25f, 0.25f, 0.25f, 1.0f}; | 876 | float clear_color[] = {0.25f, 0.25f, 0.25f, 1.0f}; |
876 | 877 | ||
@@ -888,9 +889,10 @@ void output_render(struct sway_output *output, struct timespec *when, | |||
888 | 889 | ||
889 | render_container(output, damage, workspace, workspace->current.focused); | 890 | render_container(output, damage, workspace, workspace->current.focused); |
890 | render_floating(output, damage); | 891 | render_floating(output, damage); |
891 | 892 | #ifdef HAVE_XWAYLAND | |
892 | render_unmanaged(output, damage, | 893 | render_unmanaged(output, damage, |
893 | &root_container.sway_root->xwayland_unmanaged); | 894 | &root_container.sway_root->xwayland_unmanaged); |
895 | #endif | ||
894 | render_layer(output, damage, | 896 | render_layer(output, damage, |
895 | &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP]); | 897 | &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP]); |
896 | } | 898 | } |