mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-01 22:58:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename workspace_outputs to workspace_configs and fix memory leak

Browse source 
When we eventually implement `workspace <ws> gaps inner|outer <px>`,
we'll need to store the gaps settings for workspaces before they're
created. Rather than create a workspace_gaps struct, the approach I'm
taking is to rename workspace_outputs to workspace_configs and then add
gaps settings to that.

I've added a lookup function workspace_find_config. Note that we have a
similar thing for outputs (output_config struct and output_find_config).

Lastly, when freeing config it would create a memory leak by freeing the
list items but not the workspace or output names inside them. This has
been rectified using a free_workspace_config function.
This commit is contained in:
Ryan Dwyer 2018-09-28 21:58:23 +10:00
parent 1698260533
commit 138d10d5d6
5 changed files with 66 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

13
include/sway/config.h
View file

@ -167,13 +167,12 @@ 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;
};
struct bar_config {
@ -327,7 +326,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;
@ -518,6 +517,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

2
include/sway/tree/workspace.h
View file

@ -48,6 +48,8 @@ struct sway_workspace {
extern char *prev_workspace_name;
struct workspace_config *workspace_find_config(const char *ws_name);
struct sway_output *workspace_get_initial_output(const char *name);
struct sway_workspace *workspace_create(struct sway_output *output,