mirror of
https://github.com/labwc/labwc.git
synced 2026-04-03 07:15:34 -04:00
layer: let top-layer on-demand clients grab focus
Soften the new rule introduced by 155c153 because it broke lxqt-runner
which defaults to the top-layer, and we do not want to knowingly break
user-space without a very good reason which we do not have for this.
Fixes: #3381
This commit is contained in:
parent
654da8c8a9
commit
477bae1422
1 changed files with 11 additions and 11 deletions
22
src/layers.c
22
src/layers.c
|
|
@ -383,9 +383,9 @@ handle_unmap(struct wl_listener *listener, void *data)
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool
|
static bool
|
||||||
is_overlay(struct wlr_layer_surface_v1 *layer_surface)
|
is_above_toplevels(struct wlr_layer_surface_v1 *layer_surface)
|
||||||
{
|
{
|
||||||
return layer_surface->current.layer == ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY;
|
return layer_surface->current.layer >= ZWLR_LAYER_SHELL_V1_LAYER_TOP;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
@ -408,18 +408,18 @@ handle_map(struct wl_listener *listener, void *data)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Layer-shell clients with exclusive interactivity always get focus,
|
* Layer-shell clients with exclusive interactivity always get focus,
|
||||||
* whereas on-demand ones only get it when in the overlay layer. We
|
* whereas on-demand ones only get it when above toplevels (i.e. in the
|
||||||
* could make this configurable, but for the time being this default
|
* top or overlay layers). We could make this configurable, but for the
|
||||||
* behaviour strikes a balance between:
|
* time being this default behaviour strikes a balance between:
|
||||||
*
|
*
|
||||||
* 1. Giving overlay, on-demand clients (like labnag with the default
|
* 1. Giving top/overlay, on-demand clients (like labnag and
|
||||||
* <prompt> settings) keyboard focus.
|
* lxqt-runner) keyboard focus.
|
||||||
* 2. Preventing desktop components like panels and desktops from
|
* 2. Preventing desktop components like desktops from stealing
|
||||||
* stealing keyboard focus on re-start. On compositor start, this
|
* keyboard focus on re-start. On compositor start, this is not
|
||||||
* is not really a problem, but if any such client restarts later,
|
* really a problem, but if any such client restarts later,
|
||||||
* focus-stealing is unlikely to be desirable.
|
* focus-stealing is unlikely to be desirable.
|
||||||
*/
|
*/
|
||||||
if (!is_overlay(layer_surface) && is_on_demand(layer_surface)) {
|
if (!is_above_toplevels(layer_surface) && is_on_demand(layer_surface)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue