mirror of
https://github.com/NickHu/sway
synced 2024-12-29 22:23:46 +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.
59 lines
1.8 KiB
C
59 lines
1.8 KiB
C
#include <string.h>
|
|
#include <strings.h>
|
|
#include "sway/commands.h"
|
|
#include "sway/input/seat.h"
|
|
#include "sway/ipc-server.h"
|
|
#include "sway/output.h"
|
|
#include "sway/tree/arrange.h"
|
|
#include "sway/tree/container.h"
|
|
#include "sway/tree/view.h"
|
|
#include "sway/tree/workspace.h"
|
|
#include "list.h"
|
|
#include "util.h"
|
|
|
|
struct cmd_results *cmd_floating(int argc, char **argv) {
|
|
struct cmd_results *error = NULL;
|
|
if ((error = checkarg(argc, "floating", EXPECTED_EQUAL_TO, 1))) {
|
|
return error;
|
|
}
|
|
if (!root->outputs->length) {
|
|
return cmd_results_new(CMD_INVALID,
|
|
"Can't run this command while there's no outputs connected.");
|
|
}
|
|
struct sway_container *container = config->handler_context.container;
|
|
struct sway_workspace *workspace = config->handler_context.workspace;
|
|
if (!container && workspace->tiling->length == 0) {
|
|
return cmd_results_new(CMD_INVALID, "Can't float an empty workspace");
|
|
}
|
|
if (!container) {
|
|
// Wrap the workspace's children in a container so we can float it
|
|
container = workspace_wrap_children(workspace);
|
|
workspace->layout = L_HORIZ;
|
|
seat_set_focus_container(config->handler_context.seat, container);
|
|
}
|
|
|
|
if (container_is_scratchpad_hidden(container)) {
|
|
return cmd_results_new(CMD_INVALID,
|
|
"Can't change floating on hidden scratchpad container");
|
|
}
|
|
|
|
// If the container is in a floating split container,
|
|
// operate on the split container instead of the child.
|
|
if (container_is_floating_or_child(container)) {
|
|
while (container->parent) {
|
|
container = container->parent;
|
|
}
|
|
}
|
|
|
|
bool wants_floating =
|
|
parse_boolean(argv[0], container_is_floating(container));
|
|
|
|
container_set_floating(container, wants_floating);
|
|
|
|
// Floating containers in the scratchpad should be ignored
|
|
if (container->workspace) {
|
|
arrange_workspace(container->workspace);
|
|
}
|
|
|
|
return cmd_results_new(CMD_SUCCESS, NULL);
|
|
}
|