alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #71 from Luminarys/master

Browse source 
Added in proper focus handling for floating containers.
This commit is contained in:
Drew DeVault 2015-08-18 15:24:39 -04:00
parent ef2f3d3115 7756f423c3
commit 62a21d9d4d
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sway/handlers.c
View file

@ -57,14 +57,16 @@ swayc_t *container_under_pointer(void) {
} }
// if workspace, search floating // if workspace, search floating
if (lookup->type == C_WORKSPACE) { if (lookup->type == C_WORKSPACE) {
len = lookup->floating->length; i = len = lookup->floating->length;
for (i = 0; i < len; ++i) { bool got_floating = false;
while (--i > -1) {
if (pointer_test(lookup->floating->items[i], &mouse_origin)) { if (pointer_test(lookup->floating->items[i], &mouse_origin)) {
lookup = lookup->floating->items[i]; lookup = lookup->floating->items[i];
got_floating = true;
break; break;
} }
} }
if (i < len) { if (got_floating) {
continue; continue;
} }
} }
@ -441,6 +443,17 @@ static bool handle_pointer_button(wlc_handle view, uint32_t time, const struct w
} }
swayc_t *pointer = container_under_pointer(); swayc_t *pointer = container_under_pointer();
set_focused_container(pointer); set_focused_container(pointer);
if (pointer->is_floating) {
int i;
for (i = 0; i < pointer->parent->floating->length; i++) {
if (pointer->parent->floating->items[i] == pointer) {
list_del(pointer->parent->floating, i);
list_add(pointer->parent->floating, pointer);
break;
}
}
arrange_windows(pointer->parent, -1, -1);
}
return (pointer && pointer != focused); return (pointer && pointer != focused);
} else { } else {
sway_log(L_DEBUG, "Mouse button %u released", button); sway_log(L_DEBUG, "Mouse button %u released", button);