mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-29 00:16:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix bug with previous commit

Browse source
This commit is contained in:
Drew DeVault 2018-03-31 10:47:04 -04:00
parent 8aa195e311
commit ccdcaa478f
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
sway/input/cursor.c
View file

@ -175,11 +175,26 @@ static void handle_cursor_button(struct wl_listener *listener, void *data) {
double sx, sy;
struct sway_container *cont =
container_at_cursor(cursor, &surface, &sx, &sy);
// TODO: Actually test if the surface accepts keyboard input, rather
// than assuming it does not
// Layer surfaces with keyboard_interactive=true will change how this
// works, for example.
if (!surface || cont->type == C_VIEW) {
// Avoid moving keyboard focus from a surface that accepts it to one
// that does not unless the change would move us to a new workspace.
//
// This prevents, for example, losing focus when clicking on swaybar.
//
// TODO: Replace this condition with something like
// !surface_accepts_keyboard_input
if (surface && cont->type != C_VIEW) {
struct sway_container *new_ws = cont;
if (new_ws && new_ws->type != C_WORKSPACE) {
new_ws = container_parent(new_ws, C_WORKSPACE);
}
struct sway_container *old_ws = sway_seat_get_focus(cursor->seat);
if (old_ws && old_ws->type != C_WORKSPACE) {
old_ws = container_parent(old_ws, C_WORKSPACE);
}
if (new_ws != old_ws) {
sway_seat_set_focus(cursor->seat, cont);
}
} else {
sway_seat_set_focus(cursor->seat, cont);
}
}