mirror of
https://github.com/gwenhael-le-moine/sway-patched-tray-menu.git
synced 2024-12-28 22:23:42 +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.
60 lines
1.5 KiB
C
60 lines
1.5 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;
|
|
}
|
|
if (!config->current_bar) {
|
|
return cmd_results_new(CMD_FAILURE, "No bar defined.");
|
|
}
|
|
|
|
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;
|
|
|
|
wlr_log(WLR_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);
|
|
}
|