mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-02-07 04:07:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

followMouse: allow focus switching via A-Tab

Browse source 
Fixes a regression caused by the recent enhancement of followMouse behavior.

Fixes: #849
Reported-by: mitigate via IRC
This commit is contained in:
Consolatis 2023-03-26 06:14:48 +02:00 • committed by Johan Malm
parent 33b98b19aa
commit e45fe0804d
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/cursor.c
View file

@ -509,7 +509,8 @@ cursor_update_focus(struct server *server)
/* Focus surface under cursor if it isn't already focused */ /* Focus surface under cursor if it isn't already focused */
struct cursor_context ctx = get_cursor_context(server); struct cursor_context ctx = get_cursor_context(server);
if (ctx.view && rc.focus_follow_mouse) { if (ctx.view && rc.focus_follow_mouse && !server->osd_state.cycle_view) {
/* Prevent changing keyboard focus during A-Tab */
desktop_focus_and_activate_view(&server->seat, ctx.view); desktop_focus_and_activate_view(&server->seat, ctx.view);
if (rc.raise_on_focus) { if (rc.raise_on_focus) {
/* /*

10
src/osd.c
View file

@ -164,7 +164,6 @@ osd_on_view_destroy(struct view *view)
void void
osd_finish(struct server *server) osd_finish(struct server *server)
{ {
server->osd_state.cycle_view = NULL;
server->osd_state.preview_node = NULL; server->osd_state.preview_node = NULL;
server->osd_state.preview_anchor = NULL; server->osd_state.preview_anchor = NULL;
@ -181,6 +180,15 @@ osd_finish(struct server *server)
/* Hiding OSD may need a cursor change */ /* Hiding OSD may need a cursor change */
cursor_update_focus(server); cursor_update_focus(server);
/*
* We delay resetting cycle_view until after cursor_update_focus()
* has been called to allow A-Tab keyboard focus switching even if
* followMouse has been configured and the cursor is on a different
* surface. Otherwise cursor_update_focus() would automatically
* refocus the surface the cursor is currently on.
*/
server->osd_state.cycle_view = NULL;
} }
void void