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

fixed segfault on exit + a little fixup of that floatfocus pr

Browse source
This commit is contained in:
taiyu 2015-08-25 13:29:33 -07:00
parent 0bf380a0b1
commit 225c2fbe5b
5 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

25
sway/focus.c
View file

@ -164,14 +164,25 @@ void set_focused_container_for(swayc_t *a, swayc_t *c) {
}
swayc_t *get_focused_view(swayc_t *parent) {
while (parent && parent->type != C_VIEW) {
if (parent->type == C_WORKSPACE && parent->focused == NULL) {
return parent;
swayc_t *c = parent;
while (c && c->type != C_VIEW) {
if (c->type == C_WORKSPACE && c->focused == NULL) {
return c;
}
parent = parent->focused;
c = c->focused;
}
if (parent == NULL) {
return swayc_active_workspace_for(parent);
if (c == NULL) {
c = swayc_active_workspace_for(parent);
}
return parent;
return c;
}
swayc_t *get_focused_float(swayc_t *ws) {
if(!sway_assert(ws->type == C_WORKSPACE, "must be of workspace type")) {
ws = swayc_active_workspace();
}
if (ws->floating->length) {
return ws->floating->items[ws->floating->length - 1];
}
return NULL;
}