mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-12 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

seamless_mouse: Move pointer only if successfully changed workspace.

Browse source 
If e.g. a window has a popup open then that will lock the current focus,
making a workspace switch denied.

So don't move the mouse pointer in such cases.
This commit is contained in:
S. Christoffer Eliesen 2015-10-23 14:32:17 +02:00
parent 1f08106b0a
commit c1479701de
5 changed files with 33 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

24
sway/focus.c
View file

@ -53,11 +53,10 @@ bool move_focus(enum movement_direction direction) {
view = get_swayc_in_direction(view, direction);
if (view) {
if (direction == MOVE_PARENT) {
set_focused_container(view);
return set_focused_container(view);
} else {
set_focused_container(get_focused_view(view));
return set_focused_container(get_focused_view(view));
}
return true;
}
return false;
}
@ -73,9 +72,9 @@ swayc_t *get_focused_container(swayc_t *parent) {
return parent;
}
void set_focused_container(swayc_t *c) {
bool set_focused_container(swayc_t *c) {
if (locked_container_focus || !c) {
return;
return false;
}
sway_log(L_DEBUG, "Setting focus to %p:%ld", c, c->handle);
@ -84,7 +83,7 @@ void set_focused_container(swayc_t *c) {
swayc_t *focused = get_focused_view(workspace);
// if the workspace we are changing focus to has a fullscreen view return
if (swayc_is_fullscreen(focused) && focused != c) {
return;
return false;
}
// update container focus from here to root, making necessary changes along
@ -115,17 +114,18 @@ void set_focused_container(swayc_t *c) {
}
}
}
return true;
}
void set_focused_container_for(swayc_t *a, swayc_t *c) {
bool set_focused_container_for(swayc_t *a, swayc_t *c) {
if (locked_container_focus || !c) {
return;
return false;
}
swayc_t *find = c;
// Ensure that a is an ancestor of c
while (find != a && (find = find->parent)) {
if (find == &root_container) {
return;
return false;
}
}
@ -134,7 +134,7 @@ void set_focused_container_for(swayc_t *a, swayc_t *c) {
swayc_t *focused = get_focused_view(workspace);
// if the workspace we are changing focus to has a fullscreen view return
if (swayc_is_fullscreen(focused) && c != focused) {
return;
return false;
}
// Check if we changing a parent container that will see chnage
@ -147,8 +147,7 @@ void set_focused_container_for(swayc_t *a, swayc_t *c) {
}
if (effective) {
// Go to set_focused_container
set_focused_container(c);
return;
return set_focused_container(c);
}
sway_log(L_DEBUG, "Setting focus for %p:%ld to %p:%ld",
@ -161,6 +160,7 @@ void set_focused_container_for(swayc_t *a, swayc_t *c) {
p = p->parent;
p->is_focused = false;
}
return true;
}
swayc_t *get_focused_view(swayc_t *parent) {