mirror of
https://github.com/gwenhael-le-moine/sway-patched-tray-menu.git
synced 2024-12-27 21:58:16 +01:00
d3d7956576
This modifies the places where output_get_active_workspace is called to handle a NULL result. Some places already handled it and did not need a change, some just have guard off code blocks, others return errors, and some have sway_asserts since the case should never happen. A lot of this is probably just safety precautions since they probably will never be called when `output_get_active_workspace` is not fully configured with a workspace.
49 lines
1.5 KiB
C
49 lines
1.5 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 "log.h"
|
|
#include "util.h"
|
|
|
|
struct cmd_results *cmd_sticky(int argc, char **argv) {
|
|
struct cmd_results *error = NULL;
|
|
if ((error = checkarg(argc, "sticky", EXPECTED_EQUAL_TO, 1))) {
|
|
return error;
|
|
}
|
|
struct sway_container *container = config->handler_context.container;
|
|
|
|
if (container == NULL) {
|
|
return cmd_results_new(CMD_FAILURE, "No current container");
|
|
};
|
|
|
|
container->is_sticky = parse_boolean(argv[0], container->is_sticky);
|
|
|
|
if (container->is_sticky && container_is_floating_or_child(container) &&
|
|
!container_is_scratchpad_hidden(container)) {
|
|
// move container to active workspace
|
|
struct sway_workspace *active_workspace =
|
|
output_get_active_workspace(container->workspace->output);
|
|
if (!sway_assert(active_workspace,
|
|
"Expected output to have a workspace")) {
|
|
return cmd_results_new(CMD_FAILURE,
|
|
"Expected output to have a workspace");
|
|
}
|
|
if (container->workspace != active_workspace) {
|
|
struct sway_workspace *old_workspace = container->workspace;
|
|
container_detach(container);
|
|
workspace_add_floating(active_workspace, container);
|
|
container_handle_fullscreen_reparent(container);
|
|
arrange_workspace(active_workspace);
|
|
workspace_consider_destroy(old_workspace);
|
|
}
|
|
}
|
|
|
|
return cmd_results_new(CMD_SUCCESS, NULL);
|
|
}
|