mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor-wayland: put configuration structure in separate header

Browse Source 
Signed-off-by: Benoit Gschwind <gschwind@gnu-log.net>
[Pekka: moved #include out of extern "C".]
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Benoit Gschwind 2016-04-28 20:33:15 +02:00 committed by Pekka Paalanen
parent cd63b3ea51
commit 639322a447
3 changed files with 62 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -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 \

20
src/compositor-wayland.c
View File

@ -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;

58
src/compositor-wayland.h Normal file
View File

@ -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 */