diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2018-10-24 14:37:49 +0200 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2018-11-08 13:21:53 +0100 |
| commit | 180bb02fa5ca2974d1fe462020b561274d64c6e2 (patch) | |
| tree | 0b650309c70d9684410911d5008617d272105287 | |
| parent | d59cf98690de38218a9ad00f3b175809d0f8ba3f (diff) | |
| download | mutter-180bb02fa5ca2974d1fe462020b561274d64c6e2.tar.gz | |
wayland/gtk-shell: Use helper to fill state array
| -rw-r--r-- | src/wayland/meta-wayland-gtk-shell.c | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/src/wayland/meta-wayland-gtk-shell.c b/src/wayland/meta-wayland-gtk-shell.c index a9711afea..f53818265 100644 --- a/src/wayland/meta-wayland-gtk-shell.c +++ b/src/wayland/meta-wayland-gtk-shell.c @@ -202,11 +202,20 @@ send_configure_edges (MetaWaylandGtkSurface *gtk_surface, } static void +add_state_value (struct wl_array *states, + enum gtk_surface1_state state) +{ + uint32_t *s; + + s = wl_array_add (states, sizeof *s); + *s = state; +} + +static void fill_states (struct wl_array *states, MetaWindow *window, struct wl_resource *resource) { - uint32_t *s; int version; version = wl_resource_get_version (resource); @@ -214,38 +223,23 @@ fill_states (struct wl_array *states, if (version < GTK_SURFACE1_CONFIGURE_EDGES_SINCE_VERSION && (window->tile_mode == META_TILE_LEFT || window->tile_mode == META_TILE_RIGHT)) - { - s = wl_array_add (states, sizeof *s); - *s = GTK_SURFACE1_STATE_TILED; - } + add_state_value (states, GTK_SURFACE1_STATE_TILED); if (version >= GTK_SURFACE1_STATE_TILED_TOP_SINCE_VERSION && window->edge_constraints.top != META_EDGE_CONSTRAINT_NONE) - { - s = wl_array_add (states, sizeof *s); - *s = GTK_SURFACE1_STATE_TILED_TOP; - } + add_state_value (states, GTK_SURFACE1_STATE_TILED_TOP); if (version >= GTK_SURFACE1_STATE_TILED_RIGHT_SINCE_VERSION && window->edge_constraints.right != META_EDGE_CONSTRAINT_NONE) - { - s = wl_array_add (states, sizeof *s); - *s = GTK_SURFACE1_STATE_TILED_RIGHT; - } + add_state_value (states, GTK_SURFACE1_STATE_TILED_RIGHT); if (version >= GTK_SURFACE1_STATE_TILED_BOTTOM_SINCE_VERSION && window->edge_constraints.bottom != META_EDGE_CONSTRAINT_NONE) - { - s = wl_array_add (states, sizeof *s); - *s = GTK_SURFACE1_STATE_TILED_BOTTOM; - } + add_state_value (states, GTK_SURFACE1_STATE_TILED_BOTTOM); if (version >= GTK_SURFACE1_STATE_TILED_LEFT_SINCE_VERSION && window->edge_constraints.left != META_EDGE_CONSTRAINT_NONE) - { - s = wl_array_add (states, sizeof *s); - *s = GTK_SURFACE1_STATE_TILED_LEFT; - } + add_state_value (states, GTK_SURFACE1_STATE_TILED_LEFT); } static void |