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

Xnest: drop hackish Xnest.h 

Now that Xserver's GC struct has been renamed not to conflict with Xlib
anymore, we can drop the ridiculous include hacks and drop Xnest.h

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-02-16 17:07:45 +01:00
parent 467136b424
commit 6e35c1c8d3
19 changed files with 8 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xnest/Args.c
View File

@ -27,8 +27,6 @@ is" without express or implied warranty.
#include "servermd.h"
#include "extinit.h"
#include "Xnest.h"
#include "Display.h"
#include "Args.h"

2
hw/xnest/Color.c
View File

@ -25,8 +25,6 @@ is" without express or implied warranty.
#include "colormapst.h"
#include "resource.h"
#include "Xnest.h"
#include "Display.h"
#include "Screen.h"
#include "Color.h"

2
hw/xnest/Cursor.c
View File

@ -25,8 +25,6 @@ is" without express or implied warranty.
#include "servermd.h"
#include "mipointrst.h"
#include "Xnest.h"
#include "Display.h"
#include "Screen.h"
#include "XNCursor.h"

4
hw/xnest/Display.c
View File

@ -28,8 +28,6 @@ is" without express or implied warranty.
#include "scrnintstr.h"
#include "servermd.h"
#include "Xnest.h"
#include "Display.h"
#include "Init.h"
#include "Args.h"
@ -52,7 +50,7 @@ Pixel xnestWhitePixel;
Drawable xnestDefaultDrawables[MAXDEPTH + 1];
Pixmap xnestIconBitmap;
Pixmap xnestScreenSaverPixmap;
XlibGC xnestBitmapGC;
GC xnestBitmapGC;
unsigned long xnestEventMask;
static int _X_NORETURN

5
hw/xnest/Display.h
View File

@ -15,6 +15,9 @@ is" without express or implied warranty.
#ifndef XNESTCOMMON_H
#define XNESTCOMMON_H
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include "colormap.h"
#define UNDEFINED -1
@ -37,7 +40,7 @@ extern Pixel xnestWhitePixel;
extern Drawable xnestDefaultDrawables[MAXDEPTH + 1];
extern Pixmap xnestIconBitmap;
extern Pixmap xnestScreenSaverPixmap;
extern XlibGC xnestBitmapGC;
extern GC xnestBitmapGC;
extern unsigned long xnestEventMask;
void xnestOpenDisplay(int argc, char *argv[]);

2
hw/xnest/Events.c
View File

@ -29,8 +29,6 @@ is" without express or implied warranty.
#include "inputstr.h"
#include "inpututils.h"
#include "Xnest.h"
#include "Args.h"
#include "Color.h"
#include "Display.h"

2
hw/xnest/Font.c
View File

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

2
hw/xnest/GC.c
View File

@ -25,8 +25,6 @@ is" without express or implied warranty.
#include "mistruct.h"
#include "region.h"
#include "Xnest.h"
#include "Display.h"
#include "XNGC.h"
#include "GCOps.h"

2
hw/xnest/GCOps.c
View File

@ -26,8 +26,6 @@ is" without express or implied warranty.
#include "region.h"
#include "servermd.h"
#include "Xnest.h"
#include "Display.h"
#include "Screen.h"
#include "XNGC.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"

1
hw/xnest/Init.c
View File

@ -33,7 +33,6 @@ is" without express or implied warranty.
#include "servermd.h"
#include "dixfontstr.h"
#include "extinit_priv.h"
#include "Xnest.h"
#include "Display.h"
#include "Screen.h"

2
hw/xnest/Keyboard.c
View File

@ -28,8 +28,6 @@ is" without express or implied warranty.
#include "scrnintstr.h"
#include "servermd.h"
#include "Xnest.h"
#include "Display.h"
#include "Screen.h"
#include "Keyboard.h"

2
hw/xnest/Pixmap.c
View File

@ -25,8 +25,6 @@ is" without express or implied warranty.
#include "privates.h"
#include "mi.h"
#include "Xnest.h"
#include "Display.h"
#include "Screen.h"
#include "XNPixmap.h"

2
hw/xnest/Pointer.c
View File

@ -23,8 +23,6 @@ is" without express or implied warranty.
#include "servermd.h"
#include "mipointer.h"
#include "Xnest.h"
#include "Display.h"
#include "Screen.h"
#include "Pointer.h"

2
hw/xnest/Screen.c
View File

@ -26,8 +26,6 @@ is" without express or implied warranty.
#include "colormapst.h"
#include "resource.h"
#include "Xnest.h"
#include "Display.h"
#include "Screen.h"
#include "XNGC.h"

2
hw/xnest/Visual.c
View File

@ -15,10 +15,10 @@ is" without express or implied warranty.
#include <X11/X.h>
#include <X11/Xproto.h>
#include "scrnintstr.h"
#include "dix.h"
#include "mi.h"
#include "Xnest.h"
#include "Display.h"
#include "Visual.h"

3
hw/xnest/Window.c
View File

@ -16,6 +16,7 @@ is" without express or implied warranty.
#include <X11/X.h>
#include <X11/Xdefs.h>
#include <X11/Xproto.h>
#include <X11/extensions/shape.h>
#include "mi/mi_priv.h"
@ -27,8 +28,6 @@ is" without express or implied warranty.
#include "scrnintstr.h"
#include "region.h"
#include "Xnest.h"
#include "Display.h"
#include "Screen.h"
#include "XNGC.h"

2
hw/xnest/XNGC.h
View File

@ -23,7 +23,7 @@ is" without express or implied warranty.
/* This file uses the GC definition form Xlib.h as XlibGC. */
typedef struct {
XlibGC gc;
GC gc;
} xnestPrivGC;
extern DevPrivateKeyRec xnestGCPrivateKeyRec;

39
hw/xnest/Xnest.h
View File

@ -1,39 +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
#define GC XlibGC
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/extensions/shape.h>
#undef GC
#endif /* _XORG_XNEST_H */