svn merge ^/branches/released .

4 files changed, 110 insertions, 192 deletions

diff --git a/xorg-server/hw/xfree86/dixmods/extmod/Makefile.am b/xorg-server/hw/xfree86/dixmods/extmod/Makefile.am
index d93e63afa..c0b7ddc02 100644
--- a/xorg-server/hw/xfree86/dixmods/extmod/Makefile.am
+++ b/xorg-server/hw/xfree86/dixmods/extmod/Makefile.am
@@ -1,30 +1,30 @@
-sdk_HEADERS = dgaproc.h
-
-extsmoduledir = $(moduledir)/extensions
-extsmodule_LTLIBRARIES = libextmod.la
-
-if DGA
-DGA_SRCS = xf86dga2.c dgaproc.h xf86dgaext.h
-endif
-
-if XV
-XV_SRCS = xvmod.c xvmodproc.h
-endif
-
-if XF86VIDMODE
-XF86VMODE_SRCS = xf86vmode.c
-endif
-
-AM_CFLAGS = @DIX_CFLAGS@ @XORG_CFLAGS@
-INCLUDES = @XORG_INCS@ \
-           -I$(top_srcdir)/dbe \
-           -I$(top_srcdir)/hw/xfree86/loader \
-           -I$(top_srcdir)/miext/shadow
-
-libextmod_la_LDFLAGS = -avoid-version
-libextmod_la_SOURCES = modinit.c \
-                       modinit.h \
-                       $(DGA_SRCS) \
-                       $(XF86VMODE_SRCS) \
-                       $(XV_SRCS)
-libextmod_la_LIBADD = $(top_builddir)/Xext/libXextmodule.la
+sdk_HEADERS = dgaproc.h

+

+extsmoduledir = $(moduledir)/extensions

+extsmodule_LTLIBRARIES = libextmod.la

+

+if DGA

+DGA_SRCS = xf86dga2.c dgaproc.h

+endif

+

+if XV

+XV_SRCS = xvmod.c xvmodproc.h

+endif

+

+if XF86VIDMODE

+XF86VMODE_SRCS = xf86vmode.c

+endif

+

+AM_CFLAGS = @DIX_CFLAGS@ @XORG_CFLAGS@

+INCLUDES = @XORG_INCS@ \

+           -I$(top_srcdir)/dbe \

+           -I$(top_srcdir)/hw/xfree86/loader \

+           -I$(top_srcdir)/miext/shadow

+

+libextmod_la_LDFLAGS = -avoid-version

+libextmod_la_SOURCES = modinit.c \

+                       modinit.h \

+                       $(DGA_SRCS) \

+                       $(XF86VMODE_SRCS) \

+                       $(XV_SRCS)

+libextmod_la_LIBADD = $(top_builddir)/Xext/libXextmodule.la

diff --git a/xorg-server/hw/xfree86/dixmods/extmod/xf86dga2.c b/xorg-server/hw/xfree86/dixmods/extmod/xf86dga2.c
index 453ade80b..060e5a4d7 100644
--- a/xorg-server/hw/xfree86/dixmods/extmod/xf86dga2.c
+++ b/xorg-server/hw/xfree86/dixmods/extmod/xf86dga2.c
@@ -25,7 +25,6 @@
 #include <X11/extensions/xf86dgaproto.h>

 #include "swaprep.h"

 #include "dgaproc.h"

-#include "xf86dgaext.h"

 #include "protocol-versions.h"

 

 #include <string.h>

@@ -34,24 +33,6 @@
 

 #define DGA_PROTOCOL_OLD_SUPPORT 1

 

-static DISPATCH_PROC(ProcXDGADispatch);

-static DISPATCH_PROC(SProcXDGADispatch);

-static DISPATCH_PROC(ProcXDGAQueryVersion);

-static DISPATCH_PROC(ProcXDGAQueryModes);

-static DISPATCH_PROC(ProcXDGASetMode);

-static DISPATCH_PROC(ProcXDGAOpenFramebuffer);

-static DISPATCH_PROC(ProcXDGACloseFramebuffer);

-static DISPATCH_PROC(ProcXDGASetViewport);

-static DISPATCH_PROC(ProcXDGAInstallColormap);

-static DISPATCH_PROC(ProcXDGASelectInput);

-static DISPATCH_PROC(ProcXDGAFillRectangle);

-static DISPATCH_PROC(ProcXDGACopyArea);

-static DISPATCH_PROC(ProcXDGACopyTransparentArea);

-static DISPATCH_PROC(ProcXDGAGetViewportStatus);

-static DISPATCH_PROC(ProcXDGASync);

-static DISPATCH_PROC(ProcXDGASetClientVersion);

-static DISPATCH_PROC(ProcXDGAChangePixmapMode);

-static DISPATCH_PROC(ProcXDGACreateColormap);

 

 static void XDGAResetProc(ExtensionEntry *extEntry);

 

@@ -85,36 +66,6 @@ typedef struct {
     dixSetPrivate(&(c)->devPrivates, DGAClientPrivateKey, p)

 

 

-void

-XFree86DGAExtensionInit(INITARGS)

-{

-    ExtensionEntry* extEntry;

-

-    if (!dixRegisterPrivateKey(&DGAClientPrivateKeyRec, PRIVATE_CLIENT, 0))

-	return;

-

-    if (!dixRegisterPrivateKey(&DGAScreenPrivateKeyRec, PRIVATE_SCREEN, 0))

-	return;

-

-    if ((extEntry = AddExtension(XF86DGANAME,

-				XF86DGANumberEvents,

-				XF86DGANumberErrors,

-				ProcXDGADispatch,

-				SProcXDGADispatch,

-				XDGAResetProc,

-				StandardMinorOpcode))) {

-	int i;

-

-	DGAReqCode = (unsigned char)extEntry->base;

-	DGAErrorBase = extEntry->errorBase;

-	DGAEventBase = extEntry->eventBase;

-	for (i = KeyPress; i <= MotionNotify; i++)

-	    SetCriticalEvent (DGAEventBase + i);

-    }

-}

-

-

-

 static void

 XDGAResetProc (ExtensionEntry *extEntry)

 {

@@ -663,15 +614,6 @@ ProcXDGACreateColormap(ClientPtr client)
 

 #ifdef DGA_PROTOCOL_OLD_SUPPORT

 

-static DISPATCH_PROC(ProcXF86DGADirectVideo);

-static DISPATCH_PROC(ProcXF86DGAGetVidPage);

-static DISPATCH_PROC(ProcXF86DGAGetVideoLL);

-static DISPATCH_PROC(ProcXF86DGAGetViewPortSize);

-static DISPATCH_PROC(ProcXF86DGASetVidPage);

-static DISPATCH_PROC(ProcXF86DGASetViewPort);

-static DISPATCH_PROC(ProcXF86DGAInstallColormap);

-static DISPATCH_PROC(ProcXF86DGAQueryDirectVideo);

-static DISPATCH_PROC(ProcXF86DGAViewPortChanged);

 

 

 static int

@@ -1063,3 +1005,31 @@ XFree86DGARegister(INITARGS)
 {

   XDGAEventBase = &DGAEventBase;

 }

+

+void

+XFree86DGAExtensionInit(INITARGS)

+{

+    ExtensionEntry* extEntry;

+

+    if (!dixRegisterPrivateKey(&DGAClientPrivateKeyRec, PRIVATE_CLIENT, 0))

+	return;

+

+    if (!dixRegisterPrivateKey(&DGAScreenPrivateKeyRec, PRIVATE_SCREEN, 0))

+	return;

+

+    if ((extEntry = AddExtension(XF86DGANAME,

+				XF86DGANumberEvents,

+				XF86DGANumberErrors,

+				ProcXDGADispatch,

+				SProcXDGADispatch,

+				XDGAResetProc,

+				StandardMinorOpcode))) {

+	int i;

+

+	DGAReqCode = (unsigned char)extEntry->base;

+	DGAErrorBase = extEntry->errorBase;

+	DGAEventBase = extEntry->eventBase;

+	for (i = KeyPress; i <= MotionNotify; i++)

+	    SetCriticalEvent (DGAEventBase + i);

+    }

+}

diff --git a/xorg-server/hw/xfree86/dixmods/extmod/xf86dgaext.h b/xorg-server/hw/xfree86/dixmods/extmod/xf86dgaext.h
deleted file mode 100644
index 2b1737305..000000000
--- a/xorg-server/hw/xfree86/dixmods/extmod/xf86dgaext.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#ifndef _XF86DGAEXT_H_
-#define _XF86DGAEXT_H_
-
-extern DISPATCH_PROC(ProcXF86DGADispatch);
-
-#endif /* _XF86DGAEXT_H_ */
diff --git a/xorg-server/hw/xfree86/dixmods/extmod/xf86vmode.c b/xorg-server/hw/xfree86/dixmods/extmod/xf86vmode.c
index 31bb311b3..25980b02b 100644
--- a/xorg-server/hw/xfree86/dixmods/extmod/xf86vmode.c
+++ b/xorg-server/hw/xfree86/dixmods/extmod/xf86vmode.c
@@ -65,48 +65,6 @@ typedef struct {
 #define VM_SETPRIV(c,p) \

     dixSetPrivate(&(c)->devPrivates, VidModeClientPrivateKey, p)

 

-static DISPATCH_PROC(ProcXF86VidModeDispatch);

-static DISPATCH_PROC(ProcXF86VidModeGetAllModeLines);

-static DISPATCH_PROC(ProcXF86VidModeGetModeLine);

-static DISPATCH_PROC(ProcXF86VidModeGetMonitor);

-static DISPATCH_PROC(ProcXF86VidModeLockModeSwitch);

-static DISPATCH_PROC(ProcXF86VidModeAddModeLine);

-static DISPATCH_PROC(ProcXF86VidModeDeleteModeLine);

-static DISPATCH_PROC(ProcXF86VidModeModModeLine);

-static DISPATCH_PROC(ProcXF86VidModeValidateModeLine);

-static DISPATCH_PROC(ProcXF86VidModeQueryVersion);

-static DISPATCH_PROC(ProcXF86VidModeSwitchMode);

-static DISPATCH_PROC(ProcXF86VidModeSwitchToMode);

-static DISPATCH_PROC(ProcXF86VidModeGetViewPort);

-static DISPATCH_PROC(ProcXF86VidModeSetViewPort);

-static DISPATCH_PROC(ProcXF86VidModeGetDotClocks);

-static DISPATCH_PROC(ProcXF86VidModeSetGamma);

-static DISPATCH_PROC(ProcXF86VidModeGetGamma);

-static DISPATCH_PROC(ProcXF86VidModeSetClientVersion);

-static DISPATCH_PROC(ProcXF86VidModeGetGammaRamp);

-static DISPATCH_PROC(ProcXF86VidModeSetGammaRamp);

-static DISPATCH_PROC(ProcXF86VidModeGetGammaRampSize);

-static DISPATCH_PROC(SProcXF86VidModeDispatch);

-static DISPATCH_PROC(SProcXF86VidModeGetAllModeLines);

-static DISPATCH_PROC(SProcXF86VidModeGetModeLine);

-static DISPATCH_PROC(SProcXF86VidModeGetMonitor);

-static DISPATCH_PROC(SProcXF86VidModeLockModeSwitch);

-static DISPATCH_PROC(SProcXF86VidModeAddModeLine);

-static DISPATCH_PROC(SProcXF86VidModeDeleteModeLine);

-static DISPATCH_PROC(SProcXF86VidModeModModeLine);

-static DISPATCH_PROC(SProcXF86VidModeValidateModeLine);

-static DISPATCH_PROC(SProcXF86VidModeQueryVersion);

-static DISPATCH_PROC(SProcXF86VidModeSwitchMode);

-static DISPATCH_PROC(SProcXF86VidModeSwitchToMode);

-static DISPATCH_PROC(SProcXF86VidModeGetViewPort);

-static DISPATCH_PROC(SProcXF86VidModeSetViewPort);

-static DISPATCH_PROC(SProcXF86VidModeGetDotClocks);

-static DISPATCH_PROC(SProcXF86VidModeSetGamma);

-static DISPATCH_PROC(SProcXF86VidModeGetGamma);

-static DISPATCH_PROC(SProcXF86VidModeSetClientVersion);

-static DISPATCH_PROC(SProcXF86VidModeGetGammaRamp);

-static DISPATCH_PROC(SProcXF86VidModeSetGammaRamp);

-static DISPATCH_PROC(SProcXF86VidModeGetGammaRampSize);

 

 #if 0

 static unsigned char XF86VidModeReqCode = 0;

@@ -159,58 +117,6 @@ static DevPrivateKeyRec ScreenPrivateKeyRec;
 # define DEBUG_P(x) /**/

 #endif

 

-void

-XFree86VidModeExtensionInit(void)

-{

-    ExtensionEntry* extEntry;

-    ScreenPtr pScreen;

-    int		    i;

-    Bool	    enabled = FALSE;

-

-    DEBUG_P("XFree86VidModeExtensionInit");

-

-    if (!dixRegisterPrivateKey(&VidModeClientPrivateKeyRec, PRIVATE_CLIENT, 0))

-	return;

-#ifdef XF86VIDMODE_EVENTS

-    if (!dixRegisterPrivateKey(&ScreenPrivateKeyRec, PRIVATE_SCREEN, 0))

-	return;

-#endif

-

-#ifdef XF86VIDMODE_EVENTS

-    EventType = CreateNewResourceType(XF86VidModeFreeEvents, "VidModeEvent");

-#endif

-

-    for(i = 0; i < screenInfo.numScreens; i++) {

-        pScreen = screenInfo.screens[i];

-	if (VidModeExtensionInit(pScreen))

-	    enabled = TRUE;

-    }

-    /* This means that the DDX doesn't want the vidmode extension enabled */

-    if (!enabled)

-	return;

-

-    if (

-#ifdef XF86VIDMODE_EVENTS

-        EventType &&

-#endif

-	(extEntry = AddExtension(XF86VIDMODENAME,

-				XF86VidModeNumberEvents,

-				XF86VidModeNumberErrors,

-				ProcXF86VidModeDispatch,

-				SProcXF86VidModeDispatch,

-				NULL,

-				StandardMinorOpcode))) {

-#if 0

-	XF86VidModeReqCode = (unsigned char)extEntry->base;

-#endif

-	VidModeErrorBase = extEntry->errorBase;

-#ifdef XF86VIDMODE_EVENTS

-	XF86VidModeEventBase = extEntry->eventBase;

-	EventSwapVector[XF86VidModeEventBase] = (EventSwapPtr)SXF86VidModeNotifyEvent;

-#endif

-    }

-}

-

 static int

 ClientMajorVersion(ClientPtr client)

 {

@@ -2166,3 +2072,55 @@ SProcXF86VidModeDispatch(ClientPtr client)
 	    return VidModeErrorBase + XF86VidModeClientNotLocal;

     }

 }

+

+void

+XFree86VidModeExtensionInit(void)

+{

+    ExtensionEntry* extEntry;

+    ScreenPtr pScreen;

+    int		    i;

+    Bool	    enabled = FALSE;

+

+    DEBUG_P("XFree86VidModeExtensionInit");

+

+    if (!dixRegisterPrivateKey(&VidModeClientPrivateKeyRec, PRIVATE_CLIENT, 0))

+	return;

+#ifdef XF86VIDMODE_EVENTS

+    if (!dixRegisterPrivateKey(&ScreenPrivateKeyRec, PRIVATE_SCREEN, 0))

+	return;

+#endif

+

+#ifdef XF86VIDMODE_EVENTS

+    EventType = CreateNewResourceType(XF86VidModeFreeEvents, "VidModeEvent");

+#endif

+

+    for(i = 0; i < screenInfo.numScreens; i++) {

+        pScreen = screenInfo.screens[i];

+	if (VidModeExtensionInit(pScreen))

+	    enabled = TRUE;

+    }

+    /* This means that the DDX doesn't want the vidmode extension enabled */

+    if (!enabled)

+	return;

+

+    if (

+#ifdef XF86VIDMODE_EVENTS

+        EventType &&

+#endif

+	(extEntry = AddExtension(XF86VIDMODENAME,

+				XF86VidModeNumberEvents,

+				XF86VidModeNumberErrors,

+				ProcXF86VidModeDispatch,

+				SProcXF86VidModeDispatch,

+				NULL,

+				StandardMinorOpcode))) {

+#if 0

+	XF86VidModeReqCode = (unsigned char)extEntry->base;

+#endif

+	VidModeErrorBase = extEntry->errorBase;

+#ifdef XF86VIDMODE_EVENTS

+	XF86VidModeEventBase = extEntry->eventBase;

+	EventSwapVector[XF86VidModeEventBase] = (EventSwapPtr)SXF86VidModeNotifyEvent;

+#endif

+    }

+}