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

Xnest: drop special hack for Xlib's GC type 

Now that the name clash on GC type between Xserver and xlib has been fixed,
there's no need to do the special renaming hack anymore.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-07-29 13:09:27 +02:00
parent 46eeeec810
commit bef80a0db9
4 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xnest/Display.c
View File

@ -52,7 +52,7 @@ Pixel xnestWhitePixel;
Drawable xnestDefaultDrawables[MAXDEPTH + 1]; Drawable xnestDefaultDrawables[MAXDEPTH + 1];
Pixmap xnestIconBitmap; Pixmap xnestIconBitmap;
Pixmap xnestScreenSaverPixmap; Pixmap xnestScreenSaverPixmap;
XlibGC xnestBitmapGC; GC xnestBitmapGC;
unsigned long xnestEventMask; unsigned long xnestEventMask;
static int _X_NORETURN static int _X_NORETURN

2
hw/xnest/Display.h
View File

@ -37,7 +37,7 @@ extern Pixel xnestWhitePixel;
extern Drawable xnestDefaultDrawables[MAXDEPTH + 1]; extern Drawable xnestDefaultDrawables[MAXDEPTH + 1];
extern Pixmap xnestIconBitmap; extern Pixmap xnestIconBitmap;
extern Pixmap xnestScreenSaverPixmap; extern Pixmap xnestScreenSaverPixmap;
extern XlibGC xnestBitmapGC; extern GC xnestBitmapGC;
extern unsigned long xnestEventMask; extern unsigned long xnestEventMask;
void xnestOpenDisplay(int argc, char *argv[]); void xnestOpenDisplay(int argc, char *argv[]);

4
hw/xnest/XNGC.h
View File

@ -20,10 +20,8 @@ is" without express or implied warranty.
#include "include/gcstruct.h" #include "include/gcstruct.h"
#include "include/privates.h" #include "include/privates.h"
/* This file uses the GC definition form Xlib.h as XlibGC. */
typedef struct { typedef struct {
XlibGC gc; GC gc;
} xnestPrivGC; } xnestPrivGC;
extern DevPrivateKeyRec xnestGCPrivateKeyRec; extern DevPrivateKeyRec xnestGCPrivateKeyRec;

2
hw/xnest/Xnest.h
View File

@ -67,11 +67,9 @@ typedef XID KeySym64;
#define KeySym KeySym64 #define KeySym KeySym64
#endif /*_XSERVER64*/ #endif /*_XSERVER64*/
#define GC XlibGC
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <X11/extensions/shape.h> #include <X11/extensions/shape.h>
#undef GC
#ifdef _XSERVER64_tmp #ifdef _XSERVER64_tmp
#define _XSERVER64 #define _XSERVER64