brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland: Only include Wayland headers in private

Browse Source 
As wayland-client.h and wayland-server.h can't be included together,
split the Wayland backend file into clutter-backend-wayland.h, which
only defines the types, and clutter-backend-wayland-priv.h, which
actually uses the Wayland client types.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

https://bugzilla.gnome.org/show_bug.cgi?id=692851
This commit is contained in:
Daniel Stone
2013-01-30 11:49:38 +11:00
committed by Emmanuele Bassi
parent b37b9d917a
commit dfb145988e
7 changed files with 72 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
clutter/wayland/clutter-backend-wayland.h
View File

@ -32,9 +32,6 @@
#include <clutter/clutter-backend.h>
#include <clutter/clutter-device-manager.h>
#include <wayland-client.h>
#include <wayland-cursor.h>
#include "clutter-backend-private.h"
G_BEGIN_DECLS
@ -49,31 +46,6 @@ G_BEGIN_DECLS
typedef struct _ClutterBackendWayland ClutterBackendWayland;
typedef struct _ClutterBackendWaylandClass ClutterBackendWaylandClass;
struct _ClutterBackendWayland
{
ClutterBackend parent_instance;
ClutterDeviceManager *device_manager;
struct wl_display *wayland_display;
struct wl_registry *wayland_registry;
struct wl_compositor *wayland_compositor;
struct wl_shell *wayland_shell;
struct wl_shm *wayland_shm;
struct wl_surface *cursor_surface;
struct wl_buffer *cursor_buffer;
struct wl_output *wayland_output;
struct wl_cursor_theme *cursor_theme;
gint cursor_x, cursor_y;
gint output_width, output_height;
GSource *wayland_source;
/* event timer */
GTimer *event_timer;
};
struct _ClutterBackendWaylandClass
{
ClutterBackendClass parent_class;