diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-08-15 17:39:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-15 17:39:18 -0400 |
| commit | 19d6442f52743d50d10c796d7146f58c251f67fe (patch) | |
| tree | 3fb49d748f662ef8132a59798df1854be54ae76a /include/wlr | |
| parent | 27c13d621df7b38d04f8ffb3012aa977d1b9bb24 (diff) | |
| parent | dca3f630ddeaa85b90e863cd181f2d27282a9cd3 (diff) | |
Merge pull request #91 from martinetd/move_wl_shell
Move wl_shell into wlroots
Diffstat (limited to 'include/wlr')
| -rw-r--r-- | include/wlr/types/wlr_wl_shell.h | 25 | ||||
| -rw-r--r-- | include/wlr/types/wlr_xdg_shell_v6.h | 2 |
2 files changed, 26 insertions, 1 deletions
diff --git a/include/wlr/types/wlr_wl_shell.h b/include/wlr/types/wlr_wl_shell.h new file mode 100644 index 00000000..a085711b --- /dev/null +++ b/include/wlr/types/wlr_wl_shell.h @@ -0,0 +1,25 @@ +#ifndef _WLR_WL_SHELL_H +#define _WLR_WL_SHELL_H +#include <wayland-server.h> + +struct wlr_wl_shell { + struct wl_global *wl_global; + struct wl_list wl_resources; + struct wl_list surfaces; + + void *data; +}; + +struct wlr_wl_shell_surface { + struct wl_resource *surface; + struct wlr_texture *wlr_texture; + struct wl_list link; + + void *data; +}; + + +struct wlr_wl_shell *wlr_wl_shell_create(struct wl_display *display); +void wlr_wl_shell_destroy(struct wlr_wl_shell *wlr_wl_shell); + +#endif diff --git a/include/wlr/types/wlr_xdg_shell_v6.h b/include/wlr/types/wlr_xdg_shell_v6.h index 07380a96..41cf483a 100644 --- a/include/wlr/types/wlr_xdg_shell_v6.h +++ b/include/wlr/types/wlr_xdg_shell_v6.h @@ -18,7 +18,7 @@ struct wlr_xdg_surface_v6 { void *data; }; -struct wlr_xdg_shell_v6 *wlr_xdg_shell_v6_init(struct wl_display *display); +struct wlr_xdg_shell_v6 *wlr_xdg_shell_v6_create(struct wl_display *display); void wlr_xdg_shell_v6_destroy(struct wlr_xdg_shell_v6 *xdg_shell); #endif |