diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-12-03 17:15:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-03 17:15:58 -0500 |
| commit | c733e0858fcf9e54dd41f7b8882d5fe722bb01b4 (patch) | |
| tree | 35d7016c86a5de5e662ff546ffda3394e34d6ec4 /include/sway | |
| parent | 7141f652594d723995aa4e9e5df850c14902a5ce (diff) | |
| parent | 9afcfd44c425691180a96d4e0d6673e5ac96dcce (diff) | |
Merge pull request #1493 from acrisci/feature/wl-shell
basic wl_shell
Diffstat (limited to 'include/sway')
| -rw-r--r-- | include/sway/server.h | 4 | ||||
| -rw-r--r-- | include/sway/view.h | 16 |
2 files changed, 19 insertions, 1 deletions
diff --git a/include/sway/server.h b/include/sway/server.h index b0684d15..bfdb7b8a 100644 --- a/include/sway/server.h +++ b/include/sway/server.h @@ -30,6 +30,9 @@ struct sway_server { struct wlr_xdg_shell_v6 *xdg_shell_v6; struct wl_listener xdg_shell_v6_surface; + + struct wlr_wl_shell *wl_shell; + struct wl_listener wl_shell_surface; }; struct sway_server server; @@ -42,5 +45,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/sway/view.h b/include/sway/view.h index cf2e6f66..7aa04794 100644 --- a/include/sway/view.h +++ b/include/sway/view.h @@ -19,6 +19,18 @@ struct sway_xdg_surface_v6 { int pending_width, pending_height; }; +struct sway_wl_shell_surface { + struct sway_view *view; + + struct wl_listener commit; + struct wl_listener request_move; + struct wl_listener request_resize; + struct wl_listener request_maximize; + struct wl_listener destroy; + + int pending_width, pending_height; +}; + enum sway_view_type { SWAY_WL_SHELL_VIEW, SWAY_XDG_SHELL_V6_VIEW, @@ -29,9 +41,9 @@ enum sway_view_type { enum sway_view_prop { VIEW_PROP_TITLE, + VIEW_PROP_APP_ID, VIEW_PROP_CLASS, VIEW_PROP_INSTANCE, - VIEW_PROP_APP_ID, }; /** @@ -46,10 +58,12 @@ struct sway_view { union { struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6; + struct wlr_wl_shell_surface *wlr_wl_shell_surface; }; union { struct sway_xdg_surface_v6 *sway_xdg_surface_v6; + struct sway_wl_shell_surface *sway_wl_shell_surface; }; struct { |