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.
133 lines
4.5 KiB
C
133 lines
4.5 KiB
C
#include <string.h>
|
|
#include "sway/commands.h"
|
|
|
|
// Must be in alphabetical order for bsearch
|
|
static struct cmd_handler bar_colors_handlers[] = {
|
|
{ "active_workspace", bar_colors_cmd_active_workspace },
|
|
{ "background", bar_colors_cmd_background },
|
|
{ "binding_mode", bar_colors_cmd_binding_mode },
|
|
{ "focused_background", bar_colors_cmd_focused_background },
|
|
{ "focused_separator", bar_colors_cmd_focused_separator },
|
|
{ "focused_statusline", bar_colors_cmd_focused_statusline },
|
|
{ "focused_workspace", bar_colors_cmd_focused_workspace },
|
|
{ "inactive_workspace", bar_colors_cmd_inactive_workspace },
|
|
{ "separator", bar_colors_cmd_separator },
|
|
{ "statusline", bar_colors_cmd_statusline },
|
|
{ "urgent_workspace", bar_colors_cmd_urgent_workspace },
|
|
};
|
|
|
|
static struct cmd_results *parse_single_color(char **color,
|
|
const char *cmd_name, int argc, char **argv) {
|
|
struct cmd_results *error = NULL;
|
|
if ((error = checkarg(argc, cmd_name, EXPECTED_EQUAL_TO, 1))) {
|
|
return error;
|
|
}
|
|
if (!*color && !(*color = malloc(10))) {
|
|
return NULL;
|
|
}
|
|
error = add_color(*color, argv[0]);
|
|
if (error) {
|
|
return error;
|
|
}
|
|
return cmd_results_new(CMD_SUCCESS, NULL);
|
|
}
|
|
|
|
static struct cmd_results *parse_three_colors(char ***colors,
|
|
const char *cmd_name, int argc, char **argv) {
|
|
struct cmd_results *error = NULL;
|
|
if (argc != 3) {
|
|
return cmd_results_new(CMD_INVALID,
|
|
"Command '%s' requires exactly three color values", cmd_name);
|
|
}
|
|
for (size_t i = 0; i < 3; i++) {
|
|
if (!*colors[i] && !(*(colors[i]) = malloc(10))) {
|
|
return NULL;
|
|
}
|
|
error = add_color(*(colors[i]), argv[i]);
|
|
if (error) {
|
|
return error;
|
|
}
|
|
}
|
|
return cmd_results_new(CMD_SUCCESS, NULL);
|
|
}
|
|
|
|
struct cmd_results *bar_cmd_colors(int argc, char **argv) {
|
|
return config_subcommand(argv, argc, bar_colors_handlers,
|
|
sizeof(bar_colors_handlers));
|
|
}
|
|
|
|
struct cmd_results *bar_colors_cmd_active_workspace(int argc, char **argv) {
|
|
char **colors[3] = {
|
|
&(config->current_bar->colors.active_workspace_border),
|
|
&(config->current_bar->colors.active_workspace_bg),
|
|
&(config->current_bar->colors.active_workspace_text)
|
|
};
|
|
return parse_three_colors(colors, "active_workspace", argc, argv);
|
|
}
|
|
|
|
struct cmd_results *bar_colors_cmd_background(int argc, char **argv) {
|
|
return parse_single_color(&(config->current_bar->colors.background),
|
|
"background", argc, argv);
|
|
}
|
|
|
|
struct cmd_results *bar_colors_cmd_focused_background(int argc, char **argv) {
|
|
return parse_single_color(&(config->current_bar->colors.focused_background),
|
|
"focused_background", argc, argv);
|
|
}
|
|
|
|
struct cmd_results *bar_colors_cmd_binding_mode(int argc, char **argv) {
|
|
char **colors[3] = {
|
|
&(config->current_bar->colors.binding_mode_border),
|
|
&(config->current_bar->colors.binding_mode_bg),
|
|
&(config->current_bar->colors.binding_mode_text)
|
|
};
|
|
return parse_three_colors(colors, "binding_mode", argc, argv);
|
|
}
|
|
|
|
struct cmd_results *bar_colors_cmd_focused_workspace(int argc, char **argv) {
|
|
char **colors[3] = {
|
|
&(config->current_bar->colors.focused_workspace_border),
|
|
&(config->current_bar->colors.focused_workspace_bg),
|
|
&(config->current_bar->colors.focused_workspace_text)
|
|
};
|
|
return parse_three_colors(colors, "focused_workspace", argc, argv);
|
|
}
|
|
|
|
struct cmd_results *bar_colors_cmd_inactive_workspace(int argc, char **argv) {
|
|
char **colors[3] = {
|
|
&(config->current_bar->colors.inactive_workspace_border),
|
|
&(config->current_bar->colors.inactive_workspace_bg),
|
|
&(config->current_bar->colors.inactive_workspace_text)
|
|
};
|
|
return parse_three_colors(colors, "inactive_workspace", argc, argv);
|
|
}
|
|
|
|
struct cmd_results *bar_colors_cmd_separator(int argc, char **argv) {
|
|
return parse_single_color(&(config->current_bar->colors.separator),
|
|
"separator", argc, argv);
|
|
}
|
|
|
|
struct cmd_results *bar_colors_cmd_focused_separator(int argc, char **argv) {
|
|
return parse_single_color(&(config->current_bar->colors.focused_separator),
|
|
"focused_separator", argc, argv);
|
|
}
|
|
|
|
struct cmd_results *bar_colors_cmd_statusline(int argc, char **argv) {
|
|
return parse_single_color(&(config->current_bar->colors.statusline),
|
|
"statusline", argc, argv);
|
|
}
|
|
|
|
struct cmd_results *bar_colors_cmd_focused_statusline(int argc, char **argv) {
|
|
return parse_single_color(&(config->current_bar->colors.focused_statusline),
|
|
"focused_statusline", argc, argv);
|
|
}
|
|
|
|
struct cmd_results *bar_colors_cmd_urgent_workspace(int argc, char **argv) {
|
|
char **colors[3] = {
|
|
&(config->current_bar->colors.urgent_workspace_border),
|
|
&(config->current_bar->colors.urgent_workspace_bg),
|
|
&(config->current_bar->colors.urgent_workspace_text)
|
|
};
|
|
return parse_three_colors(colors, "urgent_workspace", argc, argv);
|
|
}
|