mirror of
https://github.com/swaywm/sway.git
synced 2025-11-08 13:29:50 -05:00
restored fullscreen/focus behavior
This commit is contained in:
parent
23b90d8e69
commit
03e83c7ef9
6 changed files with 166 additions and 83 deletions
|
|
@ -4,6 +4,7 @@
|
|||
#include "config.h"
|
||||
#include "container.h"
|
||||
#include "workspace.h"
|
||||
#include "focus.h"
|
||||
#include "layout.h"
|
||||
#include "log.h"
|
||||
|
||||
|
|
@ -21,11 +22,26 @@ static swayc_t *new_swayc(enum swayc_types type) {
|
|||
}
|
||||
|
||||
static void free_swayc(swayc_t *c) {
|
||||
//TODO does not properly handle containers with children,
|
||||
//TODO but functions that call this usually check for that
|
||||
// TODO does not properly handle containers with children,
|
||||
// TODO but functions that call this usually check for that
|
||||
if (c->children) {
|
||||
if (c->children->length) {
|
||||
int i;
|
||||
for (i = 0; i < c->children->length; ++i) {
|
||||
free_swayc(c->children->items[i]);
|
||||
}
|
||||
}
|
||||
list_free(c->children);
|
||||
}
|
||||
if (c->floating) {
|
||||
if (c->floating->length) {
|
||||
int i;
|
||||
for (i = 0; i < c->floating->length; ++i) {
|
||||
free_swayc(c->floating->items[i]);
|
||||
}
|
||||
}
|
||||
list_free(c->floating);
|
||||
}
|
||||
if (c->parent) {
|
||||
remove_child(c);
|
||||
}
|
||||
|
|
@ -194,7 +210,7 @@ swayc_t *new_floating_view(wlc_handle handle) {
|
|||
list_add(active_workspace->floating, view);
|
||||
view->parent = active_workspace;
|
||||
if (active_workspace->focused == NULL) {
|
||||
active_workspace->focused = view;
|
||||
set_focused_container_for(active_workspace, view);
|
||||
}
|
||||
return view;
|
||||
}
|
||||
|
|
@ -291,7 +307,7 @@ swayc_t *find_container(swayc_t *container, bool (*test)(swayc_t *view, void *da
|
|||
}
|
||||
|
||||
void container_map(swayc_t *container, void (*f)(swayc_t *view, void *data), void *data) {
|
||||
if (!container->children || !container->children->length) {
|
||||
if (!container || !container->children || !container->children->length) {
|
||||
return;
|
||||
}
|
||||
int i;
|
||||
|
|
@ -300,6 +316,13 @@ void container_map(swayc_t *container, void (*f)(swayc_t *view, void *data), voi
|
|||
f(child, data);
|
||||
container_map(child, f, data);
|
||||
}
|
||||
if (container->type == C_WORKSPACE) {
|
||||
for (i = 0; i < container->floating->length; ++i) {
|
||||
swayc_t *child = container->floating->items[i];
|
||||
f(child, data);
|
||||
container_map(child, f, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void set_view_visibility(swayc_t *view, void *data) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue