andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xwayland: Move Xwayland structures to their own header 

Currently, `xwayland.h` contains all the declarations, which is a bit
awkward and hard to follow.

Move the Xwayland structures declarations to their own header file.

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
This commit is contained in:
Olivier Fourdan 2019-12-17 08:48:51 +01:00
parent 5bfca0038e
commit c20e61fddc
4 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/xwayland/Makefile.am
View File

@ -14,6 +14,7 @@ Xwayland_SOURCES = \
xwayland-input.c \
xwayland-cursor.c \
xwayland-shm.c \
xwayland-types.h \
xwayland-output.c \
xwayland-cvt.c \
xwayland-vidmode.c \

1
hw/xwayland/meson.build
View File

@ -3,6 +3,7 @@ srcs = [
'xwayland-input.c',
'xwayland-cursor.c',
'xwayland-shm.c',
'xwayland-types.h',
'xwayland-output.c',
'xwayland-cvt.c',
'xwayland-vidmode.c',

34
hw/xwayland/xwayland-types.h Normal file
View File

@ -0,0 +1,34 @@
/*
* Copyright © 2014 Intel Corporation
*
* Permission to use, copy, modify, distribute, and sell this software
* and its documentation for any purpose is hereby granted without
* fee, provided that the above copyright notice appear in all copies
* and that both that copyright notice and this permission notice
* appear in supporting documentation, and that the name of the
* copyright holders not be used in advertising or publicity
* pertaining to distribution of the software without specific,
* written prior permission. The copyright holders make no
* representations about the suitability of this software for any
* purpose. It is provided "as is" without express or implied
* warranty.
*
* THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
* SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
* SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
* SOFTWARE.
*/
#ifndef XWAYLAND_TYPES_H
#define XWAYLAND_TYPES_H
struct xwl_pixmap;
struct xwl_window;
struct xwl_screen;
struct xwl_egl_backend;
#endif /* XWAYLAND_TYPES_H */

6
hw/xwayland/xwayland.h
View File

@ -50,16 +50,14 @@
#include "linux-dmabuf-unstable-v1-client-protocol.h"
#include "viewporter-client-protocol.h"
#include "xwayland-types.h"
struct xwl_format {
uint32_t format;
int num_modifiers;
uint64_t *modifiers;
};
struct xwl_pixmap;
struct xwl_window;
struct xwl_screen;
typedef void (*xwl_pixmap_cb) (PixmapPtr pixmap, void *data);
struct xwl_egl_backend {