5fb5984e94
Prior to this patch, if I ran something like this, sway would crash:
swaymsg bar height 50
or
swaymsg bar not-a-bar-id color bg #ff0000
This was in contrast to other bar subcommands, like status_command,
which would exit with a "No bar defined" message.
The difference between the subcommands that crashed and the ones that
exited was that some subcommands had a check to see if a bar was
specified, while others just assumed that it had been and carried on
until they segfaulted.
Because this check was identical in every subcommand it was present in,
and I couldn't think of a case where it would be valid to run a bar
subcommand without specifying which bar to apply it to, I moved this
check from individual subcommands into the bar command, which is already
responsible for actually setting the specified bar. This reduced code
duplication, and fixed the crash for the subcommands that were missing
this check.
58 lines
1.4 KiB
C
58 lines
1.4 KiB
C
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <strings.h>
|
|
#include "sway/commands.h"
|
|
#include "sway/ipc-server.h"
|
|
#include "log.h"
|
|
|
|
struct cmd_results *bar_cmd_gaps(int argc, char **argv) {
|
|
struct cmd_results *error = NULL;
|
|
if ((error = checkarg(argc, "gaps", EXPECTED_AT_LEAST, 1))) {
|
|
return error;
|
|
}
|
|
if ((error = checkarg(argc, "gaps", EXPECTED_AT_MOST, 4))) {
|
|
return error;
|
|
}
|
|
|
|
int top = 0, right = 0, bottom = 0, left = 0;
|
|
|
|
for (int i = 0; i < argc; i++) {
|
|
char *end;
|
|
int amount = strtol(argv[i], &end, 10);
|
|
if (strlen(end) && strcasecmp(end, "px") != 0) {
|
|
return cmd_results_new(CMD_INVALID,
|
|
"Expected 'bar [<bar-id>] gaps <all> | <horizonal> "
|
|
"<vertical> | <top> <right> <bottom> <left>'");
|
|
}
|
|
|
|
if (i == 0) {
|
|
top = amount;
|
|
}
|
|
if (i == 0 || i == 1) {
|
|
right = amount;
|
|
}
|
|
if (i == 0 || i == 2) {
|
|
bottom = amount;
|
|
}
|
|
if (i == 0 || i == 1 || i == 3) {
|
|
left = amount;
|
|
}
|
|
}
|
|
|
|
config->current_bar->gaps.top = top;
|
|
config->current_bar->gaps.right = right;
|
|
config->current_bar->gaps.bottom = bottom;
|
|
config->current_bar->gaps.left = left;
|
|
|
|
sway_log(SWAY_DEBUG, "Setting bar gaps to %d %d %d %d on bar: %s",
|
|
config->current_bar->gaps.top, config->current_bar->gaps.right,
|
|
config->current_bar->gaps.bottom, config->current_bar->gaps.left,
|
|
config->current_bar->id);
|
|
|
|
if (!config->reading) {
|
|
ipc_event_barconfig_update(config->current_bar);
|
|
}
|
|
|
|
return cmd_results_new(CMD_SUCCESS, NULL);
|
|
}
|