diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-09-05 09:33:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-05 09:33:27 -0400 |
| commit | 610eb946171f782165a20614b2d3318b89273990 (patch) | |
| tree | 05eec1df1ef48e05b23d273d31143ad32e7632d2 /include/sway/config.h | |
| parent | aa2bf98e0442f9bf41a852c2fafee5b0897010a2 (diff) | |
| parent | dbf4aa3e33bdee53876c6893b15ac3f224818e7c (diff) | |
Merge pull request #2540 from RyanDwyer/typesafety
Implement type safe arguments and demote sway_container
Diffstat (limited to 'include/sway/config.h')
| -rw-r--r-- | include/sway/config.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/sway/config.h b/include/sway/config.h index 6024f0f6..2fef0081 100644 --- a/include/sway/config.h +++ b/include/sway/config.h @@ -407,7 +407,9 @@ struct sway_config { struct output_config *output_config; struct seat_config *seat_config; struct sway_seat *seat; - struct sway_container *current_container; + struct sway_node *node; + struct sway_container *container; + struct sway_workspace *workspace; bool using_criteria; struct { int argc; @@ -486,8 +488,7 @@ struct output_config *new_output_config(const char *name); void merge_output_config(struct output_config *dst, struct output_config *src); -void apply_output_config(struct output_config *oc, - struct sway_container *output); +void apply_output_config(struct output_config *oc, struct sway_output *output); struct output_config *store_output_config(struct output_config *oc); |