diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/commands.h | 2 | ||||
-rw-r--r-- | include/sway/config.h | 8 | ||||
-rw-r--r-- | include/sway/tree/container.h | 3 | ||||
-rw-r--r-- | include/sway/tree/view.h | 4 |
4 files changed, 16 insertions, 1 deletions
diff --git a/include/sway/commands.h b/include/sway/commands.h index f7fafb96..48228a98 100644 --- a/include/sway/commands.h +++ b/include/sway/commands.h | |||
@@ -103,6 +103,7 @@ sway_cmd cmd_bar; | |||
103 | sway_cmd cmd_bindcode; | 103 | sway_cmd cmd_bindcode; |
104 | sway_cmd cmd_bindsym; | 104 | sway_cmd cmd_bindsym; |
105 | sway_cmd cmd_border; | 105 | sway_cmd cmd_border; |
106 | sway_cmd cmd_client_noop; | ||
106 | sway_cmd cmd_client_focused; | 107 | sway_cmd cmd_client_focused; |
107 | sway_cmd cmd_client_focused_inactive; | 108 | sway_cmd cmd_client_focused_inactive; |
108 | sway_cmd cmd_client_unfocused; | 109 | sway_cmd cmd_client_unfocused; |
@@ -153,6 +154,7 @@ sway_cmd cmd_new_window; | |||
153 | sway_cmd cmd_no_focus; | 154 | sway_cmd cmd_no_focus; |
154 | sway_cmd cmd_output; | 155 | sway_cmd cmd_output; |
155 | sway_cmd cmd_permit; | 156 | sway_cmd cmd_permit; |
157 | sway_cmd cmd_popup_during_fullscreen; | ||
156 | sway_cmd cmd_reject; | 158 | sway_cmd cmd_reject; |
157 | sway_cmd cmd_reload; | 159 | sway_cmd cmd_reload; |
158 | sway_cmd cmd_rename; | 160 | sway_cmd cmd_rename; |
diff --git a/include/sway/config.h b/include/sway/config.h index 02ace979..00b5f25b 100644 --- a/include/sway/config.h +++ b/include/sway/config.h | |||
@@ -35,7 +35,6 @@ enum binding_flags { | |||
35 | BINDING_BORDER=4, // mouse only; trigger on container border | 35 | BINDING_BORDER=4, // mouse only; trigger on container border |
36 | BINDING_CONTENTS=8, // mouse only; trigger on container contents | 36 | BINDING_CONTENTS=8, // mouse only; trigger on container contents |
37 | BINDING_TITLEBAR=16, // mouse only; trigger on container titlebar | 37 | BINDING_TITLEBAR=16, // mouse only; trigger on container titlebar |
38 | BINDING_RELOAD=32, // the binding runs the reload command | ||
39 | }; | 38 | }; |
40 | 39 | ||
41 | /** | 40 | /** |
@@ -257,6 +256,12 @@ enum edge_border_types { | |||
257 | E_SMART_NO_GAPS, /**< hide both if one window and gaps to edge is zero */ | 256 | E_SMART_NO_GAPS, /**< hide both if one window and gaps to edge is zero */ |
258 | }; | 257 | }; |
259 | 258 | ||
259 | enum sway_popup_during_fullscreen { | ||
260 | POPUP_SMART, | ||
261 | POPUP_IGNORE, | ||
262 | POPUP_LEAVE, | ||
263 | }; | ||
264 | |||
260 | enum command_context { | 265 | enum command_context { |
261 | CONTEXT_CONFIG = 1, | 266 | CONTEXT_CONFIG = 1, |
262 | CONTEXT_BINDING = 2, | 267 | CONTEXT_BINDING = 2, |
@@ -356,6 +361,7 @@ struct sway_config { | |||
356 | bool pango_markup; | 361 | bool pango_markup; |
357 | size_t urgent_timeout; | 362 | size_t urgent_timeout; |
358 | enum sway_fowa focus_on_window_activation; | 363 | enum sway_fowa focus_on_window_activation; |
364 | enum sway_popup_during_fullscreen popup_during_fullscreen; | ||
359 | 365 | ||
360 | // Flags | 366 | // Flags |
361 | bool focus_follows_mouse; | 367 | bool focus_follows_mouse; |
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index da6592b4..920ef038 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h | |||
@@ -292,4 +292,7 @@ bool sway_dir_to_wlr(enum movement_direction dir, enum wlr_direction *out); | |||
292 | struct sway_container *container_split(struct sway_container *child, | 292 | struct sway_container *container_split(struct sway_container *child, |
293 | enum sway_container_layout layout); | 293 | enum sway_container_layout layout); |
294 | 294 | ||
295 | bool container_is_transient_for(struct sway_container *child, | ||
296 | struct sway_container *ancestor); | ||
297 | |||
295 | #endif | 298 | #endif |
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index eed3d13d..870ef2e0 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h | |||
@@ -49,6 +49,8 @@ struct sway_view_impl { | |||
49 | wlr_surface_iterator_func_t iterator, void *user_data); | 49 | wlr_surface_iterator_func_t iterator, void *user_data); |
50 | void (*for_each_popup)(struct sway_view *view, | 50 | void (*for_each_popup)(struct sway_view *view, |
51 | wlr_surface_iterator_func_t iterator, void *user_data); | 51 | wlr_surface_iterator_func_t iterator, void *user_data); |
52 | bool (*is_transient_for)(struct sway_view *child, | ||
53 | struct sway_view *ancestor); | ||
52 | void (*close)(struct sway_view *view); | 54 | void (*close)(struct sway_view *view); |
53 | void (*close_popups)(struct sway_view *view); | 55 | void (*close_popups)(struct sway_view *view); |
54 | void (*destroy)(struct sway_view *view); | 56 | void (*destroy)(struct sway_view *view); |
@@ -399,4 +401,6 @@ void view_remove_saved_buffer(struct sway_view *view); | |||
399 | 401 | ||
400 | void view_save_buffer(struct sway_view *view); | 402 | void view_save_buffer(struct sway_view *view); |
401 | 403 | ||
404 | bool view_is_transient_for(struct sway_view *child, struct sway_view *ancestor); | ||
405 | |||
402 | #endif | 406 | #endif |