mirror of
https://github.com/swaywm/sway.git
synced 2025-11-07 13:29:56 -05:00
update visibility + container info functions
This commit is contained in:
parent
dfe0dda8d0
commit
5678d824e4
4 changed files with 77 additions and 53 deletions
104
sway/container.c
104
sway/container.c
|
|
@ -547,6 +547,20 @@ bool swayc_is_active(swayc_t *view) {
|
|||
return view && view->type == C_VIEW && (wlc_view_get_state(view->handle) & WLC_BIT_ACTIVATED);
|
||||
}
|
||||
|
||||
bool swayc_is_parent_of(swayc_t *parent, swayc_t *child) {
|
||||
while (child != &root_container) {
|
||||
child = child->parent;
|
||||
if (child == parent) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool swayc_is_child_of(swayc_t *child, swayc_t *parent) {
|
||||
return swayc_is_parent_of(parent, child);
|
||||
}
|
||||
|
||||
// Mapping
|
||||
|
||||
void container_map(swayc_t *container, void (*f)(swayc_t *view, void *data), void *data) {
|
||||
|
|
@ -568,58 +582,64 @@ void container_map(swayc_t *container, void (*f)(swayc_t *view, void *data), voi
|
|||
}
|
||||
}
|
||||
|
||||
void set_view_visibility(swayc_t *view, void *data) {
|
||||
if (!ASSERT_NONNULL(view)) {
|
||||
return;
|
||||
void update_visibility_output(swayc_t *container, wlc_handle output) {
|
||||
// Inherit visibility
|
||||
swayc_t *parent = container->parent;
|
||||
container->visible = parent->visible;
|
||||
// special cases where visibility depends on focus
|
||||
if (parent->type == C_OUTPUT
|
||||
|| parent->layout == L_TABBED
|
||||
|| parent->layout == L_STACKED) {
|
||||
container->visible = parent->focused == container;
|
||||
}
|
||||
// TODO add something like this.
|
||||
// if (container->type == C_ROOT) {
|
||||
// container->visible = true;
|
||||
// } else {
|
||||
// // Inherit visibility
|
||||
// swayc_t *parent = container->parent;
|
||||
// container->visible = parent->visible;
|
||||
// // special cases where visibility depends on focus
|
||||
// if (parent->type == C_OUTPUT || parent->layout == L_TABBED ||
|
||||
// parent->layout == L_STACKED) {
|
||||
// container->visible = parent->focused == container;
|
||||
// }
|
||||
// }
|
||||
bool visible = *(bool *)data;
|
||||
if (view->type == C_VIEW) {
|
||||
wlc_view_set_output(view->handle, swayc_parent_by_type(view, C_OUTPUT)->handle);
|
||||
wlc_view_set_mask(view->handle, visible ? VISIBLE : 0);
|
||||
if (visible) {
|
||||
wlc_view_bring_to_front(view->handle);
|
||||
// Set visibility and output for view
|
||||
if (container->type == C_VIEW) {
|
||||
wlc_view_set_output(container->handle, output);
|
||||
wlc_view_set_mask(container->handle, container->visible ? VISIBLE : 0);
|
||||
if (container->visible) {
|
||||
wlc_view_bring_to_front(container->handle);
|
||||
} else {
|
||||
wlc_view_send_to_back(view->handle);
|
||||
wlc_view_send_to_back(container->handle);
|
||||
}
|
||||
}
|
||||
// Update visibility for children
|
||||
else if (container->children) {
|
||||
int i, len = container->children->length;
|
||||
for (i = 0; i < len; ++i) {
|
||||
update_visibility_output(container->children->items[i], output);
|
||||
}
|
||||
}
|
||||
view->visible = visible;
|
||||
sway_log(L_DEBUG, "Container %p is now %s", view, visible ? "visible" : "invisible");
|
||||
}
|
||||
|
||||
void update_visibility(swayc_t *container) {
|
||||
if (!container) {
|
||||
return;
|
||||
}
|
||||
swayc_t *ws;
|
||||
if (container->type == C_ROOT || container->type == C_OUTPUT) {
|
||||
int i, len = container->children->length;
|
||||
for (i = 0; i < len; ++i) {
|
||||
update_visibility(container->children->items[i]);
|
||||
if (!container) return;
|
||||
switch (container->type) {
|
||||
case C_ROOT:
|
||||
container->visible = true;
|
||||
if (container->children) {
|
||||
int i, len = container->children->length;
|
||||
for (i = 0; i < len; ++i) {
|
||||
update_visibility(container->children->items[i]);
|
||||
}
|
||||
}
|
||||
return;
|
||||
} else if (container->type == C_WORKSPACE) {
|
||||
container->visible = container->parent->focused == container;
|
||||
ws = container;
|
||||
} else {
|
||||
ws = swayc_active_workspace_for(container);
|
||||
|
||||
case C_OUTPUT:
|
||||
container->visible = true;
|
||||
if (container->children) {
|
||||
int i, len = container->children->length;
|
||||
for (i = 0; i < len; ++i) {
|
||||
update_visibility_output(container->children->items[i], container->handle);
|
||||
}
|
||||
}
|
||||
return;
|
||||
|
||||
default:
|
||||
{
|
||||
swayc_t *op = swayc_parent_by_type(container, C_OUTPUT);
|
||||
update_visibility_output(container, op->handle);
|
||||
}
|
||||
}
|
||||
// TODO better visibility setting
|
||||
bool visible = (ws->parent->focused == ws);
|
||||
sway_log(L_DEBUG, "Setting visibility of container %p to %s", container, visible ? "visible" : "invisible");
|
||||
container_map(ws, set_view_visibility, &visible);
|
||||
}
|
||||
|
||||
void reset_gaps(swayc_t *view, void *data) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue