summaryrefslogtreecommitdiffstats
path: root/sway/desktop
diff options
context:
space:
mode:
authorLibravatar emersion <contact@emersion.fr>2018-11-18 00:33:06 +0100
committerLibravatar emersion <contact@emersion.fr>2018-11-18 00:33:06 +0100
commitcad851805bea6b4777685df1c6adf8cb9fa71835 (patch)
tree145fcb048cc3df3d04a8b6afb90de68dd2dd80a9 /sway/desktop
parentMerge pull request #3142 from RyanDwyer/move-view-properties (diff)
downloadsway-cad851805bea6b4777685df1c6adf8cb9fa71835.tar.gz
sway-cad851805bea6b4777685df1c6adf8cb9fa71835.tar.zst
sway-cad851805bea6b4777685df1c6adf8cb9fa71835.zip
Use #if instead of #ifdef
Diffstat (limited to 'sway/desktop')
-rw-r--r--sway/desktop/output.c6
-rw-r--r--sway/desktop/render.c6
-rw-r--r--sway/desktop/transaction.c2
3 files changed, 7 insertions, 7 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index e8112bd9..d649100f 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -204,7 +204,7 @@ void output_layer_for_each_surface(struct sway_output *output,
204 } 204 }
205} 205}
206 206
207#ifdef HAVE_XWAYLAND 207#if HAVE_XWAYLAND
208void output_unmanaged_for_each_surface(struct sway_output *output, 208void output_unmanaged_for_each_surface(struct sway_output *output,
209 struct wl_list *unmanaged, sway_surface_iterator_func_t iterator, 209 struct wl_list *unmanaged, sway_surface_iterator_func_t iterator,
210 void *user_data) { 210 void *user_data) {
@@ -274,7 +274,7 @@ static void output_for_each_surface(struct sway_output *output,
274 for_each_surface_container_iterator(floater, &data); 274 for_each_surface_container_iterator(floater, &data);
275 } 275 }
276 } 276 }
277#ifdef HAVE_XWAYLAND 277#if HAVE_XWAYLAND
278 output_unmanaged_for_each_surface(output, &root->xwayland_unmanaged, 278 output_unmanaged_for_each_surface(output, &root->xwayland_unmanaged,
279 iterator, user_data); 279 iterator, user_data);
280#endif 280#endif
@@ -289,7 +289,7 @@ static void output_for_each_surface(struct sway_output *output,
289 workspace_for_each_container(workspace, 289 workspace_for_each_container(workspace,
290 for_each_surface_container_iterator, &data); 290 for_each_surface_container_iterator, &data);
291 291
292#ifdef HAVE_XWAYLAND 292#if HAVE_XWAYLAND
293 output_unmanaged_for_each_surface(output, &root->xwayland_unmanaged, 293 output_unmanaged_for_each_surface(output, &root->xwayland_unmanaged,
294 iterator, user_data); 294 iterator, user_data);
295#endif 295#endif
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
index 93e196bb..8d4a701b 100644
--- a/sway/desktop/render.c
+++ b/sway/desktop/render.c
@@ -140,7 +140,7 @@ static void render_layer(struct sway_output *output,
140 render_surface_iterator, &data); 140 render_surface_iterator, &data);
141} 141}
142 142
143#ifdef HAVE_XWAYLAND 143#if HAVE_XWAYLAND
144static void render_unmanaged(struct sway_output *output, 144static void render_unmanaged(struct sway_output *output,
145 pixman_region32_t *damage, struct wl_list *unmanaged) { 145 pixman_region32_t *damage, struct wl_list *unmanaged) {
146 struct render_data data = { 146 struct render_data data = {
@@ -966,7 +966,7 @@ void output_render(struct sway_output *output, struct timespec *when,
966 render_floating_container(output, damage, floater); 966 render_floating_container(output, damage, floater);
967 } 967 }
968 } 968 }
969#ifdef HAVE_XWAYLAND 969#if HAVE_XWAYLAND
970 render_unmanaged(output, damage, &root->xwayland_unmanaged); 970 render_unmanaged(output, damage, &root->xwayland_unmanaged);
971#endif 971#endif
972 } else { 972 } else {
@@ -986,7 +986,7 @@ void output_render(struct sway_output *output, struct timespec *when,
986 986
987 render_workspace(output, damage, workspace, workspace->current.focused); 987 render_workspace(output, damage, workspace, workspace->current.focused);
988 render_floating(output, damage); 988 render_floating(output, damage);
989#ifdef HAVE_XWAYLAND 989#if HAVE_XWAYLAND
990 render_unmanaged(output, damage, &root->xwayland_unmanaged); 990 render_unmanaged(output, damage, &root->xwayland_unmanaged);
991#endif 991#endif
992 render_layer(output, damage, 992 render_layer(output, damage,
diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c
index 39cb641f..bf0038b4 100644
--- a/sway/desktop/transaction.c
+++ b/sway/desktop/transaction.c
@@ -380,7 +380,7 @@ static bool should_configure(struct sway_node *node,
380 } 380 }
381 struct sway_container_state *cstate = &node->sway_container->current; 381 struct sway_container_state *cstate = &node->sway_container->current;
382 struct sway_container_state *istate = &instruction->container_state; 382 struct sway_container_state *istate = &instruction->container_state;
383#ifdef HAVE_XWAYLAND 383#if HAVE_XWAYLAND
384 // Xwayland views are position-aware and need to be reconfigured 384 // Xwayland views are position-aware and need to be reconfigured
385 // when their position changes. 385 // when their position changes.
386 if (node->sway_container->view->type == SWAY_VIEW_XWAYLAND) { 386 if (node->sway_container->view->type == SWAY_VIEW_XWAYLAND) {