Checked in the following released items:

xkeyboard-config-1.4.tar.gz
ttf-bitstream-vera-1.10.tar.gz
font-alias-1.0.1.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sony-misc-1.0.0.tar.gz
font-schumacher-misc-1.0.0.tar.gz
font-mutt-misc-1.0.0.tar.gz
font-misc-misc-1.0.0.tar.gz
font-misc-meltho-1.0.0.tar.gz
font-micro-misc-1.0.0.tar.gz
font-jis-misc-1.0.0.tar.gz
font-isas-misc-1.0.0.tar.gz
font-dec-misc-1.0.0.tar.gz
font-daewoo-misc-1.0.0.tar.gz
font-cursor-misc-1.0.0.tar.gz
font-arabic-misc-1.0.0.tar.gz
font-winitzki-cyrillic-1.0.0.tar.gz
font-misc-cyrillic-1.0.0.tar.gz
font-cronyx-cyrillic-1.0.0.tar.gz
font-screen-cyrillic-1.0.1.tar.gz
font-xfree86-type1-1.0.1.tar.gz
font-adobe-utopia-type1-1.0.1.tar.gz
font-ibm-type1-1.0.0.tar.gz
font-bitstream-type1-1.0.0.tar.gz
font-bitstream-speedo-1.0.0.tar.gz
font-bh-ttf-1.0.0.tar.gz
font-bh-type1-1.0.0.tar.gz
font-bitstream-100dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-100dpi-1.0.0.tar.gz
font-bh-100dpi-1.0.0.tar.gz
font-adobe-utopia-100dpi-1.0.1.tar.gz
font-adobe-100dpi-1.0.0.tar.gz
font-util-1.0.1.tar.gz
font-bitstream-75dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-75dpi-1.0.0.tar.gz
font-adobe-utopia-75dpi-1.0.1.tar.gz
font-bh-75dpi-1.0.0.tar.gz
bdftopcf-1.0.1.tar.gz
font-adobe-75dpi-1.0.0.tar.gz
mkfontscale-1.0.6.tar.gz
openssl-0.9.8k.tar.gz
bigreqsproto-1.0.2.tar.gz
xtrans-1.2.2.tar.gz
resourceproto-1.0.2.tar.gz
inputproto-1.4.4.tar.gz
compositeproto-0.4.tar.gz
damageproto-1.1.0.tar.gz
zlib-1.2.3.tar.gz
xkbcomp-1.0.5.tar.gz
freetype-2.3.9.tar.gz
pthreads-w32-2-8-0-release.tar.gz
pixman-0.12.0.tar.gz
kbproto-1.0.3.tar.gz
evieext-1.0.2.tar.gz
fixesproto-4.0.tar.gz
recordproto-1.13.2.tar.gz
randrproto-1.2.2.tar.gz
scrnsaverproto-1.1.0.tar.gz
renderproto-0.9.3.tar.gz
xcmiscproto-1.1.2.tar.gz
fontsproto-2.0.2.tar.gz
xextproto-7.0.3.tar.gz
xproto-7.0.14.tar.gz
libXdmcp-1.0.2.tar.gz
libxkbfile-1.0.5.tar.gz
libfontenc-1.0.4.tar.gz
libXfont-1.3.4.tar.gz
libX11-1.1.5.tar.gz
libXau-1.0.4.tar.gz
libxcb-1.1.tar.gz
xorg-server-1.5.3.tar.gz

1 files changed, 336 insertions, 0 deletions

diff --git a/xorg-server/hw/xgl/xglinit.c b/xorg-server/hw/xgl/xglinit.c
new file mode 100644
index 000000000..e0c9e7ded
--- /dev/null
+++ b/xorg-server/hw/xgl/xglinit.c
@@ -0,0 +1,336 @@
+/*
+ * Copyright © 2005 Novell, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Novell, Inc. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Novell, Inc. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL NOVELL, INC. BE LIABLE 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.
+ *
+ * Author: David Reveman <davidr@novell.com>
+ */
+
+#include "xgl.h"
+#include "xglglx.h"
+#include "micmap.h"
+#include "mipointer.h"
+#include "fb.h"
+
+#ifdef XGL_MODULAR
+#include <dlfcn.h>
+#endif
+
+#define DEFAULT_DDX_MODULE_NAME "xglx"
+
+static char *ddxModuleName = DEFAULT_DDX_MODULE_NAME;
+
+xglScreenInfoRec xglScreenInfo = {
+    NULL, 0, 0, 0, 0, 0,
+    DEFAULT_GEOMETRY_DATA_TYPE,
+    DEFAULT_GEOMETRY_USAGE,
+    FALSE,
+    XGL_DEFAULT_PBO_MASK,
+    FALSE,
+    {
+	{ FALSE, FALSE, { 0, 0, 0, 0 } },
+	{ FALSE, FALSE, { 0, 0, 0, 0 } },
+	{ FALSE, FALSE, { 0, 0, 0, 0 } },
+	{ FALSE, FALSE, { 0, 0, 0, 0 } }
+    }
+};
+
+#ifdef GLXEXT
+static Bool loadGlx = TRUE;
+
+#ifndef NGLXEXTLOG
+static char *glxExtLogFile = 0;
+#endif
+
+#endif
+
+typedef struct _xglDDXFunc {
+    void (*initOutput)	       (ScreenInfo   *pScreenInfo,
+				int	     argc,
+				char	     **argv);
+    void (*initInput)	       (int	     argc,
+				char	     **argv);
+    Bool (*legalModifier)      (unsigned int key,
+				DevicePtr    pDev);
+    void (*processInputEvents) (void);
+    void (*useMsg)	       (void);
+    int  (*processArgument)    (int	     argc,
+				char	     **argv,
+				int	     i);
+    void (*abort)	       (void);
+    void (*giveUp)	       (void);
+    void (*osVendorInit)       (void);
+} xglDDXFuncRec;
+
+static xglDDXFuncRec __ddxFunc;
+
+#define SYMFUNC(name) ((void *) (name))
+#define SYMVAR(name)  ((void *) &(name))
+
+/*
+ * The following table is used to make sure that all symbols required by
+ * dynamically loaded modules are present in the main program. Add more symbols
+ * as needed.
+ */
+
+void *symTab[] = {
+    SYMFUNC (xglKbdCtrl),
+    SYMFUNC (xglSetPixmapFormats),
+    SYMVAR  (xglVisuals),
+
+    SYMFUNC (mieqEnqueue),
+    SYMFUNC (mieqInit),
+    SYMFUNC (mieqProcessInputEvents),
+    SYMFUNC (miPointerAbsoluteCursor),
+    SYMFUNC (miRegisterPointerDevice),
+    SYMFUNC (miPointerWarpCursor),
+    SYMFUNC (miDCInitialize),
+    SYMFUNC (miPointerAbsoluteCursor),
+    SYMFUNC (miPointerUpdate),
+    SYMFUNC (miRegisterRedirectBorderClipProc)
+};
+
+#define SYM(ptr, name) { (void **) &(ptr), (name) }
+
+static Bool
+xglEnsureDDXModule (void)
+{
+
+#ifdef XGL_MODULAR
+    static void *ddxHandle = 0;
+    static Bool status = TRUE;
+
+    if (!status)
+	return FALSE;
+
+#ifdef GLXEXT
+    /* GLX and GLcore modules must be loaded with RTLD_NOW and RTLD_LOCAL
+       flags before DDX module which is linked to libGL and should be
+       loaded with RTLD_GLOBAL. */
+    if (loadGlx)
+    {
+	if (!xglLoadGLXModules ())
+	    FatalError ("No GLX modules loaded");
+
+#ifndef NGLXEXTLOG
+	if (glxExtLogFile)
+	{
+	    __xglGLXLogFp = fopen (glxExtLogFile, "w");
+	    if (!__xglGLXLogFp)
+		perror ("InitOutput");
+	}
+	else
+	    __xglGLXLogFp = 0;
+#endif
+
+    }
+#endif
+
+    if (!ddxHandle)
+    {
+	xglSymbolRec sym[] = {
+	    SYM (__ddxFunc.initOutput,	       "InitOutput"),
+	    SYM (__ddxFunc.initInput,	       "InitInput"),
+	    SYM (__ddxFunc.legalModifier,      "LegalModifier"),
+	    SYM (__ddxFunc.processInputEvents, "ProcessInputEvents"),
+	    SYM (__ddxFunc.useMsg,	       "ddxUseMsg"),
+	    SYM (__ddxFunc.processArgument,    "ddxProcessArgument"),
+	    SYM (__ddxFunc.abort,	       "AbortDDX"),
+	    SYM (__ddxFunc.giveUp,	       "ddxGiveUp"),
+	    SYM (__ddxFunc.osVendorInit,       "OsVendorInit")
+	};
+
+	ddxHandle = xglLoadModule (ddxModuleName, RTLD_NOW | RTLD_GLOBAL);
+	if (!ddxHandle)
+	    return (status = FALSE);
+
+	if (!xglLookupSymbols (ddxHandle, sym, sizeof (sym) / sizeof (sym[0])))
+	{
+	    xglUnloadModule (ddxHandle);
+	    ddxHandle = 0;
+
+	    return (status = FALSE);
+	}
+    }
+
+    return TRUE;
+#else
+    return FALSE;
+#endif
+
+}
+
+void
+InitOutput (ScreenInfo *pScreenInfo,
+	    int	       argc,
+	    char       **argv)
+{
+    (void) symTab;
+
+    if (!xglEnsureDDXModule ())
+	FatalError ("No DDX module loaded");
+
+    (*__ddxFunc.initOutput) (pScreenInfo, argc, argv);
+}
+
+Bool
+LegalModifier (unsigned int key,
+	       DeviceIntPtr    pDev)
+{
+    return (*__ddxFunc.legalModifier) (key, pDev);
+}
+
+void
+ProcessInputEvents (void)
+{
+    (*__ddxFunc.processInputEvents) ();
+}
+
+void
+InitInput (int  argc,
+	   char **argv)
+{
+    if (!xglEnsureDDXModule ())
+	FatalError ("No DDX module loaded");
+
+    (*__ddxFunc.initInput) (argc, argv);
+}
+
+void
+ddxUseMsg (void)
+{
+    ErrorF ("\nXgl usage:\n");
+    ErrorF ("-ddx module            specify ddx module\n");
+
+#ifdef GLXEXT
+    ErrorF ("-noglx                 don't load glx extension\n");
+
+#ifndef NGLXEXTLOG
+    ErrorF ("-glxlog file           glx extension log file\n");
+#endif
+
+#endif
+
+    xglUseMsg ();
+
+    if (xglEnsureDDXModule ())
+	(*__ddxFunc.useMsg) ();
+}
+
+int
+ddxProcessArgument (int  argc,
+		    char **argv,
+		    int  i)
+{
+    static Bool checkDDX = FALSE;
+    int		skip;
+
+    if (!checkDDX)
+    {
+	int j;
+
+	for (j = i; j < argc; j++)
+	{
+	    if (!strcmp (argv[j], "-ddx"))
+	    {
+		if (++j < argc)
+		    ddxModuleName = argv[j];
+	    }
+
+#ifdef GLXEXT
+	    else if (!strcmp (argv[j], "-noglx"))
+	    {
+		loadGlx = FALSE;
+	    }
+
+#ifndef NGLXEXTLOG
+	    else if (!strcmp (argv[j], "-glxlog"))
+	    {
+		if (++j < argc)
+		    glxExtLogFile = argv[j];
+	    }
+#endif
+
+#endif
+
+	}
+	checkDDX = TRUE;
+    }
+
+    if (!strcmp (argv[i], "-ddx"))
+    {
+	if ((i + 1) < argc)
+	    return 2;
+
+	return 1;
+    }
+
+#ifdef GLXEXT
+    else if (!strcmp (argv[i], "-noglx"))
+    {
+	return 1;
+    }
+
+#ifndef NGLXEXTLOG
+    else if (!strcmp (argv[i], "-glxlog"))
+    {
+	if ((i + 1) < argc)
+	    return 2;
+
+	return 1;
+    }
+#endif
+
+#endif
+
+    skip = xglProcessArgument (argc, argv, i);
+    if (skip)
+	return skip;
+
+    if (xglEnsureDDXModule ())
+	return (*__ddxFunc.processArgument) (argc, argv, i);
+
+    return 0;
+}
+
+void
+AbortDDX (void)
+{
+    if (xglEnsureDDXModule ())
+	(*__ddxFunc.abort) ();
+}
+
+void
+ddxGiveUp (void)
+{
+    if (xglEnsureDDXModule ())
+	(*__ddxFunc.giveUp) ();
+}
+
+void
+OsVendorInit (void)
+{
+    if (xglEnsureDDXModule ())
+	(*__ddxFunc.osVendorInit) ();
+}
+
+void ddxInitGlobals()
+{
+}