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.
36 lines
971 B
C
36 lines
971 B
C
#include <string.h>
|
|
#include "sway/commands.h"
|
|
#include "log.h"
|
|
#include "stringop.h"
|
|
#include "util.h"
|
|
|
|
struct cmd_results *bar_cmd_modifier(int argc, char **argv) {
|
|
struct cmd_results *error = NULL;
|
|
if ((error = checkarg(argc, "modifier", EXPECTED_EQUAL_TO, 1))) {
|
|
return error;
|
|
}
|
|
|
|
if (!config->current_bar) {
|
|
return cmd_results_new(CMD_FAILURE, "No bar defined.");
|
|
}
|
|
|
|
uint32_t mod = 0;
|
|
list_t *split = split_string(argv[0], "+");
|
|
for (int i = 0; i < split->length; ++i) {
|
|
uint32_t tmp_mod;
|
|
if ((tmp_mod = get_modifier_mask_by_name(split->items[i])) > 0) {
|
|
mod |= tmp_mod;
|
|
} else {
|
|
error = cmd_results_new(CMD_INVALID,
|
|
"Unknown modifier '%s'", (char *)split->items[i]);
|
|
list_free_items_and_destroy(split);
|
|
return error;
|
|
}
|
|
}
|
|
list_free_items_and_destroy(split);
|
|
config->current_bar->modifier = mod;
|
|
wlr_log(WLR_DEBUG,
|
|
"Show/Hide the bar when pressing '%s' in hide mode.", argv[0]);
|
|
return cmd_results_new(CMD_SUCCESS, NULL);
|
|
}
|