diff options
author | Drew DeVault <sir@cmpwn.com> | 2015-12-14 19:29:02 -0500 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2015-12-14 19:29:02 -0500 |
commit | 9db15e29b105a903d335ede2d1f468f15014d5ce (patch) | |
tree | 30f08e23991b37f1fcc288133f4d5dd2516e410b /sway | |
parent | 18b4959578cf96ed2eada6b3327f25b09eb1853a (diff) | |
parent | 5786fa7e350165743df62c82a376c29984eb1abf (diff) | |
download | sway-9db15e29b105a903d335ede2d1f468f15014d5ce.tar.xz |
Merge pull request #323 from gpyh/bar_cmd_status_command
Added bar_cmd_status_command
Diffstat (limited to 'sway')
-rw-r--r-- | sway/commands.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/sway/commands.c b/sway/commands.c index d2499e28..2b28c472 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -70,6 +70,7 @@ static sway_cmd bar_cmd_mode; static sway_cmd bar_cmd_hidden_state; static sway_cmd bar_cmd_id; static sway_cmd bar_cmd_position; +static sway_cmd bar_cmd_status_command; static sway_cmd bar_cmd_strip_workspace_numbers; static sway_cmd bar_cmd_tray_output; static sway_cmd bar_cmd_tray_padding; @@ -1671,6 +1672,23 @@ static struct cmd_results *bar_cmd_position(int argc, char **argv) { return cmd_results_new(CMD_SUCCESS, NULL, NULL); } +static struct cmd_results *bar_cmd_status_command(int argc, char **argv) { + struct cmd_results *error = NULL; + if ((error = checkarg(argc, "status_command", EXPECTED_AT_LEAST, 1))) { + return error; + } + + if (!config->current_bar) { + return cmd_results_new(CMD_FAILURE, "status_command", "No bar defined."); + } + + free(config->current_bar->status_command); + config->current_bar->status_command = join_args(argv, argc); + sway_log(L_DEBUG, "Feeding bar with status command: %s", config->current_bar->status_command); + + return cmd_results_new(CMD_SUCCESS, NULL, NULL); +} + static struct cmd_results *bar_cmd_strip_workspace_numbers(int argc, char **argv) { struct cmd_results *error = NULL; if ((error = checkarg(argc, "strip_workspace_numbers", EXPECTED_EQUAL_TO, 1))) { @@ -1759,7 +1777,7 @@ static struct cmd_handler bar_handlers[] = { { "output", NULL }, { "position", bar_cmd_position }, { "seperator_symbol", NULL }, - { "status_command", NULL }, + { "status_command", bar_cmd_status_command }, { "strip_workspace_numbers", bar_cmd_strip_workspace_numbers }, { "tray_output", bar_cmd_tray_output }, { "tray_padding", bar_cmd_tray_padding }, |