mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-12 08:21:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

cursor: fix layer subsurface focus bug

Browse source 
...by checking keyboard-interactivity before giving layer-subsurface focus
on button press.

Before this patch, waybar's raise-minimize did not work because keyboard
focus was given to waybar layer-shell subsurfaces without checking for
their keyboard interactivity setting.  Clicking on a waybar task-button
gave keyboard focus to that button which removed it from the client and
therefore confused the panel logic.

Fixes: issue #1131
This commit is contained in:
Johan Malm 2023-10-02 22:04:40 +01:00
parent 3e5b988d38
commit 1d8ed7a590
1 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/cursor.c
View file

@ -880,6 +880,19 @@ handle_press_mousebinding(struct server *server, struct cursor_context *ctx,
/* Set in cursor_button_press(), used in cursor_button_release() */ /* Set in cursor_button_press(), used in cursor_button_release() */
static bool close_menu; static bool close_menu;
static struct wlr_surface *
top_parent_of(struct wlr_surface *wlr_surface)
{
struct wlr_subsurface *subsurface = wl_container_of(wlr_surface, subsurface, surface);
struct wlr_surface *parent = subsurface->parent;
if (!parent) {
return NULL;
} else if (wlr_surface_is_layer_surface(parent)) {
return parent;
}
return top_parent_of(parent);
}
static void static void
cursor_button_press(struct seat *seat, struct wlr_pointer_button_event *event) cursor_button_press(struct seat *seat, struct wlr_pointer_button_event *event)
{ {
@ -915,7 +928,14 @@ cursor_button_press(struct seat *seat, struct wlr_pointer_button_event *event)
} }
} }
if (ctx.type == LAB_SSD_LAYER_SUBSURFACE) { if (ctx.type == LAB_SSD_LAYER_SUBSURFACE) {
seat_focus_surface(seat, ctx.surface); struct wlr_surface *top = top_parent_of(ctx.surface);
if (top) {
struct wlr_layer_surface_v1 *layer =
wlr_layer_surface_v1_from_wlr_surface(top);
if (layer->current.keyboard_interactive) {
seat_set_focus_layer(seat, layer);
}
}
} }
if (ctx.type != LAB_SSD_CLIENT && ctx.type != LAB_SSD_LAYER_SUBSURFACE if (ctx.type != LAB_SSD_CLIENT && ctx.type != LAB_SSD_LAYER_SUBSURFACE