From 50a33794069fd22e615f6208cd4c82a64452b485 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Sat, 4 Nov 2017 23:51:30 +0100
Subject: Lift dix to xorg-xserver-7.1/1.1.0 state

---
 nx-X11/programs/Xserver/include/colormapst.h | 19 ++++++++++++++++---
 nx-X11/programs/Xserver/include/pixmapstr.h  | 13 ++++++++++++-
 nx-X11/programs/Xserver/include/window.h     |  7 +++++++
 3 files changed, 35 insertions(+), 4 deletions(-)

(limited to 'nx-X11/programs/Xserver/include')

diff --git a/nx-X11/programs/Xserver/include/colormapst.h b/nx-X11/programs/Xserver/include/colormapst.h
index a8fa055de..d26987581 100644
--- a/nx-X11/programs/Xserver/include/colormapst.h
+++ b/nx-X11/programs/Xserver/include/colormapst.h
@@ -48,6 +48,8 @@ SOFTWARE.
 #ifndef CMAPSTRUCT_H
 #define CMAPSTRUCT_H 1
 
+#include <nx-X11/Xarch.h>
+
 #include "colormap.h"
 #include "screenint.h"
 
@@ -88,15 +90,26 @@ typedef struct _CMEntry
     Bool	fShared;
 } Entry;
 
-/* COLORMAPs can be used for either Direct or Pseudo color.  PseudoColor
+/*
+ * COLORMAPs can be used for either Direct or Pseudo color.  PseudoColor
  * only needs one cell table, we arbitrarily pick red.  We keep track
- * of that table with freeRed, numPixelsRed, and clientPixelsRed */
+ * of that table with freeRed, numPixelsRed, and clientPixelsRed
+ *
+ * The padN variables are unfortunate ABI BC. See fdo bug #6924.
+ */
 
 typedef struct _ColormapRec
 {
     VisualPtr	pVisual;
     short	class;		/* PseudoColor or DirectColor */
-    long	mid;		/* client's name for colormap */
+#if defined(_XSERVER64)
+    short	pad0;
+    XID		pad1;
+#endif
+    XID		mid;		/* client's name for colormap */
+#if defined(_XSERVER64) && (X_BYTE_ORDER == X_LITTLE_ENDIAN)
+    XID		pad2;
+#endif
     ScreenPtr	pScreen;	/* screen map is associated with */
     short	flags;		/* 1 = IsDefault
 				 * 2 = AllAllocated */
diff --git a/nx-X11/programs/Xserver/include/pixmapstr.h b/nx-X11/programs/Xserver/include/pixmapstr.h
index 5d38c1c3b..d7f934a34 100644
--- a/nx-X11/programs/Xserver/include/pixmapstr.h
+++ b/nx-X11/programs/Xserver/include/pixmapstr.h
@@ -47,16 +47,27 @@ SOFTWARE.
 
 #ifndef PIXMAPSTRUCT_H
 #define PIXMAPSTRUCT_H
+#include <nx-X11/Xarch.h>
 #include "pixmap.h"
 #include "screenint.h"
 #include "regionstr.h"
 
+/*
+ * The padN members are unfortunate ABI BC.  See fdo bug #6924.
+ */
+
 typedef struct _Drawable {
     unsigned char	type;	/* DRAWABLE_<type> */
     unsigned char	class;	/* specific to type */
     unsigned char	depth;
     unsigned char	bitsPerPixel;
-    unsigned long	id;	/* resource id */
+#if defined(_XSERVER64)
+    XID			pad0;
+#endif
+    XID			id;	/* resource id */
+#if defined(_XSERVER64)
+    XID			pad1;
+#endif
     short		x;	/* window: screen absolute, pixmap: 0 */
     short		y;	/* window: screen absolute, pixmap: 0 */
     unsigned short	width;
diff --git a/nx-X11/programs/Xserver/include/window.h b/nx-X11/programs/Xserver/include/window.h
index a8c78f569..6e93e8ff8 100644
--- a/nx-X11/programs/Xserver/include/window.h
+++ b/nx-X11/programs/Xserver/include/window.h
@@ -264,4 +264,11 @@ extern RegionPtr CreateBoundingShape(
 extern RegionPtr CreateClipShape(
     WindowPtr /* pWin */ );
 
+extern void DisableMapUnmapEvents(
+    WindowPtr /* pWin */ );
+extern void EnableMapUnmapEvents(
+    WindowPtr /* pWin */ );
+extern Bool MapUnmapEventsEnabled(
+    WindowPtr /* pWin */ );
+
 #endif /* WINDOW_H */
-- 
cgit v1.2.3