mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-07 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move default bar config to bar creation.

Browse source 
Get rid of `config->bar` and define the default bar config options when
a bar is initialized.
This commit is contained in:
Mikkel Oscar Lyderik 2015-12-15 00:35:18 +01:00
parent 0b5c695d8e
commit 0513322c03
3 changed files with 27 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

18
sway/commands.c
View file

@ -1126,22 +1126,8 @@ static struct cmd_results *cmd_bar(int argc, char **argv) {
return cmd_results_new(CMD_FAILURE, "bar", "Can only be used in config file.");
}
// Create new bar from default bar config
struct bar_config *bar = NULL;
bar = malloc(sizeof*bar);
bar->mode = strdup(config->bar.mode);
bar->hidden_state = strdup(config->bar.hidden_state);
bar->modifier = config->bar.modifier;
bar->position = config->bar.position;
bar->bindings = create_list();
bar->status_command = strdup(config->bar.status_command);
bar->font = strdup(config->bar.font);
bar->bar_height = config->bar.bar_height;
bar->workspace_buttons = config->bar.workspace_buttons;
bar->strip_workspace_numbers = config->bar.strip_workspace_numbers;
bar->binding_mode_indicator = config->bar.binding_mode_indicator;
bar->tray_padding = config->bar.tray_padding;
list_add(config->bars, bar);
// Create new bar with default values
struct bar_config *bar = default_bar_config();
// set bar id
int i;