mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-17 13:42:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #332 from mikkeloscar/bar-output

Browse source 
Implement bar option: output <output>
This commit is contained in:
Drew DeVault 2015-12-15 16:14:28 -05:00
parent 5b16b235ad f59f5d27aa
commit 614034b001
3 changed files with 50 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/config.h
View file

@ -88,6 +88,7 @@ struct bar_config {
*/
char *id;
uint32_t modifier;
list_t *outputs;
enum desktop_shell_panel_position position;
list_t *bindings;
char *status_command;

44
sway/commands.c
View file

@ -69,6 +69,7 @@ static sway_cmd bar_cmd_bindsym;
static sway_cmd bar_cmd_colors;
static sway_cmd bar_cmd_mode;
static sway_cmd bar_cmd_modifier;
static sway_cmd bar_cmd_output;
static sway_cmd bar_cmd_height;
static sway_cmd bar_cmd_hidden_state;
static sway_cmd bar_cmd_id;
@ -1724,6 +1725,47 @@ static struct cmd_results *bar_cmd_modifier(int argc, char **argv) {
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}
static struct cmd_results *bar_cmd_output(int argc, char **argv) {
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "output", EXPECTED_EQUAL_TO, 1))) {
return error;
}
if (!config->current_bar) {
return cmd_results_new(CMD_FAILURE, "output", "No bar defined.");
}
const char *output = argv[0];
list_t *outputs = config->current_bar->outputs;
int i;
int add_output = 1;
if (strcmp("*", output) == 0) {
// remove all previous defined outputs and replace with '*'
for (i = 0; i < outputs->length; ++i) {
free(outputs->items[i]);
list_del(outputs, i);
}
} else {
// only add output if not already defined with either the same
// name or as '*'
for (i = 0; i < outputs->length; ++i) {
const char *find = outputs->items[i];
if (strcmp("*", find) == 0 || strcmp(output, find) == 0) {
add_output = 0;
break;
}
}
}
if (add_output) {
list_add(outputs, strdup(output));
sway_log(L_DEBUG, "Adding bar: '%s' to output '%s'", config->current_bar->id, output);
}
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}
static struct cmd_results *bar_cmd_position(int argc, char **argv) {
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "position", EXPECTED_EQUAL_TO, 1))) {
@ -1854,7 +1896,7 @@ static struct cmd_handler bar_handlers[] = {
{ "id", bar_cmd_id },
{ "mode", bar_cmd_mode },
{ "modifier", bar_cmd_modifier },
{ "output", NULL },
{ "output", bar_cmd_output },
{ "position", bar_cmd_position },
{ "seperator_symbol", NULL },
{ "status_command", bar_cmd_status_command },

6
sway/config.c
View file

@ -48,6 +48,11 @@ static void free_bar(struct bar_config *bar) {
free_sway_mouse_binding(bar->bindings->items[i]);
}
free(bar->bindings);
for (i = 0; i < bar->outputs->length; ++i) {
free(bar->outputs->items[i]);
}
list_free(bar->outputs);
free(bar);
}
@ -558,6 +563,7 @@ struct bar_config *default_bar_config(void) {
bar->mode = strdup("dock");
bar->hidden_state = strdup("hide");
bar->modifier = 0;
bar->outputs = create_list();
bar->position = DESKTOP_SHELL_PANEL_POSITION_BOTTOM;
bar->bindings = create_list();
bar->status_command = strdup("while :; do date +'%Y-%m-%d %l:%M:%S %p' && sleep 1; done");