diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-09-27 20:24:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-27 20:24:13 -0400 |
| commit | 38bb3b960852f9e358ec40c516f99eafeaf83ab2 (patch) | |
| tree | 755f57a424364aa991e9303760a2040ae324cfd8 /include/rootston | |
| parent | 1ddda91b1b647df339b5b0a6aefa383e48d634d8 (diff) | |
| parent | 4e70d36e61dd720e9caadb74b39d3a0cd6c8cad7 (diff) | |
Merge pull request #162 from emersion/wl_shell
Add wl_shell to rootston
Diffstat (limited to 'include/rootston')
| -rw-r--r-- | include/rootston/desktop.h | 2 | ||||
| -rw-r--r-- | include/rootston/view.h | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h index 62050972..ef361d87 100644 --- a/include/rootston/desktop.h +++ b/include/rootston/desktop.h @@ -39,6 +39,7 @@ struct roots_desktop { struct wl_listener output_add; struct wl_listener output_remove; struct wl_listener xdg_shell_v6_surface; + struct wl_listener wl_shell_surface; }; struct roots_server; @@ -55,5 +56,6 @@ void output_add_notify(struct wl_listener *listener, void *data); void output_remove_notify(struct wl_listener *listener, void *data); void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data); +void handle_wl_shell_surface(struct wl_listener *listener, void *data); #endif diff --git a/include/rootston/view.h b/include/rootston/view.h index b74d1075..1010566a 100644 --- a/include/rootston/view.h +++ b/include/rootston/view.h @@ -6,8 +6,14 @@ #include <wlr/types/wlr_xdg_shell_v6.h> struct roots_wl_shell_surface { - // TODO - void *_placeholder; + struct roots_view *view; + // TODO: Maybe destroy listener should go in roots_view + struct wl_listener destroy; + struct wl_listener ping_timeout; + struct wl_listener request_move; + struct wl_listener request_resize; + struct wl_listener request_set_fullscreen; + struct wl_listener request_set_maximized; }; struct roots_xdg_surface_v6 { @@ -34,7 +40,7 @@ struct roots_view { // TODO: Something for roots-enforced width/height enum roots_view_type type; union { - struct wlr_shell_surface *wl_shell_surface; + struct wlr_wl_shell_surface *wl_shell_surface; struct wlr_xdg_surface_v6 *xdg_surface_v6; }; union { |