summaryrefslogtreecommitdiffstats
path: root/include/sway
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-10-07 20:40:05 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-10-08 22:49:59 +1000
commit832ebc896655cb5ca7689559d4e42b426d764e71 (patch)
tree1a3bc3ff7fb13d7ed5e86ad67a05739d4c4a1de3 /include/sway
parentMerge pull request #2791 from RyanDwyer/status-command-optional (diff)
downloadsway-832ebc896655cb5ca7689559d4e42b426d764e71.tar.gz
sway-832ebc896655cb5ca7689559d4e42b426d764e71.tar.zst
sway-832ebc896655cb5ca7689559d4e42b426d764e71.zip
Implement popup_during_fullscreen
This introduces a new view_impl function: is_transient_for. Similar to container_has_ancestor but works using the surface parents rather than the tree. This patch modifies view_is_visible, container_at and so on to allow transient views to function normally when they're in front of a fullscreen view.
Diffstat (limited to 'include/sway')
-rw-r--r--include/sway/commands.h1
-rw-r--r--include/sway/config.h7
-rw-r--r--include/sway/tree/view.h4
3 files changed, 12 insertions, 0 deletions
diff --git a/include/sway/commands.h b/include/sway/commands.h
index 21b8b87a..48228a98 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -154,6 +154,7 @@ sway_cmd cmd_new_window;
154sway_cmd cmd_no_focus; 154sway_cmd cmd_no_focus;
155sway_cmd cmd_output; 155sway_cmd cmd_output;
156sway_cmd cmd_permit; 156sway_cmd cmd_permit;
157sway_cmd cmd_popup_during_fullscreen;
157sway_cmd cmd_reject; 158sway_cmd cmd_reject;
158sway_cmd cmd_reload; 159sway_cmd cmd_reload;
159sway_cmd cmd_rename; 160sway_cmd cmd_rename;
diff --git a/include/sway/config.h b/include/sway/config.h
index 0e51fbfb..00b5f25b 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -256,6 +256,12 @@ enum edge_border_types {
256 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 */
257}; 257};
258 258
259enum sway_popup_during_fullscreen {
260 POPUP_SMART,
261 POPUP_IGNORE,
262 POPUP_LEAVE,
263};
264
259enum command_context { 265enum command_context {
260 CONTEXT_CONFIG = 1, 266 CONTEXT_CONFIG = 1,
261 CONTEXT_BINDING = 2, 267 CONTEXT_BINDING = 2,
@@ -355,6 +361,7 @@ struct sway_config {
355 bool pango_markup; 361 bool pango_markup;
356 size_t urgent_timeout; 362 size_t urgent_timeout;
357 enum sway_fowa focus_on_window_activation; 363 enum sway_fowa focus_on_window_activation;
364 enum sway_popup_during_fullscreen popup_during_fullscreen;
358 365
359 // Flags 366 // Flags
360 bool focus_follows_mouse; 367 bool focus_follows_mouse;
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 028be536..eb1e98e1 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);
@@ -396,4 +398,6 @@ void view_remove_saved_buffer(struct sway_view *view);
396 398
397void view_save_buffer(struct sway_view *view); 399void view_save_buffer(struct sway_view *view);
398 400
401bool view_is_transient_for(struct sway_view *child, struct sway_view *ancestor);
402
399#endif 403#endif