isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 09:30:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland-surface: Group MetaWaylandSurface members logically

Browse Source 
And add comments so that we know what's what. This cleans up the struct.
This commit is contained in:
Jasper St. Pierre 2014-10-06 20:15:18 -07:00
parent 97705d3cfe
commit 49092397f2
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/wayland/meta-wayland-surface.h
View File

@ -77,23 +77,33 @@ typedef struct
struct _MetaWaylandSurface struct _MetaWaylandSurface
{ {
/* Generic stuff */
struct wl_resource *resource; struct wl_resource *resource;
MetaWaylandCompositor *compositor; MetaWaylandCompositor *compositor;
MetaSurfaceActor *surface_actor; MetaSurfaceActor *surface_actor;
MetaWindow *window; MetaWindow *window;
struct wl_resource *xdg_shell_resource; MetaWaylandBuffer *buffer;
struct wl_listener buffer_destroy_listener;
int scale;
int32_t offset_x, offset_y;
GList *subsurfaces;
/* All the pending state that wl_surface.commit will apply. */
MetaWaylandPendingState pending;
/* Extension structs. */
MetaWaylandSurfaceExtension xdg_surface; MetaWaylandSurfaceExtension xdg_surface;
MetaWaylandSurfaceExtension xdg_popup; MetaWaylandSurfaceExtension xdg_popup;
MetaWaylandSurfaceExtension wl_shell_surface; MetaWaylandSurfaceExtension wl_shell_surface;
MetaWaylandSurfaceExtension gtk_surface; MetaWaylandSurfaceExtension gtk_surface;
MetaWaylandSurfaceExtension subsurface; MetaWaylandSurfaceExtension subsurface;
int scale;
MetaWaylandBuffer *buffer; /* xdg_surface stuff */
struct wl_listener buffer_destroy_listener; struct wl_resource *xdg_shell_resource;
MetaWaylandSerial acked_configure_serial;
GList *subsurfaces; gboolean has_set_geometry;
/* wl_subsurface stuff. */
struct { struct {
MetaWaylandSurface *parent; MetaWaylandSurface *parent;
struct wl_listener parent_destroy_listener; struct wl_listener parent_destroy_listener;
@ -114,15 +124,6 @@ struct _MetaWaylandSurface
gboolean pending_pos; gboolean pending_pos;
GSList *pending_placement_ops; GSList *pending_placement_ops;
} sub; } sub;
int32_t offset_x, offset_y;
gboolean has_set_geometry;
/* All the pending state that wl_surface.commit will apply. */
MetaWaylandPendingState pending;
MetaWaylandSerial acked_configure_serial;
}; };
void meta_wayland_shell_init (MetaWaylandCompositor *compositor); void meta_wayland_shell_init (MetaWaylandCompositor *compositor);