diff options
Diffstat (limited to 'include/sway/config.h')
| -rw-r--r-- | include/sway/config.h | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/include/sway/config.h b/include/sway/config.h index b53c1f1f..eab48aed 100644 --- a/include/sway/config.h +++ b/include/sway/config.h @@ -93,6 +93,7 @@ struct input_config { int accel_profile; int click_method; + int drag; int drag_lock; int dwt; int left_handed; @@ -167,13 +168,14 @@ struct output_config { }; /** - * Maps a workspace name to an output name. - * - * Set via `workspace <x> output <y>` + * Stores configuration for a workspace, regardless of whether the workspace + * exists. */ -struct workspace_output { - char *output; +struct workspace_config { char *workspace; + char *output; + int gaps_inner; + int gaps_outer; }; struct bar_config { @@ -327,7 +329,7 @@ struct sway_config { list_t *modes; list_t *bars; list_t *cmd_queue; - list_t *workspace_outputs; + list_t *workspace_configs; list_t *output_configs; list_t *input_configs; list_t *seat_configs; @@ -450,20 +452,16 @@ void free_sway_variable(struct sway_variable *var); */ char *do_var_replacement(char *str); -struct cmd_results *check_security_config(); - int input_identifier_cmp(const void *item, const void *data); struct input_config *new_input_config(const char* identifier); void merge_input_config(struct input_config *dst, struct input_config *src); -struct input_config *copy_input_config(struct input_config *ic); +struct input_config *store_input_config(struct input_config *ic); void free_input_config(struct input_config *ic); -void apply_input_config(struct input_config *input); - int seat_name_cmp(const void *item, const void *data); struct seat_config *new_seat_config(const char* name); @@ -474,7 +472,7 @@ struct seat_config *copy_seat_config(struct seat_config *seat); void free_seat_config(struct seat_config *ic); -struct seat_attachment_config *seat_attachment_config_new(); +struct seat_attachment_config *seat_attachment_config_new(void); struct seat_attachment_config *seat_config_get_attachment( struct seat_config *seat_config, char *identifier); @@ -512,9 +510,7 @@ void free_sway_binding(struct sway_binding *sb); void seat_execute_command(struct sway_seat *seat, struct sway_binding *binding); -void load_swaybars(); - -void invoke_swaybar(struct bar_config *bar); +void load_swaybars(void); void terminate_swaybg(pid_t pid); @@ -522,6 +518,8 @@ struct bar_config *default_bar_config(void); void free_bar_config(struct bar_config *bar); +void free_workspace_config(struct workspace_config *wsc); + /** * Updates the value of config->font_height based on the max title height * reported by each container. If recalculate is true, the containers will |