alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #317 from mikkeloscar/bar-id-option

Browse source 
Implement bar option: id <custom-id>
This commit is contained in:
Drew DeVault 2015-12-14 13:09:59 -05:00
parent 2be742d02d 401333e7c7
commit 966971f07d
1 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
sway/commands.c
View file

@ -65,6 +65,7 @@ static sway_cmd cmd_sticky;
static sway_cmd cmd_workspace; static sway_cmd cmd_workspace;
static sway_cmd cmd_ws_auto_back_and_forth; static sway_cmd cmd_ws_auto_back_and_forth;
static sway_cmd bar_cmd_id;
static sway_cmd bar_cmd_position; static sway_cmd bar_cmd_position;
static sway_cmd bar_cmd_strip_workspace_numbers; static sway_cmd bar_cmd_strip_workspace_numbers;
static sway_cmd bar_cmd_tray_output; static sway_cmd bar_cmd_tray_output;
@ -1523,6 +1524,35 @@ static struct cmd_handler handlers[] = {
{ "workspace_auto_back_and_forth", cmd_ws_auto_back_and_forth }, { "workspace_auto_back_and_forth", cmd_ws_auto_back_and_forth },
}; };
static struct cmd_results *bar_cmd_id(int argc, char **argv) {
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "id", EXPECTED_EQUAL_TO, 1))) {
return error;
}
const char *name = argv[0];
const char *oldname = config->current_bar->id;
// check if id is used by a previously defined bar
int i;
for (i = 0; i < config->bars->length; ++i) {
struct bar_config *find = config->bars->items[i];
if (strcmp(name, find->id) == 0 && config->current_bar != find) {
return cmd_results_new(CMD_FAILURE, "id",
"Id '%s' already defined for another bar. Id unchanged (%s).",
name, oldname);
}
}
sway_log(L_DEBUG, "Renaming bar: '%s' to '%s'", oldname, name);
// free old bar id
free(config->current_bar->id);
config->current_bar->id = strdup(name);
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}
static struct cmd_results *bar_cmd_position(int argc, char **argv) { static struct cmd_results *bar_cmd_position(int argc, char **argv) {
struct cmd_results *error = NULL; struct cmd_results *error = NULL;
if ((error = checkarg(argc, "position", EXPECTED_EQUAL_TO, 1))) { if ((error = checkarg(argc, "position", EXPECTED_EQUAL_TO, 1))) {
@ -1632,7 +1662,7 @@ static struct cmd_handler bar_handlers[] = {
{ "colors", NULL }, { "colors", NULL },
{ "font", NULL }, { "font", NULL },
{ "hidden_state", NULL }, { "hidden_state", NULL },
{ "id", NULL }, { "id", bar_cmd_id },
{ "mode", NULL }, { "mode", NULL },
{ "modifier", NULL }, { "modifier", NULL },
{ "output", NULL }, { "output", NULL },