From 8df79486efcdf1560cf3fe330f4acc6dd2a5dac5 Mon Sep 17 00:00:00 2001 From: tiosgz Date: Sat, 24 Apr 2021 11:53:05 +0000 Subject: [PATCH 1/2] Fix incompatibilities with wlroots 0.13 --- include/desktop/output.h | 2 +- kiwmi/desktop/output.c | 13 ++- kiwmi/input/keyboard.c | 4 +- kiwmi/server.c | 2 +- protocols/wlr-layer-shell-unstable-v1.xml | 109 ++++++++++++++++++++-- 5 files changed, 111 insertions(+), 19 deletions(-) diff --git a/include/desktop/output.h b/include/desktop/output.h index 9a91e8c..b36351c 100644 --- a/include/desktop/output.h +++ b/include/desktop/output.h @@ -17,7 +17,7 @@ struct kiwmi_output { struct wl_listener frame; struct wl_listener destroy; struct wl_listener mode; - struct wl_listener transform; + struct wl_listener commit; struct wl_list layers[4]; // struct kiwmi_layer_surface::link diff --git a/kiwmi/desktop/output.c b/kiwmi/desktop/output.c index 53b5fcf..6116716 100644 --- a/kiwmi/desktop/output.c +++ b/kiwmi/desktop/output.c @@ -196,13 +196,16 @@ output_mode_notify(struct wl_listener *listener, void *UNUSED(data)) } static void -output_transform_notify(struct wl_listener *listener, void *UNUSED(data)) +output_commit_notify(struct wl_listener *listener, void *data) { - struct kiwmi_output *output = wl_container_of(listener, output, transform); + struct kiwmi_output *output = wl_container_of(listener, output, commit); + struct wlr_output_event_commit *event = data; arrange_layers(output); - wl_signal_emit(&output->events.resize, output); + if (event->committed == WLR_OUTPUT_STATE_TRANSFORM) { + wl_signal_emit(&output->events.resize, output); + } } static struct kiwmi_output * @@ -225,8 +228,8 @@ output_create(struct wlr_output *wlr_output, struct kiwmi_desktop *desktop) output->mode.notify = output_mode_notify; wl_signal_add(&wlr_output->events.mode, &output->mode); - output->transform.notify = output_transform_notify; - wl_signal_add(&wlr_output->events.transform, &output->transform); + output->commit.notify = output_commit_notify; + wl_signal_add(&wlr_output->events.commit, &output->commit); return output; } diff --git a/kiwmi/input/keyboard.c b/kiwmi/input/keyboard.c index 3563fa7..fd6613d 100644 --- a/kiwmi/input/keyboard.c +++ b/kiwmi/input/keyboard.c @@ -75,7 +75,7 @@ keyboard_key_notify(struct wl_listener *listener, void *data) bool handled = false; - if (event->state == WLR_KEY_PRESSED) { + if (event->state == WL_KEYBOARD_KEY_STATE_PRESSED) { handled = switch_vt(translated_syms, translated_syms_len, server->backend); } @@ -91,7 +91,7 @@ keyboard_key_notify(struct wl_listener *listener, void *data) .handled = false, }; - if (event->state == WLR_KEY_PRESSED) { + if (event->state == WL_KEYBOARD_KEY_STATE_PRESSED) { wl_signal_emit(&keyboard->events.key_down, &data); } else { wl_signal_emit(&keyboard->events.key_up, &data); diff --git a/kiwmi/server.c b/kiwmi/server.c index 4248af2..0f0203d 100644 --- a/kiwmi/server.c +++ b/kiwmi/server.c @@ -33,7 +33,7 @@ server_init(struct kiwmi_server *server, char *config_path) server->wl_event_loop = wl_display_get_event_loop(server->wl_display); - server->backend = wlr_backend_autocreate(server->wl_display, NULL); + server->backend = wlr_backend_autocreate(server->wl_display); if (!server->backend) { wlr_log(WLR_ERROR, "Failed to create backend"); wl_display_destroy(server->wl_display); diff --git a/protocols/wlr-layer-shell-unstable-v1.xml b/protocols/wlr-layer-shell-unstable-v1.xml index adc6a17..d62fd51 100644 --- a/protocols/wlr-layer-shell-unstable-v1.xml +++ b/protocols/wlr-layer-shell-unstable-v1.xml @@ -25,7 +25,7 @@ THIS SOFTWARE. - + Clients can use this interface to assign the surface_layer role to wl_surfaces. Such surfaces are assigned to a "layer" of the output and @@ -47,6 +47,12 @@ or manipulate a buffer prior to the first layer_surface.configure call must also be treated as errors. + After creating a layer_surface object and setting it up, the client + must perform an initial commit without any buffer attached. + The compositor will reply with a layer_surface.configure event. + The client must acknowledge it and is then allowed to attach a buffer + to map the surface. + You may pass NULL for output to allow the compositor to decide which output to use. Generally this will be the one that the user most recently interacted with. @@ -82,9 +88,19 @@ + + + + + + This request indicates that the client will not use the layer_shell + object any more. Objects that have been created through this instance + are not affected. + + - + An interface that may be implemented by a wl_surface, for surfaces that are designed to be rendered as a layer of a stacked desktop-like @@ -93,6 +109,14 @@ Layer surface state (layer, size, anchor, exclusive zone, margin, interactivity) is double-buffered, and will be applied at the time wl_surface.commit of the corresponding wl_surface is called. + + Attaching a null buffer to a layer surface unmaps it. + + Unmapping a layer_surface means that the surface cannot be shown by the + compositor until it is explicitly mapped again. The layer_surface + returns to the state it had right after layer_shell.get_layer_surface. + The client can re-map the surface by performing a commit without any + buffer attached, waiting for a configure event and handling it as usual. @@ -179,21 +203,85 @@ + + + Types of keyboard interaction possible for layer shell surfaces. The + rationale for this is twofold: (1) some applications are not interested + in keyboard events and not allowing them to be focused can improve the + desktop experience; (2) some applications will want to take exclusive + keyboard focus. + + + + + This value indicates that this surface is not interested in keyboard + events and the compositor should never assign it the keyboard focus. + + This is the default value, set for newly created layer shell surfaces. + + This is useful for e.g. desktop widgets that display information or + only have interaction with non-keyboard input devices. + + + + + Request exclusive keyboard focus if this surface is above the shell surface layer. + + For the top and overlay layers, the seat will always give + exclusive keyboard focus to the top-most layer which has keyboard + interactivity set to exclusive. If this layer contains multiple + surfaces with keyboard interactivity set to exclusive, the compositor + determines the one receiving keyboard events in an implementation- + defined manner. In this case, no guarantee is made when this surface + will receive keyboard focus (if ever). + + For the bottom and background layers, the compositor is allowed to use + normal focus semantics. + + This setting is mainly intended for applications that need to ensure + they receive all keyboard events, such as a lock screen or a password + prompt. + + + + + This requests the compositor to allow this surface to be focused and + unfocused by the user in an implementation-defined manner. The user + should be able to unfocus this surface even regardless of the layer + it is on. + + Typically, the compositor will want to use its normal mechanism to + manage keyboard focus between layer shell surfaces with this setting + and regular toplevels on the desktop layer (e.g. click to focus). + Nevertheless, it is possible for a compositor to require a special + interaction to focus or unfocus layer shell surfaces (e.g. requiring + a click even if focus follows the mouse normally, or providing a + keybinding to switch focus between layers). + + This setting is mainly intended for desktop shell components (e.g. + panels) that allow keyboard interaction. Using this option can allow + implementing a desktop shell that can be fully usable without the + mouse. + + + + - Set to 1 to request that the seat send keyboard events to this layer - surface. For layers below the shell surface layer, the seat will use - normal focus semantics. For layers above the shell surface layers, the - seat will always give exclusive keyboard focus to the top-most layer - which has keyboard interactivity set to true. + Set how keyboard events are delivered to this surface. By default, + layer shell surfaces do not receive keyboard events; this request can + be used to change this. + + This setting is inherited by child surfaces set by the get_popup + request. Layer surfaces receive pointer, touch, and tablet events normally. If you do not want to receive them, set the input region on your surface to an empty region. - Events is double-buffered, see wl_surface.commit. + Keyboard interactivity is double-buffered, see wl_surface.commit. - + @@ -278,6 +366,7 @@ + @@ -295,7 +384,7 @@ Layer is double-buffered, see wl_surface.commit. - + From 67900b3e9f2139c3917501f2f286ff95e4e8a6a0 Mon Sep 17 00:00:00 2001 From: tiosgz Date: Sat, 19 Jun 2021 10:19:57 +0000 Subject: [PATCH 2/2] Avoid unnecessary layer arrangement Plus restore alphabetical order --- include/desktop/output.h | 2 +- kiwmi/desktop/output.c | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/include/desktop/output.h b/include/desktop/output.h index b36351c..bd280d5 100644 --- a/include/desktop/output.h +++ b/include/desktop/output.h @@ -15,9 +15,9 @@ struct kiwmi_output { struct kiwmi_desktop *desktop; struct wlr_output *wlr_output; struct wl_listener frame; + struct wl_listener commit; struct wl_listener destroy; struct wl_listener mode; - struct wl_listener commit; struct wl_list layers[4]; // struct kiwmi_layer_surface::link diff --git a/kiwmi/desktop/output.c b/kiwmi/desktop/output.c index 6116716..c4bfb9d 100644 --- a/kiwmi/desktop/output.c +++ b/kiwmi/desktop/output.c @@ -168,6 +168,19 @@ output_frame_notify(struct wl_listener *listener, void *data) wlr_output_commit(wlr_output); } +static void +output_commit_notify(struct wl_listener *listener, void *data) +{ + struct kiwmi_output *output = wl_container_of(listener, output, commit); + struct wlr_output_event_commit *event = data; + + if (event->committed & WLR_OUTPUT_STATE_TRANSFORM) { + arrange_layers(output); + + wl_signal_emit(&output->events.resize, output); + } +} + static void output_destroy_notify(struct wl_listener *listener, void *UNUSED(data)) { @@ -195,19 +208,6 @@ output_mode_notify(struct wl_listener *listener, void *UNUSED(data)) wl_signal_emit(&output->events.resize, output); } -static void -output_commit_notify(struct wl_listener *listener, void *data) -{ - struct kiwmi_output *output = wl_container_of(listener, output, commit); - struct wlr_output_event_commit *event = data; - - arrange_layers(output); - - if (event->committed == WLR_OUTPUT_STATE_TRANSFORM) { - wl_signal_emit(&output->events.resize, output); - } -} - static struct kiwmi_output * output_create(struct wlr_output *wlr_output, struct kiwmi_desktop *desktop) { @@ -222,15 +222,15 @@ output_create(struct wlr_output *wlr_output, struct kiwmi_desktop *desktop) output->frame.notify = output_frame_notify; wl_signal_add(&wlr_output->events.frame, &output->frame); + output->commit.notify = output_commit_notify; + wl_signal_add(&wlr_output->events.commit, &output->commit); + output->destroy.notify = output_destroy_notify; wl_signal_add(&wlr_output->events.destroy, &output->destroy); output->mode.notify = output_mode_notify; wl_signal_add(&wlr_output->events.mode, &output->mode); - output->commit.notify = output_commit_notify; - wl_signal_add(&wlr_output->events.commit, &output->commit); - return output; }