From 639322a44794f5a61b16d75f69ee9f0aadb91120 Mon Sep 17 00:00:00 2001 From: Benoit Gschwind Date: Thu, 28 Apr 2016 20:33:15 +0200 Subject: [PATCH] compositor-wayland: put configuration structure in separate header Signed-off-by: Benoit Gschwind [Pekka: moved #include out of extern "C".] Signed-off-by: Pekka Paalanen --- 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 810945bc..53458291 100644 --- a/Makefile.am +++ b/Makefile.am @@ -76,6 +76,7 @@ weston_SOURCES = \ src/compositor-fbdev.h \ src/compositor-rdp.h \ src/compositor-x11.h \ + src/compositor-wayland.h \ src/input.c \ src/data-device.c \ src/screenshooter.c \ @@ -216,6 +217,7 @@ westoninclude_HEADERS = \ src/compositor-fbdev.h \ src/compositor-rdp.h \ src/compositor-x11.h \ + src/compositor-wayland.h \ src/timeline-object.h \ shared/matrix.h \ shared/config-parser.h \ @@ -316,6 +318,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 d96fc0c6..d0d10823 100644 --- a/src/compositor-wayland.c +++ b/src/compositor-wayland.c @@ -40,6 +40,7 @@ #include #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 00000000..5af5ea7c --- /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 + +#include "compositor.h" + +#ifdef __cplusplus +extern "C" { +#endif + +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 */