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

xwayland: Cleanup and remove `xwayland.h` 

Now that each source and header should be in order, we can safely cleaup
the last remaining bits from the main `xwayland.h` which is not needed
anymore and can be removed.

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-18 15:00:11 +01:00
parent c830bd847f
commit 58155baeac
19 changed files with 13 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/xwayland/Makefile.am
View File

@ -35,7 +35,6 @@ Xwayland_SOURCES = \
xwayland-window.h \
xwayland-window-buffers.c \
xwayland-window-buffers.h \
xwayland.h \
$(top_srcdir)/Xi/stubs.c \
$(top_srcdir)/mi/miinitext.c

1
hw/xwayland/xwayland-cursor.c
View File

@ -32,7 +32,6 @@
#include "inputstr.h"
#include "mipointer.h"
#include "xwayland.h"
#include "xwayland-cursor.h"
#include "xwayland-input.h"
#include "xwayland-screen.h"

1
hw/xwayland/xwayland-cvt.c
View File

@ -33,7 +33,6 @@
#include <string.h>
#include <randrstr.h>
#include "xwayland.h"
#include "xwayland-cvt.h"

1
hw/xwayland/xwayland-glamor-eglstream.c
View File

@ -40,7 +40,6 @@
#include <epoxy/egl.h>
#include "xwayland.h"
#include "xwayland-glamor.h"
#include "xwayland-pixmap.h"
#include "xwayland-screen.h"

1
hw/xwayland/xwayland-glamor-gbm.c
View File

@ -46,7 +46,6 @@
#include <dri3.h>
#include "drm-client-protocol.h"
#include "xwayland.h"
#include "xwayland-glamor.h"
#include "xwayland-pixmap.h"
#include "xwayland-screen.h"

1
hw/xwayland/xwayland-glamor-xv.c
View File

@ -36,7 +36,6 @@
#include <X11/extensions/Xv.h>
#include "xwayland.h"
#include "xwayland-glamor.h"
#define NUM_FORMATS 3

5
hw/xwayland/xwayland-glamor.c
View File

@ -23,9 +23,7 @@
* SOFTWARE.
*/
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include <xwayland-config.h>
#define MESA_EGL_NO_X11_HEADERS
#define EGL_NO_X11
@ -37,7 +35,6 @@
#include "glx_extinit.h"
#endif
#include "xwayland.h"
#include "xwayland-glamor.h"
#include "xwayland-glx.h"
#include "xwayland-screen.h"

2
hw/xwayland/xwayland-glamor.h
View File

@ -28,6 +28,8 @@
#include <xwayland-config.h>
#include <wayland-client.h>
#include "xwayland-types.h"
struct xwl_egl_backend {

2
hw/xwayland/xwayland-glx.c
View File

@ -31,7 +31,7 @@
*/
#include <xwayland-config.h>
#include "xwayland.h"
#define MESA_EGL_NO_X11_HEADERS
#define EGL_NO_X11
// #include <EGL/egl.h>

1
hw/xwayland/xwayland-input.c
View File

@ -39,7 +39,6 @@
#include <mipointrst.h>
#include <misc.h>
#include "xwayland.h"
#include "xwayland-cursor.h"
#include "xwayland-input.h"
#include "xwayland-window.h"

1
hw/xwayland/xwayland-output.c
View File

@ -28,7 +28,6 @@
#include <randrstr.h>
#include <X11/Xatom.h>
#include "xwayland.h"
#include "xwayland-cvt.h"
#include "xwayland-output.h"
#include "xwayland-screen.h"

5
hw/xwayland/xwayland-present.c
View File

@ -23,14 +23,11 @@
* SOFTWARE.
*/
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include <xwayland-config.h>
#include <windowstr.h>
#include <present.h>
#include "xwayland.h"
#include "xwayland-present.h"
#include "xwayland-screen.h"
#include "xwayland-window.h"

1
hw/xwayland/xwayland-screen.c
View File

@ -47,7 +47,6 @@
#include "xwayland-pixmap.h"
#include "xwayland-present.h"
#include "xwayland-shm.h"
#include "xwayland.h"
#include "xdg-output-unstable-v1-client-protocol.h"
#include "viewporter-client-protocol.h"

1
hw/xwayland/xwayland-shm.c
View File

@ -40,7 +40,6 @@
#include "os.h"
#include "pixmapstr.h"
#include "xwayland.h"
#include "xwayland-pixmap.h"
#include "xwayland-screen.h"
#include "xwayland-shm.h"

2
hw/xwayland/xwayland-vidmode.c
View File

@ -35,7 +35,7 @@
#include "extinit.h"
#ifdef XF86VIDMODE
#include "xwayland.h"
#include "randrstr.h"
#include "vidmodestr.h"

7
hw/xwayland/xwayland-window-buffers.h
View File

@ -24,11 +24,14 @@
* Olivier Fourdan <ofourdan@redhat.com>
*/
#include "xwayland.h"
#ifndef XWAYLAND_WINDOW_BUFFERS_H
#define XWAYLAND_WINDOW_BUFFERS_H
#include <xwayland-config.h>
#include "xwayland-types.h"
#include "regionstr.h"
void xwl_window_buffers_init(struct xwl_window *xwl_window);
void xwl_window_buffers_recycle(struct xwl_window *xwl_window);
void xwl_window_buffers_dispose(struct xwl_window *xwl_window);

1
hw/xwayland/xwayland-window.c
View File

@ -42,7 +42,6 @@
#include "xwayland-window.h"
#include "xwayland-window-buffers.h"
#include "xwayland-shm.h"
#include "xwayland.h"
#include "viewporter-client-protocol.h"

3
hw/xwayland/xwayland.c
View File

@ -23,6 +23,8 @@
* SOFTWARE.
*/
#include <xwayland-config.h>
#include <stdio.h>
#include <X11/Xatom.h>
@ -36,7 +38,6 @@
#include <xserver_poll.h>
#include <propertyst.h>
#include "xwayland.h"
#include "xwayland-screen.h"
#include "xwayland-vidmode.h"

51
hw/xwayland/xwayland.h
View File

@ -1,51 +0,0 @@
/*
* 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_H
#define XWAYLAND_H
#include <xwayland-config.h>
#include <stdio.h>
#include <unistd.h>
#include <errno.h>
#include <wayland-client.h>
#include <X11/X.h>
#include <fb.h>
#include <dix.h>
#include <exevents.h>
#include "relative-pointer-unstable-v1-client-protocol.h"
#include "pointer-constraints-unstable-v1-client-protocol.h"
#include "tablet-unstable-v2-client-protocol.h"
#include "xwayland-keyboard-grab-unstable-v1-client-protocol.h"
#include "linux-dmabuf-unstable-v1-client-protocol.h"
#include "xwayland-types.h"
#endif