wayland: Move shell surface role fields to the role structs

Don't keep all the role specific fields in MetaWaylandSurface and have
the roles manage the needed fields themself.

https://bugzilla.gnome.org/show_bug.cgi?id=763431

1 files changed, 1 insertions, 42 deletions

diff --git a/src/wayland/meta-wayland-surface.h b/src/wayland/meta-wayland-surface.h
index 8a000230d..9322719da 100644
--- a/src/wayland/meta-wayland-surface.h
+++ b/src/wayland/meta-wayland-surface.h
@@ -158,16 +158,6 @@ struct _MetaWaylandDragDestFuncs
                       MetaWaylandSurface    *surface);
 };
 
-typedef enum
-{
-  META_WL_SHELL_SURFACE_STATE_NONE,
-  META_WL_SHELL_SURFACE_STATE_TOPLEVEL,
-  META_WL_SHELL_SURFACE_STATE_POPUP,
-  META_WL_SHELL_SURFACE_STATE_TRANSIENT,
-  META_WL_SHELL_SURFACE_STATE_FULLSCREEN,
-  META_WL_SHELL_SURFACE_STATE_MAXIMIZED,
-} MetaWlShellSurfaceState;
-
 struct _MetaWaylandSurface
 {
   GObject parent;
@@ -212,43 +202,12 @@ struct _MetaWaylandSurface
   MetaWaylandPendingState *pending;
 
   /* Extension resources. */
-  struct wl_resource *xdg_surface;
-  struct wl_resource *xdg_popup;
-  struct wl_resource *wl_shell_surface;
   struct wl_resource *gtk_surface;
   struct wl_resource *wl_subsurface;
 
-  /* xdg_surface stuff */
-  struct wl_resource *xdg_shell_resource;
-  MetaWaylandSerial acked_configure_serial;
-  gboolean has_set_geometry;
+  /* gtk_surface stuff */
   gboolean is_modal;
 
-  /* xdg_popup */
-  struct {
-    MetaWaylandSurface *parent;
-    struct wl_listener parent_destroy_listener;
-
-    MetaWaylandPopup *popup;
-  } popup;
-
-  /* wl_shell_surface */
-  struct {
-    MetaWlShellSurfaceState state;
-
-    char *title;
-    char *wm_class;
-
-    gboolean pending_popup;
-    MetaWaylandSurface *parent_surface;
-    GList *children;
-
-    MetaWaylandSeat *popup_seat;
-
-    int x;
-    int y;
-  } wl_shell;
-
   /* wl_subsurface stuff. */
   struct {
     MetaWaylandSurface *parent;