[PATCH weston v2 8/9] wayland-backend: put configuration structure in separate header

[Benoit Gschwind]

Signed-off-by: Benoit Gschwind <gschwind at gnu-log.net>
---
 Makefile.am              |  3 +++
 src/compositor-wayland.c | 20 +----------------
 src/compositor-wayland.h | 58 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 19 deletions(-)
 create mode 100644 src/compositor-wayland.h

diff --git a/Makefile.am b/Makefile.am
index 2d72730..6af640d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -74,6 +74,7 @@ weston_SOURCES =					\
 	src/compositor.h				\
 	src/compositor-headless.h		\
 	src/compositor-rdp.h				\
+	src/compositor-wayland.h			\
 	src/input.c					\
 	src/data-device.c				\
 	src/screenshooter.c				\
@@ -212,6 +213,7 @@ westoninclude_HEADERS =				\
 	src/compositor.h			\
 	src/compositor-headless.h		\
 	src/compositor-rdp.h			\
+	src/compositor-wayland.h		\
 	src/timeline-object.h			\
 	shared/matrix.h				\
 	shared/config-parser.h			\
@@ -311,6 +313,7 @@ wayland_backend_la_CFLAGS =			\
 	$(AM_CFLAGS)
 wayland_backend_la_SOURCES = 			\
 	src/compositor-wayland.c		\
+	src/compositor-wayland.h		\
 	shared/helpers.h
 nodist_wayland_backend_la_SOURCES =			\
 	protocol/fullscreen-shell-unstable-v1-protocol.c		\
diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c
index 58593bd..142cb3a 100644
--- a/src/compositor-wayland.c
+++ b/src/compositor-wayland.c
@@ -40,6 +40,7 @@
 #include <wayland-cursor.h>
 
 #include "compositor.h"
+#include "compositor-wayland.h"
 #include "gl-renderer.h"
 #include "pixman-renderer.h"
 #include "shared/helpers.h"
@@ -52,25 +53,6 @@
 
 #define WINDOW_TITLE "Weston Compositor"
 
-struct weston_wayland_backend_output_config {
-	int width;
-	int height;
-	char *name;
-	uint32_t transform;
-	int32_t scale;
-};
-
-struct weston_wayland_backend_config {
-	int use_pixman;
-	int sprawl;
-	char *display_name;
-	int fullscreen;
-	char *cursor_theme;
-	int cursor_size;
-	int num_outputs;
-	struct weston_wayland_backend_output_config *outputs;
-};
-
 struct wayland_backend {
 	struct weston_backend base;
 	struct weston_compositor *compositor;
diff --git a/src/compositor-wayland.h b/src/compositor-wayland.h
new file mode 100644
index 0000000..ab216eb
--- /dev/null
+++ b/src/compositor-wayland.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2016 Benoit Gschwind
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef WESTON_COMPOSITOR_WAYLAND_H
+#define WESTON_COMPOSITOR_WAYLAND_H
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#include "compositor.h"
+
+struct weston_wayland_backend_output_config {
+	int width;
+	int height;
+	char *name;
+	uint32_t transform;
+	int32_t scale;
+};
+
+struct weston_wayland_backend_config {
+	int use_pixman;
+	int sprawl;
+	char *display_name;
+	int fullscreen;
+	char *cursor_theme;
+	int cursor_size;
+	int num_outputs;
+	struct weston_wayland_backend_output_config *outputs;
+};
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif /* WESTON_COMPOSITOR_WAYLAND_H */
-- 
2.7.3