mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-29 05:40:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove cruft related to window switcher and keyboard focus

Browse source 
This commit cleans up the comments and cruft from e45fe08.

Background:

- With e45fe08, the keyboard focus is always moved to the switched window
  on finishing window switcher, even with <focus followMouse="yes">.
  Since followMouseRequiresMovement was not implemented at that time
  (behaved like it was always "no"), e45fe08 was necessary to allow users
  users who use followMouse="yes" to move the keyboard focus with window
  switcher.
- 9a9e20d added followMouseRequiresMovement, but it kept the behavior
  described above even with followMouse="yes" and
  followMouseRequiresMovement="no".
- 398b80b accidentally invalidated e45fe08, which means the keyboard focus
  is now always moved to the window below the cursor on finishing window
  switcher with followMouse="yes" and followMouseRequiresMovement="no".

Although the invalidation was a accident, I think always setting the
keyboard focus on the window below the cursor is what users expect from
followMouse="yes" and followMouseRequiresMovement="no".
This commit is contained in:
tokyo4j 2024-12-31 13:00:32 +09:00 • committed by Consolatis
parent 304a94e716
commit 7a6ecca804
2 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/input/cursor.c
View file

@ -637,10 +637,11 @@ _cursor_update_focus(struct server *server)
struct cursor_context ctx = get_cursor_context(server);
if ((ctx.view || ctx.surface) && rc.focus_follow_mouse
&& !rc.focus_follow_mouse_requires_movement
&& server->input_mode
!= LAB_INPUT_STATE_WINDOW_SWITCHER) {
/* Prevents changing keyboard focus during A-Tab */
&& !rc.focus_follow_mouse_requires_movement) {
/*
* Always focus the surface below the cursor when
* followMouse=yes and followMouseRequiresMovement=no.
*/
desktop_focus_view_or_surface(&server->seat, ctx.view,
ctx.surface, rc.raise_on_focus);
}

10
src/osd.c
View file

@ -205,6 +205,7 @@ osd_finish(struct server *server)
server->osd_state.preview_node = NULL;
server->osd_state.preview_anchor = NULL;
server->osd_state.cycle_view = NULL;
struct output *output;
wl_list_for_each(output, &server->outputs, link) {
@ -219,15 +220,6 @@ osd_finish(struct server *server)
/* Hiding OSD may need a cursor change */
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;
}
static void