mirror of
https://github.com/gwenhael-le-moine/sway-patched-tray-menu.git
synced 2024-12-28 22:23:42 +01:00
799f5a2cd5
This adds the missing argument count check after the --i3 flag processing in cmd_hide_edge_borders. Without the check, `hide_edge_borders --i3` would result in a SIGSEGV instead of a syntax error. There are some minor adjustments to make it so nothing gets altered if this check fails
47 lines
1.3 KiB
C
47 lines
1.3 KiB
C
#include "sway/commands.h"
|
|
#include "sway/config.h"
|
|
#include "sway/tree/arrange.h"
|
|
#include "sway/tree/view.h"
|
|
|
|
struct cmd_results *cmd_hide_edge_borders(int argc, char **argv) {
|
|
const char *expected_syntax = "Expected 'hide_edge_borders [--i3] "
|
|
"none|vertical|horizontal|both|smart|smart_no_gaps";
|
|
|
|
struct cmd_results *error = NULL;
|
|
if ((error = checkarg(argc, "hide_edge_borders", EXPECTED_AT_LEAST, 1))) {
|
|
return error;
|
|
}
|
|
|
|
bool hide_lone_tab = false;
|
|
if (strcmp(*argv, "--i3") == 0) {
|
|
hide_lone_tab = true;
|
|
++argv;
|
|
--argc;
|
|
}
|
|
|
|
if (!argc) {
|
|
return cmd_results_new(CMD_INVALID, expected_syntax);
|
|
}
|
|
|
|
if (strcmp(argv[0], "none") == 0) {
|
|
config->hide_edge_borders = E_NONE;
|
|
} else if (strcmp(argv[0], "vertical") == 0) {
|
|
config->hide_edge_borders = E_VERTICAL;
|
|
} else if (strcmp(argv[0], "horizontal") == 0) {
|
|
config->hide_edge_borders = E_HORIZONTAL;
|
|
} else if (strcmp(argv[0], "both") == 0) {
|
|
config->hide_edge_borders = E_BOTH;
|
|
} else if (strcmp(argv[0], "smart") == 0) {
|
|
config->hide_edge_borders = E_SMART;
|
|
} else if (strcmp(argv[0], "smart_no_gaps") == 0) {
|
|
config->hide_edge_borders = E_SMART_NO_GAPS;
|
|
} else {
|
|
return cmd_results_new(CMD_INVALID, expected_syntax);
|
|
}
|
|
config->hide_lone_tab = hide_lone_tab;
|
|
config->saved_edge_borders = config->hide_edge_borders;
|
|
|
|
arrange_root();
|
|
|
|
return cmd_results_new(CMD_SUCCESS, NULL);
|
|
}
|