[PATCH] fbcmap.c -> xf86 DDX

[Enrico Weigelt]

Hi folks,

this patch puts the appropriate code parts (w/o the conditionals) of 
fb/fbcmap.c to hw/xfree86/fbcmap.c, so we got it where it belongs.

With the other DDX'es we should do the same ...

cu
-- 
---------------------------------------------------------------------
 Enrico Weigelt    ==   metux IT service - http://www.metux.de/
---------------------------------------------------------------------
 Please visit the OpenSource QM Taskforce:
 	http://wiki.metux.de/public/OpenSource_QM_Taskforce
 Patches / Fixes for a lot dozens of packages in dozens of versions:
	http://patches.metux.de/
---------------------------------------------------------------------
-------------- next part --------------
diff -ruN xorg-server-1.0.99.902.orig/hw/xfree86/Makefile.am xorg-server-1.0.99.902/hw/xfree86/Makefile.am
--- xorg-server-1.0.99.902.orig/hw/xfree86/Makefile.am	Thu Jun  1 11:09:47 2006
+++ xorg-server-1.0.99.902/hw/xfree86/Makefile.am	Thu Jun  1 11:09:42 2006
@@ -19,7 +19,8 @@
 AM_CFLAGS = @XORG_CFLAGS@ @SERVER_DEFINES@ @LOADER_DEFINES@
 INCLUDES = @XORG_INCS@ 
 
-Xorg_SOURCES = xorg.c
+# we maybe have to look for a better place for fbcmap.c 
+Xorg_SOURCES = xorg.c fbcmap.c
 
 DISTCLEANFILES = xorg.c
 
diff -ruN xorg-server-1.0.99.902.orig/hw/xfree86/fbcmap.c xorg-server-1.0.99.902/hw/xfree86/fbcmap.c
--- xorg-server-1.0.99.902.orig/hw/xfree86/fbcmap.c	Thu Jan  1 01:00:00 1970
+++ xorg-server-1.0.99.902/hw/xfree86/fbcmap.c	Thu Jun  1 03:21:41 2006
@@ -0,0 +1,124 @@
+/* $XConsortium: fbcmap.c,v 4.19 94/04/17 20:28:46 dpw Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbcmap.c,v 1.5 2000/09/20 00:09:13 keithp Exp $ */
+/************************************************************
+Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
+
+                    All Rights Reserved
+
+Permission  to  use,  copy,  modify,  and  distribute   this
+software  and  its documentation for any purpose and without
+fee is hereby granted, provided that the above copyright no-
+tice  appear  in all copies and that both that copyright no-
+tice and this permission notice appear in  supporting  docu-
+mentation,  and  that the names of Sun or X Consortium
+not be used in advertising or publicity pertaining to 
+distribution  of  the software  without specific prior 
+written permission. Sun and X Consortium make no 
+representations about the suitability of this software for 
+any purpose. It is provided "as is" without any express or 
+implied warranty.
+
+SUN DISCLAIMS ALL WARRANTIES WITH REGARD TO  THIS  SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FIT-
+NESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SUN BE  LI-
+ABLE  FOR  ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,  DATA  OR
+PROFITS,  WHETHER  IN  AN  ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
+THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include "scrnintstr.h"
+#include "colormapst.h"
+#include "resource.h"
+#include "fb.h"
+
+#include "micmap.h"
+
+int
+fbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps)
+{
+    return miListInstalledColormaps(pScreen, pmaps);
+}
+
+void
+fbInstallColormap(ColormapPtr pmap)
+{
+    miInstallColormap(pmap);
+}
+
+void
+fbUninstallColormap(ColormapPtr pmap)
+{
+    miUninstallColormap(pmap);
+}
+
+void
+fbResolveColor(unsigned short   *pred,
+	       unsigned short   *pgreen,
+	       unsigned short   *pblue,
+	       VisualPtr	pVisual)
+{
+    miResolveColor(pred, pgreen, pblue, pVisual);
+}
+
+Bool
+fbInitializeColormap(ColormapPtr pmap)
+{
+    return miInitializeColormap(pmap);
+}
+
+int
+fbExpandDirectColors (ColormapPtr   pmap,
+		      int	    ndef,
+		      xColorItem    *indefs,
+		      xColorItem    *outdefs)
+{
+    return miExpandDirectColors(pmap, ndef, indefs, outdefs);
+}
+
+Bool
+fbCreateDefColormap(ScreenPtr pScreen)
+{
+    return miCreateDefColormap(pScreen);
+}
+
+void
+fbClearVisualTypes(void)
+{
+    miClearVisualTypes();
+}
+
+Bool
+fbSetVisualTypes (int depth, int visuals, int bitsPerRGB)
+{
+    return miSetVisualTypes(depth, visuals, bitsPerRGB, -1);
+}
+
+/*
+ * Given a list of formats for a screen, create a list
+ * of visuals and depths for the screen which coorespond to
+ * the set which can be used with this version of fb.
+ */
+
+Bool
+fbInitVisuals (VisualPtr    *visualp, 
+	       DepthPtr	    *depthp,
+	       int	    *nvisualp,
+	       int	    *ndepthp,
+	       int	    *rootDepthp,
+	       VisualID	    *defaultVisp,
+	       unsigned long	sizes,
+	       int	    bitsPerRGB)
+{
+    return miInitVisuals(visualp, depthp, nvisualp, ndepthp, rootDepthp,
+			 defaultVisp, sizes, bitsPerRGB, -1);
+}
diff -ruN xorg-server-1.0.99.902.orig/hw/xfree86/dixmods/Makefile.am xorg-server-1.0.99.902.orig.1/hw/xfree86/dixmods/Makefile.am
--- xorg-server-1.0.99.902.orig/hw/xfree86/dixmods/Makefile.am	Thu Jun  1 02:24:24 2006
+++ xorg-server-1.0.99.902.orig.1/hw/xfree86/dixmods/Makefile.am	Thu Jun  1 12:17:45 2006
@@ -72,9 +72,13 @@
 libdbe_la_LIBADD = $(top_builddir)/dbe/libdbe.la
 libdbe_la_SOURCES = dbemodule.c
 
+## we moved fbcmap.c directly to the Xorg top. this has two reasons:
+## 1. put DDX stuff to the DDX, away from DIX, elimitate more #ifdefs
+## 2. the fbcmap functions are used by multiple exts/mods.
+##    (maybe we should move it out into a new module)
 libfb_la_LDFLAGS = -avoid-version
 libfb_la_LIBADD = $(top_builddir)/fb/libfb.la
-libfb_la_SOURCES = $(top_builddir)/fb/fbcmap.c fbmodule.c
+libfb_la_SOURCES = fbmodule.c
 
 libglx_la_LDFLAGS = -avoid-version
 if AIGLX