diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2018-04-04 22:36:09 -0400 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2018-04-04 22:36:09 -0400 |
| commit | 65f254f3fbc83d006d4ec29170ec8a8695345d6c (patch) | |
| tree | 3044fb62120ca23499d31275076af50db09a9850 /include/sway/tree | |
| parent | deda37469ad4e21ad86b7c83c7c8a966301b9d5e (diff) | |
| parent | 21aedf15052df4e7f8ee72922fa0e214d690facc (diff) | |
| download | sway-65f254f3fbc83d006d4ec29170ec8a8695345d6c.tar.xz | |
Merge branch 'wlroots' into fix-focus-inactive
Diffstat (limited to 'include/sway/tree')
| -rw-r--r-- | include/sway/tree/container.h | 2 | ||||
| -rw-r--r-- | include/sway/tree/view.h | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index 277165ea..3a3a9429 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h @@ -83,6 +83,8 @@ struct sway_container { list_t *marks; // list of char* + float alpha; + struct { struct wl_signal destroy; // Raised after the tree updates, but before arrange_windows diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index 4b84205e..f32ccc5a 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h @@ -59,11 +59,9 @@ struct sway_wl_shell_surface { }; enum sway_view_type { - SWAY_WL_SHELL_VIEW, - SWAY_XDG_SHELL_V6_VIEW, - SWAY_XWAYLAND_VIEW, - // Keep last - SWAY_VIEW_TYPES, + SWAY_VIEW_WL_SHELL, + SWAY_VIEW_XDG_SHELL_V6, + SWAY_VIEW_XWAYLAND, }; enum sway_view_prop { @@ -101,9 +99,6 @@ struct sway_view { struct sway_xwayland_surface *sway_xwayland_surface; struct sway_wl_shell_surface *sway_wl_shell_surface; }; - - // only used for unmanaged views (shell specific) - struct wl_list unmanaged_view_link; // sway_root::unmanaged_views }; struct sway_view *view_create(enum sway_view_type type, |