diff options
| author | emersion <contact@emersion.fr> | 2018-03-27 10:25:02 -0400 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2018-03-27 10:25:02 -0400 |
| commit | 171e28eaff6e3699a98b828b6430b844d54f624d (patch) | |
| tree | 0742d775bcdbf69c77a054c53c8d061412b949ce /include/wlr | |
| parent | 334bab543d6688769a86374a1ddd3d3b36e619b4 (diff) | |
xdg-shell: don't destroy role resources on unmap, move toplevel fields
Ports 5233801530c5ccc95699a12ba7da2d7ce58c952c and
334bab543d6688769a86374a1ddd3d3b36e619b4 to xdg-shell stable.
Diffstat (limited to 'include/wlr')
| -rw-r--r-- | include/wlr/types/wlr_xdg_shell.h | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/include/wlr/types/wlr_xdg_shell.h b/include/wlr/types/wlr_xdg_shell.h index a40a56f5..2724e0f7 100644 --- a/include/wlr/types/wlr_xdg_shell.h +++ b/include/wlr/types/wlr_xdg_shell.h @@ -74,9 +74,22 @@ struct wlr_xdg_toplevel { struct wlr_xdg_surface *base; struct wlr_xdg_surface *parent; bool added; + struct wlr_xdg_toplevel_state next; // client protocol requests struct wlr_xdg_toplevel_state pending; // user configure requests struct wlr_xdg_toplevel_state current; + + char *title; + char *app_id; + + struct { + struct wl_signal request_maximize; + struct wl_signal request_fullscreen; + struct wl_signal request_minimize; + struct wl_signal request_move; + struct wl_signal request_resize; + struct wl_signal request_show_window_menu; + } events; }; struct wlr_xdg_surface_configure { @@ -106,10 +119,6 @@ struct wlr_xdg_surface { uint32_t configure_next_serial; struct wl_list configure_list; - // Only for toplevel - char *title; - char *app_id; - bool has_next_geometry; struct wlr_box next_geometry; struct wlr_box geometry; @@ -122,13 +131,6 @@ struct wlr_xdg_surface { struct wl_signal new_popup; struct wl_signal map; struct wl_signal unmap; - - struct wl_signal request_maximize; - struct wl_signal request_fullscreen; - struct wl_signal request_minimize; - struct wl_signal request_move; - struct wl_signal request_resize; - struct wl_signal request_show_window_menu; } events; void *data; |