08cfba2192
Things worth noting:
* When a fullscreen view unmaps, the check to unset fullscreen on the
workspace has been moved out of view_unmap and into container_destroy,
because containers can be fullscreen too
* The calls to `container_reap_empty_recursive(workspace)` have been
removed from `container_set_floating`. That function reaps upwards so it
wouldn't do anything. I'm probably the one who originally added it...
* My fix (b14bd1b0b1) for the tabbed child
crash has a side effect where when you close a floating container, focus
is not given to the tiled container again. I've removed my fix and
removed the call to `send_cursor_motion` from `seat_set_focus_warp`. We
should consider calling it from somewhere earlier in the call stack.
51 lines
1.6 KiB
C
51 lines
1.6 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/layout.h"
|
|
#include "sway/tree/view.h"
|
|
#include "list.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;
|
|
}
|
|
struct sway_container *container =
|
|
config->handler_context.current_container;
|
|
if (container->type == C_WORKSPACE && container->children->length == 0) {
|
|
return cmd_results_new(CMD_INVALID, "floating",
|
|
"Can't float an empty workspace");
|
|
}
|
|
if (container->type == C_WORKSPACE) {
|
|
// Wrap the workspace's children in a container so we can float it
|
|
struct sway_container *workspace = container;
|
|
container = container_wrap_children(container);
|
|
workspace->layout = L_HORIZ;
|
|
seat_set_focus(config->handler_context.seat, container);
|
|
}
|
|
|
|
bool wants_floating;
|
|
if (strcasecmp(argv[0], "enable") == 0) {
|
|
wants_floating = true;
|
|
} else if (strcasecmp(argv[0], "disable") == 0) {
|
|
wants_floating = false;
|
|
} else if (strcasecmp(argv[0], "toggle") == 0) {
|
|
wants_floating = !container_is_floating(container);
|
|
} else {
|
|
return cmd_results_new(CMD_FAILURE, "floating",
|
|
"Expected 'floating <enable|disable|toggle>'");
|
|
}
|
|
|
|
container_set_floating(container, wants_floating);
|
|
|
|
struct sway_container *workspace = container_parent(container, C_WORKSPACE);
|
|
arrange_windows(workspace);
|
|
|
|
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
|
|
}
|