mirror of
https://github.com/gwenhael-le-moine/sway-patched-tray-menu.git
synced 2024-12-27 21:58:16 +01:00
69a1a0ff99
When setting fullscreen on a hidden scratchpad container, there was a check to see if there was an existing fullscreen container on the workspace so it could be fullscreen disabled first. Since the workspace is NULL, it would cause a SIGSEGV. This adds a NULL check to avoid the crash. This also changes the behavior of how fullscreen is handled when adding a container to the scratchpad or changing visibility of a scratchpad container to match i3's. The behavior is as follows: - When adding a container to the scratchpad or hiding a container back into the scratchpad, there is an implicit fullscreen disable - When setting fullscreen on a container that is hidden in the scratchpad, it will be fullscreen when shown (and fullscreen disabled when hidden as stated above) - When setting fullscreen global on a container that is hidden in the scratchpad, it will be shown immediately as fullscreen global. The container is not moved to a workspace and remains in the scratchpad. The container will be visible until fullscreen disabled or killed. Since the container is in the scratchpad, running `scratchpad show` or `move container to scratchpad` will have no effect This also changes `container_replace` to transfer fullscreen and scratchpad status.
161 lines
3.5 KiB
C
161 lines
3.5 KiB
C
#define _POSIX_C_SOURCE 200809L
|
|
#include "sway/output.h"
|
|
#include "sway/server.h"
|
|
#include "sway/tree/container.h"
|
|
#include "sway/tree/node.h"
|
|
#include "sway/tree/root.h"
|
|
#include "sway/tree/workspace.h"
|
|
#include "log.h"
|
|
|
|
void node_init(struct sway_node *node, enum sway_node_type type, void *thing) {
|
|
static size_t next_id = 1;
|
|
node->id = next_id++;
|
|
node->type = type;
|
|
node->sway_root = thing;
|
|
wl_signal_init(&node->events.destroy);
|
|
}
|
|
|
|
const char *node_type_to_str(enum sway_node_type type) {
|
|
switch (type) {
|
|
case N_ROOT:
|
|
return "N_ROOT";
|
|
case N_OUTPUT:
|
|
return "N_OUTPUT";
|
|
case N_WORKSPACE:
|
|
return "N_WORKSPACE";
|
|
case N_CONTAINER:
|
|
return "N_CONTAINER";
|
|
}
|
|
return "";
|
|
}
|
|
|
|
void node_set_dirty(struct sway_node *node) {
|
|
if (node->dirty) {
|
|
return;
|
|
}
|
|
node->dirty = true;
|
|
list_add(server.dirty_nodes, node);
|
|
}
|
|
|
|
bool node_is_view(struct sway_node *node) {
|
|
return node->type == N_CONTAINER && node->sway_container->view;
|
|
}
|
|
|
|
char *node_get_name(struct sway_node *node) {
|
|
switch (node->type) {
|
|
case N_ROOT:
|
|
return "root";
|
|
case N_OUTPUT:
|
|
return node->sway_output->wlr_output->name;
|
|
case N_WORKSPACE:
|
|
return node->sway_workspace->name;
|
|
case N_CONTAINER:
|
|
return node->sway_container->title;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
void node_get_box(struct sway_node *node, struct wlr_box *box) {
|
|
switch (node->type) {
|
|
case N_ROOT:
|
|
root_get_box(root, box);
|
|
break;
|
|
case N_OUTPUT:
|
|
output_get_box(node->sway_output, box);
|
|
break;
|
|
case N_WORKSPACE:
|
|
workspace_get_box(node->sway_workspace, box);
|
|
break;
|
|
case N_CONTAINER:
|
|
container_get_box(node->sway_container, box);
|
|
break;
|
|
}
|
|
}
|
|
|
|
struct sway_output *node_get_output(struct sway_node *node) {
|
|
switch (node->type) {
|
|
case N_CONTAINER: {
|
|
struct sway_workspace *ws = node->sway_container->workspace;
|
|
return ws ? ws->output : NULL;
|
|
}
|
|
case N_WORKSPACE:
|
|
return node->sway_workspace->output;
|
|
case N_OUTPUT:
|
|
return node->sway_output;
|
|
case N_ROOT:
|
|
return NULL;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
enum sway_container_layout node_get_layout(struct sway_node *node) {
|
|
switch (node->type) {
|
|
case N_CONTAINER:
|
|
return node->sway_container->layout;
|
|
case N_WORKSPACE:
|
|
return node->sway_workspace->layout;
|
|
case N_OUTPUT:
|
|
case N_ROOT:
|
|
return L_NONE;
|
|
}
|
|
return L_NONE;
|
|
}
|
|
|
|
struct sway_node *node_get_parent(struct sway_node *node) {
|
|
switch (node->type) {
|
|
case N_CONTAINER: {
|
|
struct sway_container *con = node->sway_container;
|
|
if (con->parent) {
|
|
return &con->parent->node;
|
|
}
|
|
if (con->workspace) {
|
|
return &con->workspace->node;
|
|
}
|
|
}
|
|
return NULL;
|
|
case N_WORKSPACE: {
|
|
struct sway_workspace *ws = node->sway_workspace;
|
|
if (ws->output) {
|
|
return &ws->output->node;
|
|
}
|
|
}
|
|
return NULL;
|
|
case N_OUTPUT:
|
|
return &root->node;
|
|
case N_ROOT:
|
|
return NULL;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
list_t *node_get_children(struct sway_node *node) {
|
|
switch (node->type) {
|
|
case N_CONTAINER:
|
|
return node->sway_container->children;
|
|
case N_WORKSPACE:
|
|
return node->sway_workspace->tiling;
|
|
case N_OUTPUT:
|
|
case N_ROOT:
|
|
return NULL;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
bool node_has_ancestor(struct sway_node *node, struct sway_node *ancestor) {
|
|
if (ancestor->type == N_ROOT && node->type == N_CONTAINER &&
|
|
node->sway_container->fullscreen_mode == FULLSCREEN_GLOBAL) {
|
|
return true;
|
|
}
|
|
struct sway_node *parent = node_get_parent(node);
|
|
while (parent) {
|
|
if (parent == ancestor) {
|
|
return true;
|
|
}
|
|
if (ancestor->type == N_ROOT && parent->type == N_CONTAINER &&
|
|
parent->sway_container->fullscreen_mode == FULLSCREEN_GLOBAL) {
|
|
return true;
|
|
}
|
|
parent = node_get_parent(parent);
|
|
}
|
|
return false;
|
|
}
|