diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/pool-buffer.h | 2 | ||||
-rw-r--r-- | include/sway/commands.h | 1 | ||||
-rw-r--r-- | include/sway/config.h | 1 | ||||
-rw-r--r-- | include/sway/criteria.h | 1 | ||||
-rw-r--r-- | include/sway/tree/layout.h | 2 | ||||
-rw-r--r-- | include/sway/tree/view.h | 2 | ||||
-rw-r--r-- | include/swaylock/swaylock.h | 3 |
7 files changed, 11 insertions, 1 deletions
diff --git a/include/pool-buffer.h b/include/pool-buffer.h index 856f7c8c..54f5be06 100644 --- a/include/pool-buffer.h +++ b/include/pool-buffer.h | |||
@@ -12,6 +12,8 @@ struct pool_buffer { | |||
12 | cairo_t *cairo; | 12 | cairo_t *cairo; |
13 | PangoContext *pango; | 13 | PangoContext *pango; |
14 | uint32_t width, height; | 14 | uint32_t width, height; |
15 | void *data; | ||
16 | size_t size; | ||
15 | bool busy; | 17 | bool busy; |
16 | }; | 18 | }; |
17 | 19 | ||
diff --git a/include/sway/commands.h b/include/sway/commands.h index d39ac56c..365068ae 100644 --- a/include/sway/commands.h +++ b/include/sway/commands.h | |||
@@ -144,6 +144,7 @@ sway_cmd cmd_splitt; | |||
144 | sway_cmd cmd_splitv; | 144 | sway_cmd cmd_splitv; |
145 | sway_cmd cmd_sticky; | 145 | sway_cmd cmd_sticky; |
146 | sway_cmd cmd_swaybg_command; | 146 | sway_cmd cmd_swaybg_command; |
147 | sway_cmd cmd_swap; | ||
147 | sway_cmd cmd_title_format; | 148 | sway_cmd cmd_title_format; |
148 | sway_cmd cmd_unmark; | 149 | sway_cmd cmd_unmark; |
149 | sway_cmd cmd_workspace; | 150 | sway_cmd cmd_workspace; |
diff --git a/include/sway/config.h b/include/sway/config.h index 33f52156..118981e3 100644 --- a/include/sway/config.h +++ b/include/sway/config.h | |||
@@ -28,6 +28,7 @@ struct sway_variable { | |||
28 | struct sway_binding { | 28 | struct sway_binding { |
29 | int order; | 29 | int order; |
30 | bool release; | 30 | bool release; |
31 | bool locked; | ||
31 | bool bindcode; | 32 | bool bindcode; |
32 | list_t *keys; | 33 | list_t *keys; |
33 | uint32_t modifiers; | 34 | uint32_t modifiers; |
diff --git a/include/sway/criteria.h b/include/sway/criteria.h index 74da132c..bd3ca0ac 100644 --- a/include/sway/criteria.h +++ b/include/sway/criteria.h | |||
@@ -18,6 +18,7 @@ struct criteria { | |||
18 | char *target; // workspace or output name for `assign` criteria | 18 | char *target; // workspace or output name for `assign` criteria |
19 | 19 | ||
20 | pcre *title; | 20 | pcre *title; |
21 | pcre *shell; | ||
21 | pcre *app_id; | 22 | pcre *app_id; |
22 | pcre *class; | 23 | pcre *class; |
23 | pcre *instance; | 24 | pcre *instance; |
diff --git a/include/sway/tree/layout.h b/include/sway/tree/layout.h index cc999871..2e0f2abf 100644 --- a/include/sway/tree/layout.h +++ b/include/sway/tree/layout.h | |||
@@ -69,4 +69,6 @@ struct sway_container *container_split(struct sway_container *child, | |||
69 | void container_recursive_resize(struct sway_container *container, | 69 | void container_recursive_resize(struct sway_container *container, |
70 | double amount, enum resize_edge edge); | 70 | double amount, enum resize_edge edge); |
71 | 71 | ||
72 | void container_swap(struct sway_container *con1, struct sway_container *con2); | ||
73 | |||
72 | #endif | 74 | #endif |
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index 0fb8f1b3..a8bf4955 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h | |||
@@ -201,7 +201,7 @@ const char *view_get_window_role(struct sway_view *view); | |||
201 | 201 | ||
202 | uint32_t view_get_window_type(struct sway_view *view); | 202 | uint32_t view_get_window_type(struct sway_view *view); |
203 | 203 | ||
204 | const char *view_get_type(struct sway_view *view); | 204 | const char *view_get_shell(struct sway_view *view); |
205 | 205 | ||
206 | void view_configure(struct sway_view *view, double ox, double oy, int width, | 206 | void view_configure(struct sway_view *view, double ox, double oy, int width, |
207 | int height); | 207 | int height); |
diff --git a/include/swaylock/swaylock.h b/include/swaylock/swaylock.h index dae823b8..2931fd61 100644 --- a/include/swaylock/swaylock.h +++ b/include/swaylock/swaylock.h | |||
@@ -56,6 +56,7 @@ struct swaylock_surface { | |||
56 | struct zwlr_layer_surface_v1 *layer_surface; | 56 | struct zwlr_layer_surface_v1 *layer_surface; |
57 | struct pool_buffer buffers[2]; | 57 | struct pool_buffer buffers[2]; |
58 | struct pool_buffer *current_buffer; | 58 | struct pool_buffer *current_buffer; |
59 | bool frame_pending, dirty; | ||
59 | uint32_t width, height; | 60 | uint32_t width, height; |
60 | int32_t scale; | 61 | int32_t scale; |
61 | char *output_name; | 62 | char *output_name; |
@@ -74,5 +75,7 @@ void swaylock_handle_key(struct swaylock_state *state, | |||
74 | xkb_keysym_t keysym, uint32_t codepoint); | 75 | xkb_keysym_t keysym, uint32_t codepoint); |
75 | void render_frame(struct swaylock_surface *surface); | 76 | void render_frame(struct swaylock_surface *surface); |
76 | void render_frames(struct swaylock_state *state); | 77 | void render_frames(struct swaylock_state *state); |
78 | void damage_surface(struct swaylock_surface *surface); | ||
79 | void damage_state(struct swaylock_state *state); | ||
77 | 80 | ||
78 | #endif | 81 | #endif |