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.
70 lines
1.9 KiB
C
70 lines
1.9 KiB
C
#include <strings.h>
|
|
#include "log.h"
|
|
#include "sway/commands.h"
|
|
#include "sway/config.h"
|
|
#include "sway/tree/arrange.h"
|
|
#include "sway/tree/container.h"
|
|
#include "sway/tree/view.h"
|
|
#include "sway/tree/workspace.h"
|
|
#include "util.h"
|
|
|
|
// fullscreen [enable|disable|toggle] [global]
|
|
struct cmd_results *cmd_fullscreen(int argc, char **argv) {
|
|
struct cmd_results *error = NULL;
|
|
if ((error = checkarg(argc, "fullscreen", EXPECTED_AT_MOST, 2))) {
|
|
return error;
|
|
}
|
|
if (!root->outputs->length) {
|
|
return cmd_results_new(CMD_FAILURE,
|
|
"Can't run this command while there's no outputs connected.");
|
|
}
|
|
struct sway_node *node = config->handler_context.node;
|
|
struct sway_container *container = config->handler_context.container;
|
|
struct sway_workspace *workspace = config->handler_context.workspace;
|
|
if (node->type == N_WORKSPACE && workspace->tiling->length == 0) {
|
|
return cmd_results_new(CMD_FAILURE,
|
|
"Can't fullscreen an empty workspace");
|
|
}
|
|
|
|
// If in the scratchpad, operate on the highest container
|
|
if (container && !container->workspace) {
|
|
while (container->parent) {
|
|
container = container->parent;
|
|
}
|
|
}
|
|
|
|
bool is_fullscreen = container &&
|
|
container->fullscreen_mode != FULLSCREEN_NONE;
|
|
bool global = false;
|
|
bool enable = !is_fullscreen;
|
|
|
|
if (argc >= 1) {
|
|
if (strcasecmp(argv[0], "global") == 0) {
|
|
global = true;
|
|
} else {
|
|
enable = parse_boolean(argv[0], is_fullscreen);
|
|
}
|
|
}
|
|
|
|
if (argc >= 2) {
|
|
global = strcasecmp(argv[1], "global") == 0;
|
|
}
|
|
|
|
if (enable && node->type == N_WORKSPACE) {
|
|
// Wrap the workspace's children in a container so we can fullscreen it
|
|
container = workspace_wrap_children(workspace);
|
|
workspace->layout = L_HORIZ;
|
|
seat_set_focus_container(config->handler_context.seat, container);
|
|
}
|
|
|
|
enum sway_fullscreen_mode mode = FULLSCREEN_NONE;
|
|
if (enable) {
|
|
mode = global ? FULLSCREEN_GLOBAL : FULLSCREEN_WORKSPACE;
|
|
}
|
|
|
|
container_set_fullscreen(container, mode);
|
|
arrange_root();
|
|
|
|
return cmd_results_new(CMD_SUCCESS, NULL);
|
|
}
|