diff options
author | Mikkel Oscar Lyderik <mikkeloscar@gmail.com> | 2015-12-14 18:29:26 +0100 |
---|---|---|
committer | Mikkel Oscar Lyderik <mikkeloscar@gmail.com> | 2015-12-14 18:34:20 +0100 |
commit | 401333e7c7d61d85836f6bdec926fd860d76c149 (patch) | |
tree | 60a1ddca19e9e87bca354f26d69b9b029721d8db | |
parent | Merge pull request #314 from mikkeloscar/bar-id (diff) | |
download | sway-401333e7c7d61d85836f6bdec926fd860d76c149.tar.gz sway-401333e7c7d61d85836f6bdec926fd860d76c149.tar.zst sway-401333e7c7d61d85836f6bdec926fd860d76c149.zip |
Implement bar option: id <custom-id>
If the id is defined by another bar it will just use the default id for
the bar. Typically `bar-x`.
If the id command is used multiple times within a bar block, the last
one will 'win'.
-rw-r--r-- | sway/commands.c | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/sway/commands.c b/sway/commands.c index c565adbb..7eb076c4 100644 --- a/sway/commands.c +++ b/sway/commands.c | |||
@@ -65,6 +65,7 @@ static sway_cmd cmd_sticky; | |||
65 | static sway_cmd cmd_workspace; | 65 | static sway_cmd cmd_workspace; |
66 | static sway_cmd cmd_ws_auto_back_and_forth; | 66 | static sway_cmd cmd_ws_auto_back_and_forth; |
67 | 67 | ||
68 | static sway_cmd bar_cmd_id; | ||
68 | static sway_cmd bar_cmd_position; | 69 | static sway_cmd bar_cmd_position; |
69 | static sway_cmd bar_cmd_strip_workspace_numbers; | 70 | static sway_cmd bar_cmd_strip_workspace_numbers; |
70 | static sway_cmd bar_cmd_tray_output; | 71 | static sway_cmd bar_cmd_tray_output; |
@@ -1523,6 +1524,35 @@ static struct cmd_handler handlers[] = { | |||
1523 | { "workspace_auto_back_and_forth", cmd_ws_auto_back_and_forth }, | 1524 | { "workspace_auto_back_and_forth", cmd_ws_auto_back_and_forth }, |
1524 | }; | 1525 | }; |
1525 | 1526 | ||
1527 | static struct cmd_results *bar_cmd_id(int argc, char **argv) { | ||
1528 | struct cmd_results *error = NULL; | ||
1529 | if ((error = checkarg(argc, "id", EXPECTED_EQUAL_TO, 1))) { | ||
1530 | return error; | ||
1531 | } | ||
1532 | |||
1533 | const char *name = argv[0]; | ||
1534 | const char *oldname = config->current_bar->id; | ||
1535 | |||
1536 | // check if id is used by a previously defined bar | ||
1537 | int i; | ||
1538 | for (i = 0; i < config->bars->length; ++i) { | ||
1539 | struct bar_config *find = config->bars->items[i]; | ||
1540 | if (strcmp(name, find->id) == 0 && config->current_bar != find) { | ||
1541 | return cmd_results_new(CMD_FAILURE, "id", | ||
1542 | "Id '%s' already defined for another bar. Id unchanged (%s).", | ||
1543 | name, oldname); | ||
1544 | } | ||
1545 | } | ||
1546 | |||
1547 | sway_log(L_DEBUG, "Renaming bar: '%s' to '%s'", oldname, name); | ||
1548 | |||
1549 | // free old bar id | ||
1550 | free(config->current_bar->id); | ||
1551 | |||
1552 | config->current_bar->id = strdup(name); | ||
1553 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | ||
1554 | } | ||
1555 | |||
1526 | static struct cmd_results *bar_cmd_position(int argc, char **argv) { | 1556 | static struct cmd_results *bar_cmd_position(int argc, char **argv) { |
1527 | struct cmd_results *error = NULL; | 1557 | struct cmd_results *error = NULL; |
1528 | if ((error = checkarg(argc, "position", EXPECTED_EQUAL_TO, 1))) { | 1558 | if ((error = checkarg(argc, "position", EXPECTED_EQUAL_TO, 1))) { |
@@ -1632,7 +1662,7 @@ static struct cmd_handler bar_handlers[] = { | |||
1632 | { "colors", NULL }, | 1662 | { "colors", NULL }, |
1633 | { "font", NULL }, | 1663 | { "font", NULL }, |
1634 | { "hidden_state", NULL }, | 1664 | { "hidden_state", NULL }, |
1635 | { "id", NULL }, | 1665 | { "id", bar_cmd_id }, |
1636 | { "mode", NULL }, | 1666 | { "mode", NULL }, |
1637 | { "modifier", NULL }, | 1667 | { "modifier", NULL }, |
1638 | { "output", NULL }, | 1668 | { "output", NULL }, |