(!1654) Xnest: dont link Xlib anymore

Now that we completely ported from Xlib to XCB, we can finally stop
importing Xlib :)

FIN.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

hw/xnest/Cursor.c

@@ -33,7 +33,6 @@ is" without express or implied warranty.
 #include "servermd.h"
 #include "mipointrst.h"
 
-#include "Xnest.h"
 #include "xnest-xcb.h"
 
 #include "Display.h"

hw/xnest/Display.h

@@ -17,8 +17,6 @@ is" without express or implied warranty.
 
 #include "colormap.h"
 
-#include "Xnest.h"
-
 #define UNDEFINED -1
 
 #define MAXDEPTH 32

hw/xnest/Events.c

@@ -31,7 +31,6 @@ is" without express or implied warranty.
 
 #include "mi.h"
 
-#include "Xnest.h"
 #include "xnest-xcb.h"
 
 #include "Args.h"

hw/xnest/Font.c

@@ -28,7 +28,6 @@ is" without express or implied warranty.
 #include "dixfontstr.h"
 #include "scrnintstr.h"
 
-#include "Xnest.h"
 #include "xnest-xcb.h"
 
 #include "Display.h"

hw/xnest/GC.c

@@ -33,7 +33,6 @@ is" without express or implied warranty.
 #include "mistruct.h"
 #include "region.h"
 
-#include "Xnest.h"
 #include "xnest-xcb.h"
 
 #include "Display.h"

hw/xnest/Handlers.c

@@ -25,8 +25,6 @@ is" without express or implied warranty.
 #include "windowstr.h"
 #include "servermd.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Events.h"
 #include "Handlers.h"

hw/xnest/Init.c

@@ -35,9 +35,7 @@ is" without express or implied warranty.
 #include "dixfontstr.h"
 #include "extinit_priv.h"
 
-#include "Xnest.h"
 #include "xnest-xcb.h"
-
 #include "Display.h"
 #include "Screen.h"
 #include "Pointer.h"

hw/xnest/Keyboard.c

@@ -32,7 +32,6 @@ is" without express or implied warranty.
 #include "scrnintstr.h"
 #include "servermd.h"
 
-#include "Xnest.h"
 #include "xnest-xcb.h"
 
 #include "Display.h"

hw/xnest/Pixmap.c

@@ -28,7 +28,6 @@ is" without express or implied warranty.
 #include "privates.h"
 #include "mi.h"
 
-#include "Xnest.h"
 #include "xnest-xcb.h"
 
 #include "Display.h"

hw/xnest/Pointer.c

@@ -26,7 +26,6 @@ is" without express or implied warranty.
 #include "servermd.h"
 #include "mipointer.h"
 
-#include "Xnest.h"
 #include "xnest-xcb.h"
 
 #include "Display.h"

hw/xnest/Screen.c

@@ -34,7 +34,6 @@ is" without express or implied warranty.
 #include "colormapst.h"
 #include "resource.h"
 
-#include "Xnest.h"
 #include "xnest-xcb.h"
 
 #include "Display.h"

hw/xnest/Window.c

@@ -34,7 +34,6 @@ is" without express or implied warranty.
 
 #include "mi.h"
 
-#include "Xnest.h"
 #include "xnest-xcb.h"
 
 #include "Display.h"

hw/xnest/Xnest.h

@@ -1,95 +0,0 @@
-/*
-
-Copyright (c) 1995  X Consortium
-
-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 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 X CONSORTIUM 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.
-
-Except as contained in this notice, the name of the X Consortium shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from the X Consortium.
-
-*/
-#ifndef _XORG_XNEST_H
-#define _XORG_XNEST_H
-
-/*
-** Machines with a 64 bit library interface and a 32 bit server require
-** name changes to protect the guilty.
-*/
-#ifdef _XSERVER64
-#define _XSERVER64_tmp
-#undef _XSERVER64
-typedef unsigned long XID64;
-typedef unsigned long Mask64;
-typedef unsigned long Atom64;
-typedef unsigned long VisualID64;
-typedef unsigned long Time64;
-
-#define XID     XID64
-#define Mask    Mask64
-#define Atom    Atom64
-#define VisualID VisualID64
-#define Time    Time64
-typedef XID Window64;
-typedef XID Drawable64;
-typedef XID Font64;
-typedef XID Pixmap64;
-typedef XID Cursor64;
-typedef XID Colormap64;
-typedef XID GContext64;
-typedef XID KeySym64;
-
-#define Window          Window64
-#define Drawable        Drawable64
-#define Font            Font64
-#define Pixmap          Pixmap64
-#define Cursor          Cursor64
-#define Colormap        Colormap64
-#define GContext        GContext64
-#define KeySym          KeySym64
-#endif  /*_XSERVER64*/
-
-#define GC XlibGC
-#include <X11/Xlib.h>
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
-#include <X11/Xlib-xcb.h>
-#undef GC
-
-#ifdef _XSERVER64_tmp
-#define _XSERVER64
-#undef _XSERVER64_tmp
-#undef XID
-#undef Mask
-#undef Atom
-#undef VisualID
-#undef Time
-#undef Window
-#undef Drawable
-#undef Font
-#undef Pixmap
-#undef Cursor
-#undef Colormap
-#undef GContext
-#undef KeySym
-#endif /*_XSERVER64_tmp*/
-
-#endif /* _XORG_XNEST_H */

hw/xnest/meson.build

@@ -20,7 +20,6 @@ srcs = [
     'xkb.c',
 ]
 
-x11_xcb_dep = dependency('x11-xcb', required: true)
 xcb_dep = dependency('xcb', required: true)
 xcb_aux_dep = dependency('xcb-aux', required: true)
 xcb_shape_dep = dependency('xcb-shape', required: true)
@@ -33,13 +32,11 @@ executable(
     include_directories: inc,
     dependencies: [
         common_dep,
-        xnest_dep,
         xcb_dep,
         xcb_aux_dep,
         xcb_shape_dep,
         xcb_icccm_dep,
         xcb_xkb_dep,
-        x11_xcb_dep,
     ],
     link_with: [
         libxserver_main,

hw/xnest/xcb.c

@@ -16,7 +16,6 @@
 #include "include/gc.h"
 #include "include/servermd.h"
 
-#include "Xnest.h"
 #include "xnest-xcb.h"
 #include "xnest-xkb.h"
 #include "XNGC.h"

meson.build

@@ -245,20 +245,6 @@ endif
 
 ## configure Xnest - nesting X server
 build_xnest = get_option('xnest') != 'false'
-xnest_required = get_option('xnest') == 'true'
-xnest_dep = [
-    dependency('xext', version: xext_req, required: xnest_required),
-    dependency('x11', required: xnest_required),
-    dependency('xau', required: xnest_required),
-]
-if get_option('xnest') == 'auto'
-    # check for all the deps being found, to handle 'auto' mode.
-    foreach d: xnest_dep
-        if not d.found()
-            build_xnest = false
-        endif
-    endforeach
-endif
 
 build_xwin = false
 if get_option('xwin') == 'auto'