dix: move ColormapRec declaration out of public header

Not used by any external module/driver, so no need to keep it in
public header.

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

Xext/saver.c

@@ -50,7 +50,6 @@ in this Software without prior written authorization from the X Consortium.
 #include "resource.h"
 #include "gcstruct.h"
 #include "cursorstr.h"
-#include "colormapst.h"
 #include "xace.h"
 #include "inputstr.h"
 #ifdef XINERAMA

composite/compinit.c

@@ -43,9 +43,9 @@
 
 #include <dix-config.h>
 
+#include "dix/colormap_priv.h"
 #include "dix/dix_priv.h"
 #include "dix/screen_hooks_priv.h"
-#include "include/colormapst.h"
 #include "os/osdep.h"
 
 #include "compint.h"

dix/colormap.c

@@ -61,7 +61,6 @@ SOFTWARE.
 #include "misc.h"
 #include "dix.h"
 #include "dixstruct.h"
-#include "colormapst.h"
 #include "os.h"
 #include "scrnintstr.h"
 #include "resource.h"

dix/colormap_priv.h

@@ -10,6 +10,7 @@
 
 #include "dix/screenint_priv.h"
 #include "include/colormap.h"
+#include "include/colormapst.h"
 #include "include/dix.h"
 #include "include/window.h"
 
@@ -21,6 +22,32 @@
 
 typedef struct _CMEntry *EntryPtr;
 
+/* 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 */
+
+typedef struct _ColormapRec {
+    VisualPtr pVisual;
+    short class;                /* PseudoColor or DirectColor */
+    XID mid;                    /* client's name for colormap */
+    ScreenPtr pScreen;          /* screen map is associated with */
+    short flags;                /* 1 = CM_IsDefault
+                                 * 2 = CM_AllAllocated */
+    int freeRed;
+    int freeGreen;
+    int freeBlue;
+    int *numPixelsRed;
+    int *numPixelsGreen;
+    int *numPixelsBlue;
+    Pixel **clientPixelsRed;
+    Pixel **clientPixelsGreen;
+    Pixel **clientPixelsBlue;
+    Entry *red;
+    Entry *green;
+    Entry *blue;
+    PrivateRec *devPrivates;
+} ColormapRec;
+
 int dixCreateColormap(Colormap mid, ScreenPtr pScreen, VisualPtr pVisual,
                       ColormapPtr *ppcmap, int alloc, ClientPtr client);
 

dix/dispatch.c

@@ -123,7 +123,6 @@ Equipment Corporation.
 #include "dixfontstr.h"
 #include "gcstruct.h"
 #include "selection.h"
-#include "colormapst.h"
 #include "cursorstr.h"
 #include "scrnintstr.h"
 #include "servermd.h"

dix/privates.c

@@ -51,12 +51,14 @@ from The Open Group.
 #include <dix-config.h>
 
 #include <stddef.h>
+
+#include "dix/colormap_priv.h"
+
 #include "windowstr.h"
 #include "resource.h"
 #include "privates.h"
 #include "gcstruct.h"
 #include "cursorstr.h"
-#include "colormapst.h"
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "extnsionst.h"

dix/window.c

@@ -121,7 +121,6 @@ Equipment Corporation.
 #include "propertyst.h"
 #include "inputstr.h"
 #include "resource.h"
-#include "colormapst.h"
 #include "cursorstr.h"
 #include "dixstruct.h"
 #include "gcstruct.h"

hw/kdrive/src/kdrive.h

@@ -28,11 +28,13 @@
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/Xos.h>
+
+#include "dix/colormap_priv.h"
+
 #include "scrnintstr.h"
 #include "pixmapstr.h"
 #include "windowstr.h"
 #include "servermd.h"
-#include "colormapst.h"
 #include "gcstruct.h"
 #include "input.h"
 #include "mipointer.h"

hw/vfb/InitOutput.c

@@ -48,7 +48,6 @@ from The Open Group.
 #include "servermd.h"
 #define PSZ 8
 #include "fb.h"
-#include "colormapst.h"
 #include "gcstruct.h"
 #include "input.h"
 #include "mipointer.h"

hw/xfree86/common/xf86DGA.c

@@ -58,7 +58,6 @@
 #include "xf86Priv.h"
 #include "dgaproc.h"
 #include "dgaproc_priv.h"
-#include "colormapst.h"
 #include "pixmapstr.h"
 #include "inputstr.h"
 #include "globals.h"

hw/xfree86/common/xf86VGAarbiter.c

@@ -30,6 +30,8 @@
 
 #include "xorg-config.h"
 
+#include "dix/colormap_priv.h"
+
 #include "xf86VGAarbiter_priv.h"
 #include "xf86VGAarbiterPriv.h"
 #include "xf86Bus.h"

hw/xfree86/common/xf86cmap.c

@@ -40,7 +40,6 @@
 #include "mi/mi_priv.h"
 
 #include "misc.h"
-#include "colormapst.h"
 #include "scrnintstr.h"
 #include "resource.h"
 

hw/xfree86/ramdac/xf86CursorRD.c

@@ -3,13 +3,13 @@
 #include <xorg-config.h>
 #endif
 
+#include "dix/colormap_priv.h"
 #include "dix/cursor_priv.h"
 #include "dix/screen_hooks_priv.h"
 #include "mi/mipointer_priv.h"
 
 #include "xf86.h"
 #include "xf86CursorPriv.h"
-#include "colormapst.h"
 #include "cursorstr.h"
 
 /* FIXME: This was added with the ABI change of the miPointerSpriteFuncs for

hw/xnest/Color.c

@@ -22,7 +22,6 @@ is" without express or implied warranty.
 #include "scrnintstr.h"
 #include "window.h"
 #include "windowstr.h"
-#include "colormapst.h"
 #include "resource.h"
 
 #include "Xnest.h"

hw/xnest/Color.h

@@ -18,6 +18,8 @@ is" without express or implied warranty.
 #include <X11/X.h>
 #include <X11/Xdefs.h>
 
+#include "dix/colormap_priv.h"
+
 #define DUMB_WINDOW_MANAGERS
 
 #define MAXCMAPS 1

hw/xwin/win.h

@@ -144,13 +144,14 @@
 #include <X11/Xos.h>
 #include <X11/Xprotostr.h>
 
+#include "dix/colormap_priv.h"
+
 #include "scrnintstr.h"
 #include "pixmapstr.h"
 #include "pixmap.h"
 #include "region.h"
 #include "gcstruct.h"
 #include "colormap.h"
-#include "colormapst.h"
 #include "miscstruct.h"
 #include "servermd.h"
 #include "windowstr.h"

include/colormapst.h

@@ -47,9 +47,7 @@ SOFTWARE.
 #ifndef CMAPSTRUCT_H
 #define CMAPSTRUCT_H 1
 
-#include "colormap.h"
-#include "screenint.h"
-#include "privates.h"
+#include <X11/Xdefs.h>
 
 /* Shared color -- the color is used by AllocColorPlanes */
 typedef struct {
@@ -82,30 +80,4 @@ typedef struct _CMEntry {
     Bool fShared;
 } Entry;
 
-/* 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 */
-
-typedef struct _ColormapRec {
-    VisualPtr pVisual;
-    short class;                /* PseudoColor or DirectColor */
-    XID mid;                    /* client's name for colormap */
-    ScreenPtr pScreen;          /* screen map is associated with */
-    short flags;                /* 1 = CM_IsDefault
-                                 * 2 = CM_AllAllocated */
-    int freeRed;
-    int freeGreen;
-    int freeBlue;
-    int *numPixelsRed;
-    int *numPixelsGreen;
-    int *numPixelsBlue;
-    Pixel **clientPixelsRed;
-    Pixel **clientPixelsGreen;
-    Pixel **clientPixelsBlue;
-    Entry *red;
-    Entry *green;
-    Entry *blue;
-    PrivateRec *devPrivates;
-} ColormapRec;
-
 #endif                          /* COLORMAP_H */

mi/micmap.c

@@ -38,7 +38,6 @@
 #include "os/osdep.h"
 
 #include "scrnintstr.h"
-#include "colormapst.h"
 #include "resource.h"
 #include "globals.h"
 #include "micmap.h"

mi/misprite.c

@@ -47,7 +47,6 @@ in this Software without prior written authorization from The Open Group.
 #include   "mi.h"
 #include   "cursorstr.h"
 #include   "scrnintstr.h"
-#include   "colormapst.h"
 #include   "windowstr.h"
 #include   "gcstruct.h"
 #include   "mipointer.h"

miext/rootless/rootlessCommon.c

@@ -34,8 +34,9 @@
 #include <stddef.h>             /* For NULL */
 #include <limits.h>             /* For CHAR_BIT */
 
+#include "dix/colormap_priv.h"
+
 #include "rootlessCommon.h"
-#include "colormapst.h"
 
 unsigned int rootless_CopyBytes_threshold = 0;
 unsigned int rootless_CopyWindow_threshold = 0;

miext/rootless/rootlessScreen.c

@@ -47,7 +47,6 @@
 #include "propertyst.h"
 #include "mivalidate.h"
 #include "picturestr.h"
-#include "colormapst.h"
 
 #include "rootlessCommon.h"
 #include "rootlessWindow.h"

render/miindex.c

@@ -32,7 +32,6 @@
 #include "mi.h"
 #include "picturestr.h"
 #include "mipict.h"
-#include "colormapst.h"
 
 #define NUM_CUBE_LEVELS	4
 #define NUM_GRAY_LEVELS	13

render/picture.c

@@ -36,7 +36,6 @@
 #include "windowstr.h"
 #include "input.h"
 #include "resource.h"
-#include "colormapst.h"
 #include "cursorstr.h"
 #include "dixstruct.h"
 #include "gcstruct.h"

render/render.c

@@ -31,6 +31,7 @@
 #include <X11/extensions/renderproto.h>
 #include <X11/Xfuncproto.h>
 
+#include "dix/colormap_priv.h"
 #include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
 #include "os/osdep.h"
@@ -42,7 +43,6 @@
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "pixmapstr.h"
-#include "colormapst.h"
 #include "extnsionst.h"
 #include "extinit_priv.h"
 #include "servermd.h"