diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-03-29 23:34:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-29 23:34:14 -0400 |
| commit | 472e81f35d689d67cda241acafda91c688d61046 (patch) | |
| tree | b8b52173a9791e3b13a0316ab9d316a80a6adc20 /include/sway/config.h | |
| parent | 6b7841b11ff4cd35f54d69dc92029855893e5ce0 (diff) | |
| parent | d0c7f66e950689b70196a890b62b82ff3c66e103 (diff) | |
Merge pull request #1653 from swaywm/revert-1647-refactor-tree
Revert "Refactor tree"
Diffstat (limited to 'include/sway/config.h')
| -rw-r--r-- | include/sway/config.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/include/sway/config.h b/include/sway/config.h index 7fdd0be0..48a8b0ab 100644 --- a/include/sway/config.h +++ b/include/sway/config.h @@ -10,8 +10,8 @@ #include <xkbcommon/xkbcommon.h> #include <time.h> #include "list.h" -#include "tree/layout.h" -#include "tree/container.h" +#include "layout.h" +#include "container.h" /** * Describes a variable created via the `set` command. @@ -299,8 +299,8 @@ struct sway_config { char *floating_scroll_down_cmd; char *floating_scroll_left_cmd; char *floating_scroll_right_cmd; - enum sway_container_layout default_orientation; - enum sway_container_layout default_layout; + enum swayc_layouts default_orientation; + enum swayc_layouts default_layout; char *font; int font_height; @@ -324,8 +324,8 @@ struct sway_config { list_t *config_chain; const char *current_config; - enum sway_container_border border; - enum sway_container_border floating_border; + enum swayc_border_types border; + enum swayc_border_types floating_border; int border_thickness; int floating_border_thickness; enum edge_border_types hide_edge_borders; @@ -356,7 +356,7 @@ struct sway_config { struct input_config *input_config; struct seat_config *seat_config; struct sway_seat *seat; - struct sway_container *current_container; + swayc_t *current_container; } handler_context; }; @@ -416,8 +416,7 @@ void output_get_identifier(char *identifier, size_t len, struct sway_output *output); 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, swayc_t *output); void free_output_config(struct output_config *oc); /** |