frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-08-19 17:40:56 +02:00
parent 9969258e44
commit 5913906151
16 changed files with 1 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/xnest/Cursor.c
View File

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

2
hw/xnest/Display.h
View File

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

1
hw/xnest/Events.c
View File

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

1
hw/xnest/Font.c
View File

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

1
hw/xnest/GC.c
View File

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

2
hw/xnest/Handlers.c
View File

@ -22,8 +22,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"

2
hw/xnest/Init.c
View File

@ -34,9 +34,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"

6
hw/xnest/Keyboard.c
View File

@ -21,6 +21,7 @@ is" without express or implied warranty.
#include <X11/Xdefs.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
#include <X11/extensions/XKB.h>
#include <xcb/xkb.h>
#include "screenint.h"
@ -29,7 +30,6 @@ is" without express or implied warranty.
#include "scrnintstr.h"
#include "servermd.h"
#include "Xnest.h"
#include "xnest-xcb.h"
#include "Display.h"
@ -37,10 +37,6 @@ is" without express or implied warranty.
#include "Keyboard.h"
#include "Args.h"
#include "Events.h"
// must come after Xnest.h, because of trickery to avoid name clash
#include <X11/extensions/XKB.h>
#include "xkbsrv.h"
DeviceIntPtr xnestKeyboardDevice = NULL;

1
hw/xnest/Pixmap.c
View File

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

1
hw/xnest/Pointer.c
View File

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

1
hw/xnest/Screen.c
View File

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

1
hw/xnest/Window.c
View File

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

93
hw/xnest/Xnest.h
View File

@ -1,93 +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*/
#include <X11/Xlib.h>
#include <X11/Xlibint.h>
#include <X11/Xutil.h>
#include <X11/Xlib-xcb.h>
#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 */

3
hw/xnest/meson.build
View File

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

1
hw/xnest/xcb.c
View File

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

14
meson.build
View File

@ -248,20 +248,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'