diff options
| -rw-r--r-- | include/wlr/types/wlr_layer_shell_v1.h | 14 | ||||
| -rw-r--r-- | types/wlr_layer_shell_v1.c | 7 |
2 files changed, 20 insertions, 1 deletions
diff --git a/include/wlr/types/wlr_layer_shell_v1.h b/include/wlr/types/wlr_layer_shell_v1.h index 3fa7d6de..7786779e 100644 --- a/include/wlr/types/wlr_layer_shell_v1.h +++ b/include/wlr/types/wlr_layer_shell_v1.h @@ -43,7 +43,18 @@ struct wlr_layer_shell_v1 { void *data; }; +enum wlr_layer_surface_v1_state_field { + WLR_LAYER_SURFACE_V1_STATE_DESIRED_SIZE = 1 << 0, + WLR_LAYER_SURFACE_V1_STATE_ANCHOR = 1 << 1, + WLR_LAYER_SURFACE_V1_STATE_EXCLUSIVE_ZONE = 1 << 2, + WLR_LAYER_SURFACE_V1_STATE_MARGIN = 1 << 3, + WLR_LAYER_SURFACE_V1_STATE_KEYBOARD_INTERACTIVITY = 1 << 4, + WLR_LAYER_SURFACE_V1_STATE_LAYER = 1 << 5, +}; + struct wlr_layer_surface_v1_state { + uint32_t committed; // enum wlr_layer_surface_v1_state_field + uint32_t anchor; int32_t exclusive_zone; struct { @@ -51,9 +62,10 @@ struct wlr_layer_surface_v1_state { } margin; enum zwlr_layer_surface_v1_keyboard_interactivity keyboard_interactive; uint32_t desired_width, desired_height; - uint32_t actual_width, actual_height; enum zwlr_layer_shell_v1_layer layer; + uint32_t configure_serial; + uint32_t actual_width, actual_height; }; struct wlr_layer_surface_v1_configure { diff --git a/types/wlr_layer_shell_v1.c b/types/wlr_layer_shell_v1.c index 09789ebe..3d4ecf16 100644 --- a/types/wlr_layer_shell_v1.c +++ b/types/wlr_layer_shell_v1.c @@ -103,6 +103,7 @@ static void layer_surface_handle_set_size(struct wl_client *client, if (!surface) { return; } + surface->pending.committed |= WLR_LAYER_SURFACE_V1_STATE_DESIRED_SIZE; surface->pending.desired_width = width; surface->pending.desired_height = height; } @@ -124,6 +125,7 @@ static void layer_surface_handle_set_anchor(struct wl_client *client, if (!surface) { return; } + surface->pending.committed |= WLR_LAYER_SURFACE_V1_STATE_ANCHOR; surface->pending.anchor = anchor; } @@ -134,6 +136,7 @@ static void layer_surface_handle_set_exclusive_zone(struct wl_client *client, if (!surface) { return; } + surface->pending.committed |= WLR_LAYER_SURFACE_V1_STATE_EXCLUSIVE_ZONE; surface->pending.exclusive_zone = zone; } @@ -145,6 +148,7 @@ static void layer_surface_handle_set_margin( if (!surface) { return; } + surface->pending.committed |= WLR_LAYER_SURFACE_V1_STATE_MARGIN; surface->pending.margin.top = top; surface->pending.margin.right = right; surface->pending.margin.bottom = bottom; @@ -160,6 +164,7 @@ static void layer_surface_handle_set_keyboard_interactivity( return; } + surface->pending.committed |= WLR_LAYER_SURFACE_V1_STATE_KEYBOARD_INTERACTIVITY; if (wl_resource_get_version(resource) < ZWLR_LAYER_SURFACE_V1_KEYBOARD_INTERACTIVITY_ON_DEMAND_SINCE_VERSION) { surface->pending.keyboard_interactive = !!interactive; } else { @@ -204,6 +209,7 @@ static void layer_surface_set_layer(struct wl_client *client, "Invalid layer %" PRIu32, layer); return; } + surface->pending.committed |= WLR_LAYER_SURFACE_V1_STATE_LAYER; surface->pending.layer = layer; } @@ -309,6 +315,7 @@ static void layer_surface_role_commit(struct wlr_surface *wlr_surface) { } surface->current = surface->pending; + surface->pending.committed = 0; if (wlr_surface_has_buffer(surface->surface) && !surface->configured) { wl_resource_post_error(surface->resource, |