diff options
author | Drew DeVault <sir@cmpwn.com> | 2016-07-05 08:09:22 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-05 08:09:22 -0400 |
commit | 58804a044f782a397302173deb1416e47b3c3357 (patch) | |
tree | 9e155febd82e37ba6cb7b9e1b8ee7fda044d5147 /include | |
parent | Merge pull request #737 from zandrmartin/fix-bar-on-reload (diff) | |
parent | Fix formatting guide violations (spaces instead of tabs) (diff) | |
download | sway-58804a044f782a397302173deb1416e47b3c3357.tar.gz sway-58804a044f782a397302173deb1416e47b3c3357.tar.zst sway-58804a044f782a397302173deb1416e47b3c3357.zip |
Merge pull request #738 from deklov/panel-as-shell-02
Make swaybar and swaybg shell surfaces, take 2
Diffstat (limited to 'include')
-rw-r--r-- | include/client/window.h | 1 | ||||
-rw-r--r-- | include/extensions.h | 40 |
2 files changed, 23 insertions, 18 deletions
diff --git a/include/client/window.h b/include/client/window.h index eff9032d..e48ec4f3 100644 --- a/include/client/window.h +++ b/include/client/window.h | |||
@@ -42,5 +42,6 @@ struct window *window_setup(struct registry *registry, uint32_t width, uint32_t | |||
42 | void window_teardown(struct window *state); | 42 | void window_teardown(struct window *state); |
43 | int window_prerender(struct window *state); | 43 | int window_prerender(struct window *state); |
44 | int window_render(struct window *state); | 44 | int window_render(struct window *state); |
45 | void window_make_shell(struct window *window); | ||
45 | 46 | ||
46 | #endif | 47 | #endif |
diff --git a/include/extensions.h b/include/extensions.h index 158a40a2..7c508b5e 100644 --- a/include/extensions.h +++ b/include/extensions.h | |||
@@ -7,33 +7,37 @@ | |||
7 | #include "list.h" | 7 | #include "list.h" |
8 | 8 | ||
9 | struct background_config { | 9 | struct background_config { |
10 | wlc_handle output; | 10 | wlc_handle output; |
11 | wlc_resource surface; | 11 | wlc_resource surface; |
12 | // we need the wl_resource of the surface in the destructor | 12 | // we need the wl_resource of the surface in the destructor |
13 | struct wl_resource *wl_surface_res; | 13 | struct wl_resource *wl_surface_res; |
14 | // used to determine if client is a background | ||
15 | struct wl_client *client; | ||
14 | }; | 16 | }; |
15 | 17 | ||
16 | struct panel_config { | 18 | struct panel_config { |
17 | // wayland resource used in callbacks, is used to track this panel | 19 | // wayland resource used in callbacks, is used to track this panel |
18 | struct wl_resource *wl_resource; | 20 | struct wl_resource *wl_resource; |
19 | wlc_handle output; | 21 | wlc_handle output; |
20 | wlc_resource surface; | 22 | wlc_resource surface; |
21 | // we need the wl_resource of the surface in the destructor | 23 | // we need the wl_resource of the surface in the destructor |
22 | struct wl_resource *wl_surface_res; | 24 | struct wl_resource *wl_surface_res; |
23 | enum desktop_shell_panel_position panel_position; | 25 | enum desktop_shell_panel_position panel_position; |
26 | // used to determine if client is a panel | ||
27 | struct wl_client *client; | ||
24 | }; | 28 | }; |
25 | 29 | ||
26 | struct desktop_shell_state { | 30 | struct desktop_shell_state { |
27 | list_t *backgrounds; | 31 | list_t *backgrounds; |
28 | list_t *panels; | 32 | list_t *panels; |
29 | list_t *lock_surfaces; | 33 | list_t *lock_surfaces; |
30 | bool is_locked; | 34 | bool is_locked; |
31 | }; | 35 | }; |
32 | 36 | ||
33 | struct swaylock_state { | 37 | struct swaylock_state { |
34 | bool active; | 38 | bool active; |
35 | wlc_handle output; | 39 | wlc_handle output; |
36 | wlc_resource surface; | 40 | wlc_resource surface; |
37 | }; | 41 | }; |
38 | 42 | ||
39 | extern struct desktop_shell_state desktop_shell; | 43 | extern struct desktop_shell_state desktop_shell; |