mirror of
https://github.com/gwenhael-le-moine/sway-patched-tray-menu.git
synced 2024-12-27 21:58:16 +01:00
2a684cad5f
Patch tested by compiling with `__attribute__ ((format (printf, 2, 3)))` applied to `cmd_results_new`. String usage constants have been converted from pointers to arrays when encountered. General handler format strings were sometimes modified to include the old input string, especially for unknown command errors.
89 lines
2.4 KiB
C
89 lines
2.4 KiB
C
#include <string.h>
|
|
#include <strings.h>
|
|
#include "sway/commands.h"
|
|
#include "sway/tree/arrange.h"
|
|
#include "sway/tree/container.h"
|
|
#include "sway/tree/view.h"
|
|
#include "sway/tree/workspace.h"
|
|
#include "sway/input/input-manager.h"
|
|
#include "sway/input/seat.h"
|
|
#include "log.h"
|
|
|
|
static struct cmd_results *do_split(int layout) {
|
|
struct sway_container *con = config->handler_context.container;
|
|
struct sway_workspace *ws = config->handler_context.workspace;
|
|
if (con) {
|
|
container_split(con, layout);
|
|
} else {
|
|
workspace_split(ws, layout);
|
|
}
|
|
|
|
if (con && con->parent && con->parent->parent) {
|
|
container_flatten(con->parent->parent);
|
|
}
|
|
|
|
arrange_workspace(ws);
|
|
|
|
return cmd_results_new(CMD_SUCCESS, NULL);
|
|
}
|
|
|
|
struct cmd_results *cmd_split(int argc, char **argv) {
|
|
struct cmd_results *error = NULL;
|
|
if ((error = checkarg(argc, "split", 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.");
|
|
}
|
|
if (strcasecmp(argv[0], "v") == 0 || strcasecmp(argv[0], "vertical") == 0) {
|
|
return do_split(L_VERT);
|
|
} else if (strcasecmp(argv[0], "h") == 0 ||
|
|
strcasecmp(argv[0], "horizontal") == 0) {
|
|
return do_split(L_HORIZ);
|
|
} else if (strcasecmp(argv[0], "t") == 0 ||
|
|
strcasecmp(argv[0], "toggle") == 0) {
|
|
struct sway_container *focused = config->handler_context.container;
|
|
|
|
if (focused && container_parent_layout(focused) == L_VERT) {
|
|
return do_split(L_HORIZ);
|
|
} else {
|
|
return do_split(L_VERT);
|
|
}
|
|
} else {
|
|
return cmd_results_new(CMD_FAILURE,
|
|
"Invalid split command (expected either horizontal or vertical).");
|
|
}
|
|
return cmd_results_new(CMD_SUCCESS, NULL);
|
|
}
|
|
|
|
struct cmd_results *cmd_splitv(int argc, char **argv) {
|
|
struct cmd_results *error = NULL;
|
|
if ((error = checkarg(argc, "splitv", EXPECTED_EQUAL_TO, 0))) {
|
|
return error;
|
|
}
|
|
return do_split(L_VERT);
|
|
}
|
|
|
|
struct cmd_results *cmd_splith(int argc, char **argv) {
|
|
struct cmd_results *error = NULL;
|
|
if ((error = checkarg(argc, "splitv", EXPECTED_EQUAL_TO, 0))) {
|
|
return error;
|
|
}
|
|
return do_split(L_HORIZ);
|
|
}
|
|
|
|
struct cmd_results *cmd_splitt(int argc, char **argv) {
|
|
struct cmd_results *error = NULL;
|
|
if ((error = checkarg(argc, "splitv", EXPECTED_EQUAL_TO, 0))) {
|
|
return error;
|
|
}
|
|
|
|
struct sway_container *con = config->handler_context.container;
|
|
|
|
if (con && container_parent_layout(con) == L_VERT) {
|
|
return do_split(L_HORIZ);
|
|
} else {
|
|
return do_split(L_VERT);
|
|
}
|
|
}
|