svn merge ^/branches/released .

3 files changed, 1447 insertions, 1455 deletions

diff --git a/xorg-server/hw/xfree86/common/xf86DGA.c b/xorg-server/hw/xfree86/common/xf86DGA.c
index 9a99a339b..74eb739e4 100644
--- a/xorg-server/hw/xfree86/common/xf86DGA.c
+++ b/xorg-server/hw/xfree86/common/xf86DGA.c
@@ -1,1232 +1,1217 @@
-/*

- * Copyright (c) 1998-2002 by The XFree86 Project, Inc.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included in

- * all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

- * OTHER DEALINGS IN THE SOFTWARE.

- *

- * Except as contained in this notice, the name of the copyright holder(s)

- * and author(s) shall not be used in advertising or otherwise to promote

- * the sale, use or other dealings in this Software without prior written

- * authorization from the copyright holder(s) and author(s).

- *

- * Written by Mark Vojkovich

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "xf86.h"

-#include "xf86str.h"

-#include "xf86Priv.h"

-#include "dgaproc.h"

-#include <X11/extensions/xf86dgaproto.h>

-#include "colormapst.h"

-#include "pixmapstr.h"

-#include "inputstr.h"

-#include "globals.h"

-#include "servermd.h"

-#include "micmap.h"

-#include "xkbsrv.h"

-#include "xf86Xinput.h"

-#include "exglobals.h"

-#include "exevents.h"

-#include "eventstr.h"

-#include "eventconvert.h"

-

-#include "mi.h"

-

-static DevPrivateKeyRec DGAScreenKeyRec;

-#define DGAScreenKeyRegistered dixPrivateKeyRegistered(&DGAScreenKeyRec)

-static int mieq_installed = 0;

-

-static Bool DGACloseScreen(int i, ScreenPtr pScreen);

-static void DGADestroyColormap(ColormapPtr pmap);

-static void DGAInstallColormap(ColormapPtr pmap);

-static void DGAUninstallColormap(ColormapPtr pmap);

-static void DGAHandleEvent(int screen_num, InternalEvent *event,

-                           DeviceIntPtr device);

-

-static void

-DGACopyModeInfo(

-   DGAModePtr mode,

-   XDGAModePtr xmode

-);

-

-int *XDGAEventBase = NULL;

-

-#define DGA_GET_SCREEN_PRIV(pScreen) ((DGAScreenPtr) \

-    dixLookupPrivate(&(pScreen)->devPrivates, &DGAScreenKeyRec))

-

-

-typedef struct _FakedVisualList{

-   Bool free;

-   VisualPtr pVisual;

-   struct _FakedVisualList *next;

-} FakedVisualList;

-

-

-typedef struct {

-   ScrnInfoPtr 		pScrn;

-   int			numModes;

-   DGAModePtr		modes;

-   CloseScreenProcPtr	CloseScreen;

-   DestroyColormapProcPtr DestroyColormap;

-   InstallColormapProcPtr InstallColormap;

-   UninstallColormapProcPtr UninstallColormap;

-   DGADevicePtr		current;

-   DGAFunctionPtr	funcs;

-   int			input;

-   ClientPtr		client;

-   int			pixmapMode;

-   FakedVisualList	*fakedVisuals;

-   ColormapPtr 		dgaColormap;

-   ColormapPtr		savedColormap;

-   Bool			grabMouse;

-   Bool			grabKeyboard;

-} DGAScreenRec, *DGAScreenPtr;

-

-Bool

-DGAInit(

-   ScreenPtr pScreen,

-   DGAFunctionPtr funcs, 

-   DGAModePtr modes,

-   int num

-){

-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];

-    DGAScreenPtr pScreenPriv;

-    int i;

-

-    if(!funcs || !funcs->SetMode || !funcs->OpenFramebuffer)

-	return FALSE;

-

-    if(!modes || num <= 0)

-	return FALSE;

-

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

-	return FALSE;

-

-    pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);

-

-    if (!pScreenPriv)

-    {

-	if(!(pScreenPriv = (DGAScreenPtr)malloc(sizeof(DGAScreenRec))))

-	    return FALSE;

-	dixSetPrivate(&pScreen->devPrivates, &DGAScreenKeyRec, pScreenPriv);

-	pScreenPriv->CloseScreen = pScreen->CloseScreen;

-	pScreen->CloseScreen = DGACloseScreen;

-	pScreenPriv->DestroyColormap = pScreen->DestroyColormap;

-	pScreen->DestroyColormap = DGADestroyColormap;

-	pScreenPriv->InstallColormap = pScreen->InstallColormap;

-	pScreen->InstallColormap = DGAInstallColormap;

-	pScreenPriv->UninstallColormap = pScreen->UninstallColormap;

-	pScreen->UninstallColormap = DGAUninstallColormap;

-    }

-

-    pScreenPriv->pScrn = pScrn;

-    pScreenPriv->numModes = num;

-    pScreenPriv->modes = modes;

-    pScreenPriv->current = NULL;    

-    

-    pScreenPriv->funcs = funcs;

-    pScreenPriv->input = 0;

-    pScreenPriv->client = NULL;

-    pScreenPriv->fakedVisuals = NULL;

-    pScreenPriv->dgaColormap = NULL;

-    pScreenPriv->savedColormap = NULL;

-    pScreenPriv->grabMouse = FALSE;

-    pScreenPriv->grabKeyboard = FALSE;

-    

-    for(i = 0; i < num; i++)

-	modes[i].num = i + 1;

-

-#ifdef PANORAMIX

-     if(!noPanoramiXExtension)

-	for(i = 0; i < num; i++)

-	    modes[i].flags &= ~DGA_PIXMAP_AVAILABLE;

-#endif

-

-    return TRUE;

-}

-

-/* DGAReInitModes allows the driver to re-initialize

- * the DGA mode list.

- */

-

-Bool

-DGAReInitModes(

-   ScreenPtr pScreen,

-   DGAModePtr modes,

-   int num

-){

-    DGAScreenPtr pScreenPriv;

-    int i;

-

-    /* No DGA? Ignore call (but don't make it look like it failed) */

-    if(!DGAScreenKeyRegistered)

-	return TRUE;

-	

-    pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);

-

-    /* Same as above */

-    if(!pScreenPriv)

-	return TRUE;

-

-    /* Can't do this while DGA is active */

-    if(pScreenPriv->current)

-	return FALSE;

-

-    /* Quick sanity check */

-    if(!num) 

-	modes = NULL;

-    else if(!modes) 

-	num = 0;

-

-    pScreenPriv->numModes = num;

-    pScreenPriv->modes = modes;

-

-    /* This practically disables DGA. So be it. */

-    if(!num)

-	return TRUE;

-

-    for(i = 0; i < num; i++)

-	modes[i].num = i + 1;

-

-#ifdef PANORAMIX

-     if(!noPanoramiXExtension)

-	for(i = 0; i < num; i++)

-	    modes[i].flags &= ~DGA_PIXMAP_AVAILABLE;

-#endif

-

-     return TRUE;

-}

-

-static void

-FreeMarkedVisuals(ScreenPtr pScreen)

-{

-    DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);

-    FakedVisualList *prev, *curr, *tmp;

-

-    if(!pScreenPriv->fakedVisuals)

-	return;

-

-    prev = NULL;

-    curr = pScreenPriv->fakedVisuals;

-

-    while(curr) {

-	if(curr->free) {

-	    tmp = curr;

-	    curr = curr->next;

-	    if(prev)

-		prev->next = curr;

-	    else 

-		pScreenPriv->fakedVisuals = curr;

-	    free(tmp->pVisual);

-	    free(tmp);

-	} else {

-	    prev = curr;

-	    curr = curr->next;

-	}

-    }

-}

-

-static Bool 

-DGACloseScreen(int i, ScreenPtr pScreen)

-{

-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);

-

-   if (XDGAEventBase) {

-       mieqSetHandler(ET_DGAEvent, NULL);

-    }

-

-   FreeMarkedVisuals(pScreen);

-

-   pScreen->CloseScreen = pScreenPriv->CloseScreen;

-   pScreen->DestroyColormap = pScreenPriv->DestroyColormap;

-   pScreen->InstallColormap = pScreenPriv->InstallColormap;

-   pScreen->UninstallColormap = pScreenPriv->UninstallColormap;

-

-   /* DGAShutdown() should have ensured that no DGA

-	screen were active by here */

-

-   free(pScreenPriv);

-

-   return((*pScreen->CloseScreen)(i, pScreen));

-}

-

-

-static void 

-DGADestroyColormap(ColormapPtr pmap)

-{

-   ScreenPtr pScreen = pmap->pScreen;

-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);

-   VisualPtr pVisual = pmap->pVisual;

-

-   if(pScreenPriv->fakedVisuals) {

-	FakedVisualList *curr = pScreenPriv->fakedVisuals;

-	

-	while(curr) {

-	    if(curr->pVisual == pVisual) {

-		/* We can't get rid of them yet since FreeColormap

-		   still needs the pVisual during the cleanup */

-		curr->free = TRUE;

-		break;

-	    }

-	    curr = curr->next;

-	}

-   }  

-

-   if(pScreenPriv->DestroyColormap) {

-        pScreen->DestroyColormap = pScreenPriv->DestroyColormap;

-        (*pScreen->DestroyColormap)(pmap);

-        pScreen->DestroyColormap = DGADestroyColormap;

-   }

-}

-

-

-static void 

-DGAInstallColormap(ColormapPtr pmap)

-{

-    ScreenPtr pScreen = pmap->pScreen;

-    DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);

-

-    if(pScreenPriv->current && pScreenPriv->dgaColormap) {

-	if (pmap != pScreenPriv->dgaColormap) {

-	    pScreenPriv->savedColormap = pmap;

-	    pmap = pScreenPriv->dgaColormap;

-	}

-    }

-

-    pScreen->InstallColormap = pScreenPriv->InstallColormap;

-    (*pScreen->InstallColormap)(pmap);

-    pScreen->InstallColormap = DGAInstallColormap;

-}

-

-static void 

-DGAUninstallColormap(ColormapPtr pmap)

-{

-    ScreenPtr pScreen = pmap->pScreen;

-    DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);

-

-    if(pScreenPriv->current && pScreenPriv->dgaColormap) {

-	if (pmap == pScreenPriv->dgaColormap) {

-	    pScreenPriv->dgaColormap = NULL;

-	}

-    }

-

-    pScreen->UninstallColormap = pScreenPriv->UninstallColormap;

-    (*pScreen->UninstallColormap)(pmap);

-    pScreen->UninstallColormap = DGAUninstallColormap;

-}

-

-int

-xf86SetDGAMode(

-   int index,

-   int num,

-   DGADevicePtr devRet

-){

-   ScreenPtr pScreen = screenInfo.screens[index];

-   DGAScreenPtr pScreenPriv;

-   ScrnInfoPtr pScrn;

-   DGADevicePtr device;

-   PixmapPtr pPix = NULL;

-   DGAModePtr pMode = NULL;

-

-   /* First check if DGAInit was successful on this screen */

-   if (!DGAScreenKeyRegistered)

-	return BadValue;

-   pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);

-   if (!pScreenPriv)

-	return BadValue;

-   pScrn = pScreenPriv->pScrn;

-

-   if(!num) {

-	if(pScreenPriv->current) {

-	    PixmapPtr oldPix = pScreenPriv->current->pPix;

-	    if(oldPix) {

-		if(oldPix->drawable.id)

-		    FreeResource(oldPix->drawable.id, RT_NONE);

-		else

-		    (*pScreen->DestroyPixmap)(oldPix);

-	    }

-	    free(pScreenPriv->current);

-	    pScreenPriv->current = NULL;

-	    pScrn->vtSema = TRUE;

-	    (*pScreenPriv->funcs->SetMode)(pScrn, NULL);

-	    if(pScreenPriv->savedColormap) {

-	        (*pScreen->InstallColormap)(pScreenPriv->savedColormap);

-		pScreenPriv->savedColormap = NULL;

-	    }

-	    pScreenPriv->dgaColormap = NULL;

-	    (*pScrn->EnableDisableFBAccess)(index, TRUE);

-

-	    FreeMarkedVisuals(pScreen);

-	}

-      

-        pScreenPriv->grabMouse = FALSE;

-        pScreenPriv->grabKeyboard = FALSE;

-

-	return Success;

-   }

-

-   if(!pScrn->vtSema && !pScreenPriv->current) /* Really switched away */

-	return BadAlloc;

-      

-   if((num > 0) && (num <= pScreenPriv->numModes))

-	pMode = &(pScreenPriv->modes[num - 1]);

-   else

-	return BadValue;

-

-   if(!(device = (DGADevicePtr)malloc(sizeof(DGADeviceRec))))

-	return BadAlloc;

-

-   if(!pScreenPriv->current) {

-	Bool oldVTSema = pScrn->vtSema;

-

-	pScrn->vtSema = FALSE;  /* kludge until we rewrite VT switching */

-	(*pScrn->EnableDisableFBAccess)(index, FALSE);

-	pScrn->vtSema = oldVTSema;

-   } 

-

-   if(!(*pScreenPriv->funcs->SetMode)(pScrn, pMode)) {

-	free(device);

-	return BadAlloc;

-   }

-

-   pScrn->currentMode = pMode->mode;

-

-   if(!pScreenPriv->current && !pScreenPriv->input) {

-	/* if it's multihead we need to warp the cursor off of

-	   our screen so it doesn't get trapped  */

-   } 

-

-   pScrn->vtSema = FALSE;

-

-   if(pScreenPriv->current) {

-	PixmapPtr oldPix = pScreenPriv->current->pPix;

-	if(oldPix) {

-	    if(oldPix->drawable.id)

-		FreeResource(oldPix->drawable.id, RT_NONE);

-	    else

-		(*pScreen->DestroyPixmap)(oldPix);

-	}

-	free(pScreenPriv->current);

-	pScreenPriv->current = NULL;

-   } 

-

-   if(pMode->flags & DGA_PIXMAP_AVAILABLE) {

-	if((pPix = (*pScreen->CreatePixmap)(pScreen, 0, 0, pMode->depth, 0))) {

-	    (*pScreen->ModifyPixmapHeader)(pPix, 

-			pMode->pixmapWidth, pMode->pixmapHeight,

-			pMode->depth, pMode->bitsPerPixel, 

-			pMode->bytesPerScanline,

- 			(pointer)(pMode->address));

-        }

-   }

-

-   devRet->mode = device->mode = pMode;

-   devRet->pPix = device->pPix = pPix;

-   pScreenPriv->current = device;

-   pScreenPriv->pixmapMode = FALSE;

-   pScreenPriv->grabMouse = TRUE;

-   pScreenPriv->grabKeyboard = TRUE;

-

-   return Success;

-}

-

-

-

-/*********** exported ones ***************/

-

-void

-DGASetInputMode(int index, Bool keyboard, Bool mouse)

-{

-   ScreenPtr pScreen = screenInfo.screens[index];

-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);

-

-   if (pScreenPriv)

-   {

-      pScreenPriv->grabMouse = mouse;

-      pScreenPriv->grabKeyboard = keyboard;

-

-      if (!mieq_installed) {

-          mieqSetHandler(ET_DGAEvent, DGAHandleEvent);

-          mieq_installed = 1;

-      }

-   }

-}

-

-Bool

-DGAChangePixmapMode(int index, int *x, int *y, int mode)

-{

-   DGAScreenPtr pScreenPriv;

-   DGADevicePtr pDev;

-   DGAModePtr   pMode;

-   PixmapPtr    pPix;

-

-   if(!DGAScreenKeyRegistered)

-	return FALSE;

-

-   pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);

-

-   if(!pScreenPriv || !pScreenPriv->current || !pScreenPriv->current->pPix)

-	return FALSE;

-

-   pDev = pScreenPriv->current;

-   pPix = pDev->pPix;

-   pMode = pDev->mode;

-

-   if(mode) {

-	int shift = 2;

-

-	if(*x > (pMode->pixmapWidth - pMode->viewportWidth))

-	    *x = pMode->pixmapWidth - pMode->viewportWidth;

-	if(*y > (pMode->pixmapHeight - pMode->viewportHeight))

-	    *y = pMode->pixmapHeight - pMode->viewportHeight;

-

-	switch(xf86Screens[index]->bitsPerPixel) {

-	case 16: shift = 1;  break;

-	case 32: shift = 0;  break;

-	default: break;

-	}

-

-	if(BITMAP_SCANLINE_PAD == 64)

-	    shift++;

-

-	*x = (*x >> shift) << shift;

-

-	pPix->drawable.x = *x; 

-	pPix->drawable.y = *y; 

-	pPix->drawable.width = pMode->viewportWidth; 

-	pPix->drawable.height = pMode->viewportHeight; 

-   } else {

-	pPix->drawable.x = 0; 

-	pPix->drawable.y = 0; 

-	pPix->drawable.width = pMode->pixmapWidth; 

-	pPix->drawable.height = pMode->pixmapHeight; 

-   }

-   pPix->drawable.serialNumber = NEXT_SERIAL_NUMBER;

-   pScreenPriv->pixmapMode = mode;

-

-   return TRUE;

-}

-

-Bool

-DGAAvailable(int index) 

-{

-   if(!DGAScreenKeyRegistered)

-	return FALSE;

-   

-   if(DGA_GET_SCREEN_PRIV(screenInfo.screens[index]))

-	return TRUE;

-

-   return FALSE;

-}

-

-Bool

-DGAActive(int index) 

-{

-   DGAScreenPtr pScreenPriv;

-

-   if(!DGAScreenKeyRegistered)

-	return FALSE;

-

-   pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);

-

-   if(pScreenPriv && pScreenPriv->current)

-	return TRUE;

-

-   return FALSE;

-}

-

-

-

-/* Called by the event code in case the server is abruptly terminated */

-

-void

-DGAShutdown(void)

-{

-    ScrnInfoPtr pScrn;

-    int i;

-

-    if(!DGAScreenKeyRegistered)

-	return;

-

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

-	pScrn = xf86Screens[i];

-

-	(void)(*pScrn->SetDGAMode)(pScrn->scrnIndex, 0, NULL);

-    }

-}

-

-/* Called by the extension to initialize a mode */

-

-int

-DGASetMode(

-   int index,

-   int num,

-   XDGAModePtr mode,

-   PixmapPtr *pPix

-){

-    ScrnInfoPtr pScrn = xf86Screens[index];

-    DGADeviceRec device;

-    int ret;

-

-    /* We rely on the extension to check that DGA is available */ 

-

-    ret = (*pScrn->SetDGAMode)(index, num, &device);

-    if((ret == Success) && num) {

-	DGACopyModeInfo(device.mode, mode);

-	*pPix = device.pPix;

-    }

-

-    return ret;

-}

-

-/* Called from the extension to let the DDX know which events are requested */

-

-void

-DGASelectInput(

-   int index,

-   ClientPtr client,

-   long mask

-){

-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);

-

-   /* We rely on the extension to check that DGA is available */

-   pScreenPriv->client = client;

-   pScreenPriv->input = mask;

-}

-

-int

-DGAGetViewportStatus(int index) 

-{

-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);

-

-   /* We rely on the extension to check that DGA is active */ 

-

-   if (!pScreenPriv->funcs->GetViewport)

-      return 0;

-

-   return (*pScreenPriv->funcs->GetViewport)(pScreenPriv->pScrn);

-}

-

-int

-DGASetViewport(

-   int index,

-   int x, int y,

-   int mode

-){

-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);

-

-   if (pScreenPriv->funcs->SetViewport)

-      (*pScreenPriv->funcs->SetViewport)(pScreenPriv->pScrn, x, y, mode);

-   return Success;

-}

-

-

-static int

-BitsClear(CARD32 data)

-{

-   int bits = 0;

-   CARD32 mask;

-

-   for(mask = 1; mask; mask <<= 1) {

-	if(!(data & mask)) bits++;

-	else break;

-   }

-

-   return bits;

-}

-

-int

-DGACreateColormap(int index, ClientPtr client, int id, int mode, int alloc)

-{

-   ScreenPtr pScreen = screenInfo.screens[index];

-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);

-   FakedVisualList *fvlp;

-   VisualPtr pVisual;

-   DGAModePtr pMode;

-   ColormapPtr pmap;

-

-   if(!mode || (mode > pScreenPriv->numModes))

-	return BadValue;

-

-   if((alloc != AllocNone) && (alloc != AllocAll))

-	return BadValue;

-

-   pMode = &(pScreenPriv->modes[mode - 1]);

-

-   if(!(pVisual = malloc(sizeof(VisualRec))))

-	return BadAlloc;

-

-   pVisual->vid = FakeClientID(0);

-   pVisual->class = pMode->visualClass;

-   pVisual->nplanes = pMode->depth;

-   pVisual->ColormapEntries = 1 << pMode->depth;

-   pVisual->bitsPerRGBValue = (pMode->depth + 2) / 3;

-

-   switch (pVisual->class) {

-   case PseudoColor:

-   case GrayScale:

-   case StaticGray:

-	pVisual->bitsPerRGBValue = 8; /* not quite */

-	pVisual->redMask     = 0;

-	pVisual->greenMask   = 0;

-	pVisual->blueMask    = 0;

-	pVisual->offsetRed   = 0;

-	pVisual->offsetGreen = 0;

-	pVisual->offsetBlue  = 0;

-	break;

-   case DirectColor:

-   case TrueColor:

-	pVisual->ColormapEntries = 1 << pVisual->bitsPerRGBValue;

-                /* fall through */

-   case StaticColor:

-	pVisual->redMask = pMode->red_mask;

-	pVisual->greenMask = pMode->green_mask;

-	pVisual->blueMask = pMode->blue_mask;

-	pVisual->offsetRed   = BitsClear(pVisual->redMask);

-	pVisual->offsetGreen = BitsClear(pVisual->greenMask);

-	pVisual->offsetBlue  = BitsClear(pVisual->blueMask);

-   }

-

-   if(!(fvlp = malloc(sizeof(FakedVisualList)))) {

-	free(pVisual);

-	return BadAlloc;

-   }

-

-   fvlp->free = FALSE;

-   fvlp->pVisual = pVisual;

-   fvlp->next = pScreenPriv->fakedVisuals;

-   pScreenPriv->fakedVisuals = fvlp;

-

-   LEGAL_NEW_RESOURCE(id, client);

-

-   return CreateColormap(id, pScreen, pVisual, &pmap, alloc, client->index);

-}

-

-/*  Called by the extension to install a colormap on DGA active screens */

-

-void

-DGAInstallCmap(ColormapPtr cmap)

-{

-    ScreenPtr pScreen = cmap->pScreen;

-    DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);

-

-    /* We rely on the extension to check that DGA is active */ 

-

-    if(!pScreenPriv->dgaColormap) 

-	pScreenPriv->savedColormap = GetInstalledmiColormap(pScreen);

-

-    pScreenPriv->dgaColormap = cmap;    

-

-    (*pScreen->InstallColormap)(cmap);

-}

-

-int

-DGASync(int index)

-{

-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);

-   

-   /* We rely on the extension to check that DGA is active */

-

-   if (pScreenPriv->funcs->Sync)

-      (*pScreenPriv->funcs->Sync)(pScreenPriv->pScrn);

-

-   return Success;

-}

-

-int

-DGAFillRect(

-   int index,

-   int x, int y, int w, int h,

-   unsigned long color

-){

-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);

-   

-   /* We rely on the extension to check that DGA is active */

-

-   if(pScreenPriv->funcs->FillRect && 

-	(pScreenPriv->current->mode->flags & DGA_FILL_RECT)) {

-

-	(*pScreenPriv->funcs->FillRect)(pScreenPriv->pScrn, x, y, w, h, color);

-	return Success;

-   }

-   return BadMatch;

-}

-

-int

-DGABlitRect(

-   int index,

-   int srcx, int srcy, 

-   int w, int h, 

-   int dstx, int dsty

-){

-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);

-   

-   /* We rely on the extension to check that DGA is active */

-

-   if(pScreenPriv->funcs->BlitRect &&

-	(pScreenPriv->current->mode->flags & DGA_BLIT_RECT)) {

-

-	(*pScreenPriv->funcs->BlitRect)(pScreenPriv->pScrn, 	

-		srcx, srcy, w, h, dstx, dsty);

-	return Success;

-   }

-   return BadMatch;

-}

-

-int

-DGABlitTransRect(

-   int index,

-   int srcx, int srcy, 

-   int w, int h, 

-   int dstx, int dsty,

-   unsigned long color

-){

-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);

-   

-   /* We rely on the extension to check that DGA is active */

-

-   if(pScreenPriv->funcs->BlitTransRect && 

-	(pScreenPriv->current->mode->flags & DGA_BLIT_RECT_TRANS)) {

-

-	(*pScreenPriv->funcs->BlitTransRect)(pScreenPriv->pScrn, 	

-		srcx, srcy, w, h, dstx, dsty, color);

-	return Success;

-   }

-   return BadMatch;

-}

-

-

-int

-DGAGetModes(int index)

-{

-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);

-   /* We rely on the extension to check that DGA is available */

-

-   return pScreenPriv->numModes;

-}

-

-

-int

-DGAGetModeInfo(

-  int index,

-  XDGAModePtr mode,

-  int num

-){

-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);

-   /* We rely on the extension to check that DGA is available */

-

-   if((num <= 0) || (num > pScreenPriv->numModes))

-	return BadValue;

-

-   DGACopyModeInfo(&(pScreenPriv->modes[num - 1]), mode);

-

-   return Success;

-}

-

-

-static void

-DGACopyModeInfo(

-   DGAModePtr mode,

-   XDGAModePtr xmode

-){

-   DisplayModePtr dmode = mode->mode;

-

-   xmode->num = mode->num;

-   xmode->name = dmode->name;

-   xmode->VSync_num = (int)(dmode->VRefresh * 1000.0); 

-   xmode->VSync_den = 1000;

-   xmode->flags = mode->flags;

-   xmode->imageWidth = mode->imageWidth;

-   xmode->imageHeight = mode->imageHeight;

-   xmode->pixmapWidth = mode->pixmapWidth;

-   xmode->pixmapHeight = mode->pixmapHeight;

-   xmode->bytesPerScanline = mode->bytesPerScanline;

-   xmode->byteOrder = mode->byteOrder;

-   xmode->depth = mode->depth;

-   xmode->bitsPerPixel = mode->bitsPerPixel;

-   xmode->red_mask = mode->red_mask;

-   xmode->green_mask = mode->green_mask;

-   xmode->blue_mask = mode->blue_mask;

-   xmode->visualClass = mode->visualClass;

-   xmode->viewportWidth = mode->viewportWidth;

-   xmode->viewportHeight = mode->viewportHeight;

-   xmode->xViewportStep = mode->xViewportStep;

-   xmode->yViewportStep = mode->yViewportStep;

-   xmode->maxViewportX = mode->maxViewportX;

-   xmode->maxViewportY = mode->maxViewportY;

-   xmode->viewportFlags = mode->viewportFlags;

-   xmode->reserved1 = mode->reserved1;

-   xmode->reserved2 = mode->reserved2;

-   xmode->offset = mode->offset;

-

-   if(dmode->Flags & V_INTERLACE) xmode->flags |= DGA_INTERLACED;

-   if(dmode->Flags & V_DBLSCAN) xmode->flags |= DGA_DOUBLESCAN;

-}

-

-

-Bool

-DGAVTSwitch(void)

-{

-    ScreenPtr pScreen;

-    int i;

-

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

-       pScreen = screenInfo.screens[i];	

-

-       /* Alternatively, this could send events to DGA clients */

-

-       if(DGAScreenKeyRegistered) {

-	   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);

-

-	   if(pScreenPriv && pScreenPriv->current)

-		return FALSE;

-       }

-    }

-

-   return TRUE;

-}

-

-Bool

-DGAStealKeyEvent(DeviceIntPtr dev, int index, int key_code, int is_down)

-{

-   DGAScreenPtr pScreenPriv;

-   DGAEvent     event;

-

-   if(!DGAScreenKeyRegistered) /* no DGA */

-        return FALSE;

-

-   if (key_code < 8 || key_code > 255)

-       return FALSE;

-

-   pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);

-

-   if(!pScreenPriv || !pScreenPriv->grabKeyboard) /* no direct mode */

-        return FALSE; 

-

-    memset(&event, 0, sizeof(event));

-    event.header = ET_Internal;

-    event.type = ET_DGAEvent;

-    event.length = sizeof(event);

-    event.time = GetTimeInMillis();

-    event.subtype = (is_down ? ET_KeyPress : ET_KeyRelease);

-    event.detail = key_code;

-    event.dx = 0;

-    event.dy = 0;

-    mieqEnqueue (dev, (InternalEvent*)&event);

-

-   return TRUE;

-}  

-

-static int  DGAMouseX, DGAMouseY;

-

-Bool

-DGAStealMotionEvent(DeviceIntPtr dev, int index, int dx, int dy)

-{

-   DGAScreenPtr pScreenPriv;

-   DGAEvent event;

-

-   if(!DGAScreenKeyRegistered) /* no DGA */

-        return FALSE;

-    

-   pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);

-

-   if(!pScreenPriv || !pScreenPriv->grabMouse) /* no direct mode */

-        return FALSE;

-

-    DGAMouseX += dx;

-    if (DGAMouseX < 0)

-        DGAMouseX = 0;

-    else if (DGAMouseX > screenInfo.screens[index]->width)

-        DGAMouseX = screenInfo.screens[index]->width;

-    DGAMouseY += dy;

-    if (DGAMouseY < 0)

-        DGAMouseY = 0;

-    else if (DGAMouseY > screenInfo.screens[index]->height)

-        DGAMouseY = screenInfo.screens[index]->height;

-

-    memset(&event, 0, sizeof(event));

-    event.header = ET_Internal;

-    event.type = ET_DGAEvent;

-    event.length = sizeof(event);

-    event.time = GetTimeInMillis();

-    event.subtype = ET_Motion;

-    event.detail = 0;

-    event.dx = dx;

-    event.dy = dy;

-    mieqEnqueue (dev, (InternalEvent*)&event);

-    return TRUE;

-}

-

-Bool

-DGAStealButtonEvent(DeviceIntPtr dev, int index, int button, int is_down)

-{

-    DGAScreenPtr pScreenPriv;

-    DGAEvent event;

-

-    if(!DGAScreenKeyRegistered) /* no DGA */

-        return FALSE;

-    

-    pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);

-

-    if (!pScreenPriv || !pScreenPriv->grabMouse)

-        return FALSE;

-

-    memset(&event, 0, sizeof(event));

-    event.header = ET_Internal;

-    event.type = ET_DGAEvent;

-    event.length = sizeof(event);

-    event.time = GetTimeInMillis();

-    event.subtype = (is_down ? ET_ButtonPress : ET_ButtonRelease);

-    event.detail = button;

-    event.dx = 0;

-    event.dy = 0;

-    mieqEnqueue (dev, (InternalEvent*)&event);

-

-    return TRUE;

-}

-

-/* We have the power to steal or modify events that are about to get queued */

-

-Bool

-DGAIsDgaEvent (xEvent *e)

-{

-    int	    coreEquiv;

-    if (!DGAScreenKeyRegistered || XDGAEventBase == 0)

-	return FALSE;

-    coreEquiv = e->u.u.type - *XDGAEventBase;

-    if (KeyPress <= coreEquiv && coreEquiv <= MotionNotify)

-	return TRUE;

-    return FALSE;

-}

-

-#define NoSuchEvent 0x80000000	/* so doesn't match NoEventMask */

-static Mask filters[] =

-{

-	NoSuchEvent,		       /* 0 */

-	NoSuchEvent,		       /* 1 */

-	KeyPressMask,		       /* KeyPress */

-	KeyReleaseMask,		       /* KeyRelease */

-	ButtonPressMask,	       /* ButtonPress */

-	ButtonReleaseMask,	       /* ButtonRelease */

-	PointerMotionMask,	       /* MotionNotify (initial state) */

-};

-

-static void

-DGAProcessKeyboardEvent (ScreenPtr pScreen, DGAEvent *event, DeviceIntPtr keybd)

-{

-    KeyClassPtr	    keyc = keybd->key;

-    DGAScreenPtr    pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);

-    DeviceIntPtr    pointer = GetPairedDevice(keybd);

-    DeviceEvent     ev;

-

-    memset(&ev, 0, sizeof(ev));

-    ev.length = sizeof(ev);

-    ev.detail.key = event->detail;

-    ev.type = event->subtype;

-    ev.root_x = 0;

-    ev.root_y = 0;

-    ev.corestate = XkbStateFieldFromRec(&keyc->xkbInfo->state);

-    ev.corestate |= pointer->button->state;

-

-    UpdateDeviceState(keybd, &ev);

-

-    /*

-     * Deliver the DGA event

-     */

-    if (pScreenPriv->client)

-    {

-        dgaEvent de;

-        de.u.u.type = *XDGAEventBase + GetCoreType((InternalEvent*)&ev);

-        de.u.u.detail = event->detail;

-        de.u.event.time = event->time;

-        de.u.event.dx = 0;

-        de.u.event.dy = 0;

-        de.u.event.screen = pScreen->myNum;

-        de.u.event.state = ev.corestate;

-

-	/* If the DGA client has selected input, then deliver based on the usual filter */

-	TryClientEvents (pScreenPriv->client, keybd, (xEvent *)&de, 1,

-			 filters[ev.type], pScreenPriv->input, 0);

-    }

-    else

-    {

-	/* If the keyboard is actively grabbed, deliver a grabbed core event */

-	if (keybd->deviceGrab.grab && !keybd->deviceGrab.fromPassiveGrab)

-	{

-            ev.detail.key = event->detail;

-            ev.time       = event->time;

-            ev.root_x     = event->dx;

-            ev.root_y     = event->dy;

-            ev.corestate  = event->state;

-            ev.deviceid   = keybd->id;

-	    DeliverGrabbedEvent ((InternalEvent*)&ev, keybd, FALSE);

-	}

-    }

-}

-

-static void

-DGAProcessPointerEvent (ScreenPtr pScreen, DGAEvent *event, DeviceIntPtr mouse)

-{

-    ButtonClassPtr  butc = mouse->button;

-    DGAScreenPtr    pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);

-    DeviceEvent     ev;

-    DeviceIntPtr    master = GetMaster(mouse, MASTER_KEYBOARD);

-

-    memset(&ev, 0, sizeof(ev));

-    ev.header = ET_Internal;

-    ev.length = sizeof(ev);

-    ev.type = event->subtype;

-    ev.corestate  = butc ? butc->state : 0;

-    if (master && master->key)

-        ev.corestate |= XkbStateFieldFromRec(&master->key->xkbInfo->state);

-

-    UpdateDeviceState(mouse, &ev);

-

-    /*

-     * Deliver the DGA event

-     */

-    if (pScreenPriv->client)

-    {

-        dgaEvent        de;

-        int		coreEquiv;

-

-        coreEquiv = GetCoreType((InternalEvent*)&ev);

-

-        de.u.u.type = *XDGAEventBase + coreEquiv;

-        de.u.u.detail = event->detail;

-        de.u.event.time = event->time;

-        de.u.event.dx = 0;

-        de.u.event.dy = 0;

-        de.u.event.screen = pScreen->myNum;

-        de.u.event.state = ev.corestate;

-

-	/* If the DGA client has selected input, then deliver based on the usual filter */

-	TryClientEvents (pScreenPriv->client, mouse, (xEvent *)&de, 1,

-			 filters[coreEquiv], pScreenPriv->input, 0);

-    }

-    else

-    {

-	/* If the pointer is actively grabbed, deliver a grabbed core event */

-	if (mouse->deviceGrab.grab && !mouse->deviceGrab.fromPassiveGrab)

-	{

-            ev.detail.button    = event->detail;

-            ev.time             = event->time;

-            ev.root_x           = event->dx;

-            ev.root_y           = event->dy;

-            ev.corestate        = event->state;

-            /* DGA is core only, so valuators.data doesn't actually matter.

-             * Mask must be set for EventToCore to create motion events. */

-            SetBit(ev.valuators.mask, 0);

-            SetBit(ev.valuators.mask, 1);

-	    DeliverGrabbedEvent ((InternalEvent*)&ev, mouse, FALSE);

-	}

-    }

-}

-

-Bool

-DGAOpenFramebuffer(

-   int index,

-   char **name,

-   unsigned char **mem,

-   int *size,

-   int *offset,

-   int *flags

-){

-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);

-

-   /* We rely on the extension to check that DGA is available */

-

-   return (*pScreenPriv->funcs->OpenFramebuffer)(pScreenPriv->pScrn, 

-				name, mem, size, offset, flags);

-}

-

-void

-DGACloseFramebuffer(int index)

-{

-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);

-

-   /* We rely on the extension to check that DGA is available */

-   if(pScreenPriv->funcs->CloseFramebuffer)

-	(*pScreenPriv->funcs->CloseFramebuffer)(pScreenPriv->pScrn);

-}

-

-/*  For DGA 1.0 backwards compatibility only */

-

-int

-DGAGetOldDGAMode(int index)

-{

-   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);

-   ScrnInfoPtr pScrn = pScreenPriv->pScrn;

-   DGAModePtr mode;

-   int i, w, h, p;

-

-   /* We rely on the extension to check that DGA is available */

-

-   w = pScrn->currentMode->HDisplay;

-   h = pScrn->currentMode->VDisplay;

-   p = pad_to_int32(pScrn->displayWidth * bits_to_bytes(pScrn->bitsPerPixel));

-

-   for(i = 0; i < pScreenPriv->numModes; i++) {

-	mode = &(pScreenPriv->modes[i]);

-  	      

-	if((mode->viewportWidth == w) && (mode->viewportHeight == h) &&

-		(mode->bytesPerScanline == p) && 

-		(mode->bitsPerPixel == pScrn->bitsPerPixel) &&

-		(mode->depth == pScrn->depth)) {

-

-		return mode->num;

-	}

-   }

-

-   return 0;

-}

-

-static void

-DGAHandleEvent(int screen_num, InternalEvent *ev, DeviceIntPtr device)

-{

-    DGAEvent	    *event= &ev->dga_event;

-    ScreenPtr       pScreen = screenInfo.screens[screen_num];

-    DGAScreenPtr    pScreenPriv;

-

-    /* no DGA */

-    if (!DGAScreenKeyRegistered || XDGAEventBase == 0)

-	return;

-    pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);

-

-    /* DGA not initialized on this screen */

-    if (!pScreenPriv)

-	return;

-

-    switch (event->subtype) {

-    case KeyPress:

-    case KeyRelease:

-	DGAProcessKeyboardEvent (pScreen, event, device);

-	break;

-    case MotionNotify:

-    case ButtonPress:

-    case ButtonRelease:

-	DGAProcessPointerEvent (pScreen, event, device);

-        break;

-    default:

-	break;

-    }

-}

+/*
+ * Copyright (c) 1998-2002 by The XFree86 Project, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name of the copyright holder(s)
+ * and author(s) shall not be used in advertising or otherwise to promote
+ * the sale, use or other dealings in this Software without prior written
+ * authorization from the copyright holder(s) and author(s).
+ *
+ * Written by Mark Vojkovich
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86.h"
+#include "xf86str.h"
+#include "xf86Priv.h"
+#include "dgaproc.h"
+#include <X11/extensions/xf86dgaproto.h>
+#include "colormapst.h"
+#include "pixmapstr.h"
+#include "inputstr.h"
+#include "globals.h"
+#include "servermd.h"
+#include "micmap.h"
+#include "xkbsrv.h"
+#include "xf86Xinput.h"
+#include "exglobals.h"
+#include "exevents.h"
+#include "eventstr.h"
+#include "eventconvert.h"
+
+#include "mi.h"
+
+static DevPrivateKeyRec DGAScreenKeyRec;
+#define DGAScreenKeyRegistered dixPrivateKeyRegistered(&DGAScreenKeyRec)
+static Bool mieq_installed;
+
+static Bool DGACloseScreen(int i, ScreenPtr pScreen);
+static void DGADestroyColormap(ColormapPtr pmap);
+static void DGAInstallColormap(ColormapPtr pmap);
+static void DGAUninstallColormap(ColormapPtr pmap);
+static void DGAHandleEvent(int screen_num, InternalEvent *event,
+                           DeviceIntPtr device);
+
+static void
+DGACopyModeInfo(
+   DGAModePtr mode,
+   XDGAModePtr xmode
+);
+
+int *XDGAEventBase = NULL;
+
+#define DGA_GET_SCREEN_PRIV(pScreen) ((DGAScreenPtr) \
+    dixLookupPrivate(&(pScreen)->devPrivates, &DGAScreenKeyRec))
+
+
+typedef struct _FakedVisualList{
+   Bool free;
+   VisualPtr pVisual;
+   struct _FakedVisualList *next;
+} FakedVisualList;
+
+
+typedef struct {
+   ScrnInfoPtr 		pScrn;
+   int			numModes;
+   DGAModePtr		modes;
+   CloseScreenProcPtr	CloseScreen;
+   DestroyColormapProcPtr DestroyColormap;
+   InstallColormapProcPtr InstallColormap;
+   UninstallColormapProcPtr UninstallColormap;
+   DGADevicePtr		current;
+   DGAFunctionPtr	funcs;
+   int			input;
+   ClientPtr		client;
+   int			pixmapMode;
+   FakedVisualList	*fakedVisuals;
+   ColormapPtr 		dgaColormap;
+   ColormapPtr		savedColormap;
+   Bool			grabMouse;
+   Bool			grabKeyboard;
+} DGAScreenRec, *DGAScreenPtr;
+
+Bool
+DGAInit(
+   ScreenPtr pScreen,
+   DGAFunctionPtr funcs, 
+   DGAModePtr modes,
+   int num
+){
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    DGAScreenPtr pScreenPriv;
+    int i;
+
+    if(!funcs || !funcs->SetMode || !funcs->OpenFramebuffer)
+	return FALSE;
+
+    if(!modes || num <= 0)
+	return FALSE;
+
+    if (!dixRegisterPrivateKey(&DGAScreenKeyRec, PRIVATE_SCREEN, 0))
+	return FALSE;
+
+    pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
+
+    if (!pScreenPriv)
+    {
+	if(!(pScreenPriv = (DGAScreenPtr)malloc(sizeof(DGAScreenRec))))
+	    return FALSE;
+	dixSetPrivate(&pScreen->devPrivates, &DGAScreenKeyRec, pScreenPriv);
+	pScreenPriv->CloseScreen = pScreen->CloseScreen;
+	pScreen->CloseScreen = DGACloseScreen;
+	pScreenPriv->DestroyColormap = pScreen->DestroyColormap;
+	pScreen->DestroyColormap = DGADestroyColormap;
+	pScreenPriv->InstallColormap = pScreen->InstallColormap;
+	pScreen->InstallColormap = DGAInstallColormap;
+	pScreenPriv->UninstallColormap = pScreen->UninstallColormap;
+	pScreen->UninstallColormap = DGAUninstallColormap;
+    }
+
+    pScreenPriv->pScrn = pScrn;
+    pScreenPriv->numModes = num;
+    pScreenPriv->modes = modes;
+    pScreenPriv->current = NULL;    
+    
+    pScreenPriv->funcs = funcs;
+    pScreenPriv->input = 0;
+    pScreenPriv->client = NULL;
+    pScreenPriv->fakedVisuals = NULL;
+    pScreenPriv->dgaColormap = NULL;
+    pScreenPriv->savedColormap = NULL;
+    pScreenPriv->grabMouse = FALSE;
+    pScreenPriv->grabKeyboard = FALSE;
+    
+    for(i = 0; i < num; i++)
+	modes[i].num = i + 1;
+
+#ifdef PANORAMIX
+     if(!noPanoramiXExtension)
+	for(i = 0; i < num; i++)
+	    modes[i].flags &= ~DGA_PIXMAP_AVAILABLE;
+#endif
+
+    return TRUE;
+}
+
+/* DGAReInitModes allows the driver to re-initialize
+ * the DGA mode list.
+ */
+
+Bool
+DGAReInitModes(
+   ScreenPtr pScreen,
+   DGAModePtr modes,
+   int num
+){
+    DGAScreenPtr pScreenPriv;
+    int i;
+
+    /* No DGA? Ignore call (but don't make it look like it failed) */
+    if(!DGAScreenKeyRegistered)
+	return TRUE;
+	
+    pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
+
+    /* Same as above */
+    if(!pScreenPriv)
+	return TRUE;
+
+    /* Can't do this while DGA is active */
+    if(pScreenPriv->current)
+	return FALSE;
+
+    /* Quick sanity check */
+    if(!num) 
+	modes = NULL;
+    else if(!modes) 
+	num = 0;
+
+    pScreenPriv->numModes = num;
+    pScreenPriv->modes = modes;
+
+    /* This practically disables DGA. So be it. */
+    if(!num)
+	return TRUE;
+
+    for(i = 0; i < num; i++)
+	modes[i].num = i + 1;
+
+#ifdef PANORAMIX
+     if(!noPanoramiXExtension)
+	for(i = 0; i < num; i++)
+	    modes[i].flags &= ~DGA_PIXMAP_AVAILABLE;
+#endif
+
+     return TRUE;
+}
+
+static void
+FreeMarkedVisuals(ScreenPtr pScreen)
+{
+    DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
+    FakedVisualList *prev, *curr, *tmp;
+
+    if(!pScreenPriv->fakedVisuals)
+	return;
+
+    prev = NULL;
+    curr = pScreenPriv->fakedVisuals;
+
+    while(curr) {
+	if(curr->free) {
+	    tmp = curr;
+	    curr = curr->next;
+	    if(prev)
+		prev->next = curr;
+	    else 
+		pScreenPriv->fakedVisuals = curr;
+	    free(tmp->pVisual);
+	    free(tmp);
+	} else {
+	    prev = curr;
+	    curr = curr->next;
+	}
+    }
+}
+
+static Bool 
+DGACloseScreen(int i, ScreenPtr pScreen)
+{
+   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
+
+   if (mieq_installed) {
+       mieqSetHandler(ET_DGAEvent, NULL);
+       mieq_installed = FALSE;
+   }
+
+   FreeMarkedVisuals(pScreen);
+
+   pScreen->CloseScreen = pScreenPriv->CloseScreen;
+   pScreen->DestroyColormap = pScreenPriv->DestroyColormap;
+   pScreen->InstallColormap = pScreenPriv->InstallColormap;
+   pScreen->UninstallColormap = pScreenPriv->UninstallColormap;
+
+   /* DGAShutdown() should have ensured that no DGA
+	screen were active by here */
+
+   free(pScreenPriv);
+
+   return((*pScreen->CloseScreen)(i, pScreen));
+}
+
+
+static void 
+DGADestroyColormap(ColormapPtr pmap)
+{
+   ScreenPtr pScreen = pmap->pScreen;
+   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
+   VisualPtr pVisual = pmap->pVisual;
+
+   if(pScreenPriv->fakedVisuals) {
+	FakedVisualList *curr = pScreenPriv->fakedVisuals;
+	
+	while(curr) {
+	    if(curr->pVisual == pVisual) {
+		/* We can't get rid of them yet since FreeColormap
+		   still needs the pVisual during the cleanup */
+		curr->free = TRUE;
+		break;
+	    }
+	    curr = curr->next;
+	}
+   }  
+
+   if(pScreenPriv->DestroyColormap) {
+        pScreen->DestroyColormap = pScreenPriv->DestroyColormap;
+        (*pScreen->DestroyColormap)(pmap);
+        pScreen->DestroyColormap = DGADestroyColormap;
+   }
+}
+
+
+static void 
+DGAInstallColormap(ColormapPtr pmap)
+{
+    ScreenPtr pScreen = pmap->pScreen;
+    DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
+
+    if(pScreenPriv->current && pScreenPriv->dgaColormap) {
+	if (pmap != pScreenPriv->dgaColormap) {
+	    pScreenPriv->savedColormap = pmap;
+	    pmap = pScreenPriv->dgaColormap;
+	}
+    }
+
+    pScreen->InstallColormap = pScreenPriv->InstallColormap;
+    (*pScreen->InstallColormap)(pmap);
+    pScreen->InstallColormap = DGAInstallColormap;
+}
+
+static void 
+DGAUninstallColormap(ColormapPtr pmap)
+{
+    ScreenPtr pScreen = pmap->pScreen;
+    DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
+
+    if(pScreenPriv->current && pScreenPriv->dgaColormap) {
+	if (pmap == pScreenPriv->dgaColormap) {
+	    pScreenPriv->dgaColormap = NULL;
+	}
+    }
+
+    pScreen->UninstallColormap = pScreenPriv->UninstallColormap;
+    (*pScreen->UninstallColormap)(pmap);
+    pScreen->UninstallColormap = DGAUninstallColormap;
+}
+
+int
+xf86SetDGAMode(
+   int index,
+   int num,
+   DGADevicePtr devRet
+){
+   ScreenPtr pScreen = screenInfo.screens[index];
+   DGAScreenPtr pScreenPriv;
+   ScrnInfoPtr pScrn;
+   DGADevicePtr device;
+   PixmapPtr pPix = NULL;
+   DGAModePtr pMode = NULL;
+
+   /* First check if DGAInit was successful on this screen */
+   if (!DGAScreenKeyRegistered)
+	return BadValue;
+   pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
+   if (!pScreenPriv)
+	return BadValue;
+   pScrn = pScreenPriv->pScrn;
+
+   if(!num) {
+	if(pScreenPriv->current) {
+	    PixmapPtr oldPix = pScreenPriv->current->pPix;
+	    if(oldPix) {
+		if(oldPix->drawable.id)
+		    FreeResource(oldPix->drawable.id, RT_NONE);
+		else
+		    (*pScreen->DestroyPixmap)(oldPix);
+	    }
+	    free(pScreenPriv->current);
+	    pScreenPriv->current = NULL;
+	    pScrn->vtSema = TRUE;
+	    (*pScreenPriv->funcs->SetMode)(pScrn, NULL);
+	    if(pScreenPriv->savedColormap) {
+	        (*pScreen->InstallColormap)(pScreenPriv->savedColormap);
+		pScreenPriv->savedColormap = NULL;
+	    }
+	    pScreenPriv->dgaColormap = NULL;
+	    (*pScrn->EnableDisableFBAccess)(index, TRUE);
+
+	    FreeMarkedVisuals(pScreen);
+	}
+      
+        pScreenPriv->grabMouse = FALSE;
+        pScreenPriv->grabKeyboard = FALSE;
+
+	return Success;
+   }
+
+   if(!pScrn->vtSema && !pScreenPriv->current) /* Really switched away */
+	return BadAlloc;
+      
+   if((num > 0) && (num <= pScreenPriv->numModes))
+	pMode = &(pScreenPriv->modes[num - 1]);
+   else
+	return BadValue;
+
+   if(!(device = (DGADevicePtr)malloc(sizeof(DGADeviceRec))))
+	return BadAlloc;
+
+   if(!pScreenPriv->current) {
+	Bool oldVTSema = pScrn->vtSema;
+
+	pScrn->vtSema = FALSE;  /* kludge until we rewrite VT switching */
+	(*pScrn->EnableDisableFBAccess)(index, FALSE);
+	pScrn->vtSema = oldVTSema;
+   } 
+
+   if(!(*pScreenPriv->funcs->SetMode)(pScrn, pMode)) {
+	free(device);
+	return BadAlloc;
+   }
+
+   pScrn->currentMode = pMode->mode;
+
+   if(!pScreenPriv->current && !pScreenPriv->input) {
+	/* if it's multihead we need to warp the cursor off of
+	   our screen so it doesn't get trapped  */
+   } 
+
+   pScrn->vtSema = FALSE;
+
+   if(pScreenPriv->current) {
+	PixmapPtr oldPix = pScreenPriv->current->pPix;
+	if(oldPix) {
+	    if(oldPix->drawable.id)
+		FreeResource(oldPix->drawable.id, RT_NONE);
+	    else
+		(*pScreen->DestroyPixmap)(oldPix);
+	}
+	free(pScreenPriv->current);
+	pScreenPriv->current = NULL;
+   } 
+
+   if(pMode->flags & DGA_PIXMAP_AVAILABLE) {
+	if((pPix = (*pScreen->CreatePixmap)(pScreen, 0, 0, pMode->depth, 0))) {
+	    (*pScreen->ModifyPixmapHeader)(pPix, 
+			pMode->pixmapWidth, pMode->pixmapHeight,
+			pMode->depth, pMode->bitsPerPixel, 
+			pMode->bytesPerScanline,
+ 			(pointer)(pMode->address));
+        }
+   }
+
+   devRet->mode = device->mode = pMode;
+   devRet->pPix = device->pPix = pPix;
+   pScreenPriv->current = device;
+   pScreenPriv->pixmapMode = FALSE;
+   pScreenPriv->grabMouse = TRUE;
+   pScreenPriv->grabKeyboard = TRUE;
+
+   if (!mieq_installed) {
+      mieqSetHandler(ET_DGAEvent, DGAHandleEvent);
+      mieq_installed = TRUE;
+   }
+
+   return Success;
+}
+
+
+
+/*********** exported ones ***************/
+
+void
+DGASetInputMode(int index, Bool keyboard, Bool mouse)
+{
+   ScreenPtr pScreen = screenInfo.screens[index];
+   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
+
+   if (pScreenPriv)
+   {
+      pScreenPriv->grabMouse = mouse;
+      pScreenPriv->grabKeyboard = keyboard;
+
+      if (!mieq_installed) {
+          mieqSetHandler(ET_DGAEvent, DGAHandleEvent);
+          mieq_installed = TRUE;
+      }
+   }
+}
+
+Bool
+DGAChangePixmapMode(int index, int *x, int *y, int mode)
+{
+   DGAScreenPtr pScreenPriv;
+   DGADevicePtr pDev;
+   DGAModePtr   pMode;
+   PixmapPtr    pPix;
+
+   if(!DGAScreenKeyRegistered)
+	return FALSE;
+
+   pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
+
+   if(!pScreenPriv || !pScreenPriv->current || !pScreenPriv->current->pPix)
+	return FALSE;
+
+   pDev = pScreenPriv->current;
+   pPix = pDev->pPix;
+   pMode = pDev->mode;
+
+   if(mode) {
+	int shift = 2;
+
+	if(*x > (pMode->pixmapWidth - pMode->viewportWidth))
+	    *x = pMode->pixmapWidth - pMode->viewportWidth;
+	if(*y > (pMode->pixmapHeight - pMode->viewportHeight))
+	    *y = pMode->pixmapHeight - pMode->viewportHeight;
+
+	switch(xf86Screens[index]->bitsPerPixel) {
+	case 16: shift = 1;  break;
+	case 32: shift = 0;  break;
+	default: break;
+	}
+
+	if(BITMAP_SCANLINE_PAD == 64)
+	    shift++;
+
+	*x = (*x >> shift) << shift;
+
+	pPix->drawable.x = *x; 
+	pPix->drawable.y = *y; 
+	pPix->drawable.width = pMode->viewportWidth; 
+	pPix->drawable.height = pMode->viewportHeight; 
+   } else {
+	pPix->drawable.x = 0; 
+	pPix->drawable.y = 0; 
+	pPix->drawable.width = pMode->pixmapWidth; 
+	pPix->drawable.height = pMode->pixmapHeight; 
+   }
+   pPix->drawable.serialNumber = NEXT_SERIAL_NUMBER;
+   pScreenPriv->pixmapMode = mode;
+
+   return TRUE;
+}
+
+Bool
+DGAAvailable(int index) 
+{
+   if(!DGAScreenKeyRegistered)
+	return FALSE;
+   
+   if(DGA_GET_SCREEN_PRIV(screenInfo.screens[index]))
+	return TRUE;
+
+   return FALSE;
+}
+
+Bool
+DGAActive(int index) 
+{
+   DGAScreenPtr pScreenPriv;
+
+   if(!DGAScreenKeyRegistered)
+	return FALSE;
+
+   pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
+
+   if(pScreenPriv && pScreenPriv->current)
+	return TRUE;
+
+   return FALSE;
+}
+
+
+
+/* Called by the event code in case the server is abruptly terminated */
+
+void
+DGAShutdown(void)
+{
+    ScrnInfoPtr pScrn;
+    int i;
+
+    if(!DGAScreenKeyRegistered)
+	return;
+
+    for(i = 0; i < screenInfo.numScreens; i++) {
+	pScrn = xf86Screens[i];
+
+	(void)(*pScrn->SetDGAMode)(pScrn->scrnIndex, 0, NULL);
+    }
+}
+
+/* Called by the extension to initialize a mode */
+
+int
+DGASetMode(
+   int index,
+   int num,
+   XDGAModePtr mode,
+   PixmapPtr *pPix
+){
+    ScrnInfoPtr pScrn = xf86Screens[index];
+    DGADeviceRec device;
+    int ret;
+
+    /* We rely on the extension to check that DGA is available */ 
+
+    ret = (*pScrn->SetDGAMode)(index, num, &device);
+    if((ret == Success) && num) {
+	DGACopyModeInfo(device.mode, mode);
+	*pPix = device.pPix;
+    }
+
+    return ret;
+}
+
+/* Called from the extension to let the DDX know which events are requested */
+
+void
+DGASelectInput(
+   int index,
+   ClientPtr client,
+   long mask
+){
+   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
+
+   /* We rely on the extension to check that DGA is available */
+   pScreenPriv->client = client;
+   pScreenPriv->input = mask;
+}
+
+int
+DGAGetViewportStatus(int index) 
+{
+   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
+
+   /* We rely on the extension to check that DGA is active */ 
+
+   if (!pScreenPriv->funcs->GetViewport)
+      return 0;
+
+   return (*pScreenPriv->funcs->GetViewport)(pScreenPriv->pScrn);
+}
+
+int
+DGASetViewport(
+   int index,
+   int x, int y,
+   int mode
+){
+   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
+
+   if (pScreenPriv->funcs->SetViewport)
+      (*pScreenPriv->funcs->SetViewport)(pScreenPriv->pScrn, x, y, mode);
+   return Success;
+}
+
+
+static int
+BitsClear(CARD32 data)
+{
+   int bits = 0;
+   CARD32 mask;
+
+   for(mask = 1; mask; mask <<= 1) {
+	if(!(data & mask)) bits++;
+	else break;
+   }
+
+   return bits;
+}
+
+int
+DGACreateColormap(int index, ClientPtr client, int id, int mode, int alloc)
+{
+   ScreenPtr pScreen = screenInfo.screens[index];
+   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
+   FakedVisualList *fvlp;
+   VisualPtr pVisual;
+   DGAModePtr pMode;
+   ColormapPtr pmap;
+
+   if(!mode || (mode > pScreenPriv->numModes))
+	return BadValue;
+
+   if((alloc != AllocNone) && (alloc != AllocAll))
+	return BadValue;
+
+   pMode = &(pScreenPriv->modes[mode - 1]);
+
+   if(!(pVisual = malloc(sizeof(VisualRec))))
+	return BadAlloc;
+
+   pVisual->vid = FakeClientID(0);
+   pVisual->class = pMode->visualClass;
+   pVisual->nplanes = pMode->depth;
+   pVisual->ColormapEntries = 1 << pMode->depth;
+   pVisual->bitsPerRGBValue = (pMode->depth + 2) / 3;
+
+   switch (pVisual->class) {
+   case PseudoColor:
+   case GrayScale:
+   case StaticGray:
+	pVisual->bitsPerRGBValue = 8; /* not quite */
+	pVisual->redMask     = 0;
+	pVisual->greenMask   = 0;
+	pVisual->blueMask    = 0;
+	pVisual->offsetRed   = 0;
+	pVisual->offsetGreen = 0;
+	pVisual->offsetBlue  = 0;
+	break;
+   case DirectColor:
+   case TrueColor:
+	pVisual->ColormapEntries = 1 << pVisual->bitsPerRGBValue;
+                /* fall through */
+   case StaticColor:
+	pVisual->redMask = pMode->red_mask;
+	pVisual->greenMask = pMode->green_mask;
+	pVisual->blueMask = pMode->blue_mask;
+	pVisual->offsetRed   = BitsClear(pVisual->redMask);
+	pVisual->offsetGreen = BitsClear(pVisual->greenMask);
+	pVisual->offsetBlue  = BitsClear(pVisual->blueMask);
+   }
+
+   if(!(fvlp = malloc(sizeof(FakedVisualList)))) {
+	free(pVisual);
+	return BadAlloc;
+   }
+
+   fvlp->free = FALSE;
+   fvlp->pVisual = pVisual;
+   fvlp->next = pScreenPriv->fakedVisuals;
+   pScreenPriv->fakedVisuals = fvlp;
+
+   LEGAL_NEW_RESOURCE(id, client);
+
+   return CreateColormap(id, pScreen, pVisual, &pmap, alloc, client->index);
+}
+
+/*  Called by the extension to install a colormap on DGA active screens */
+
+void
+DGAInstallCmap(ColormapPtr cmap)
+{
+    ScreenPtr pScreen = cmap->pScreen;
+    DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
+
+    /* We rely on the extension to check that DGA is active */ 
+
+    if(!pScreenPriv->dgaColormap) 
+	pScreenPriv->savedColormap = GetInstalledmiColormap(pScreen);
+
+    pScreenPriv->dgaColormap = cmap;    
+
+    (*pScreen->InstallColormap)(cmap);
+}
+
+int
+DGASync(int index)
+{
+   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
+   
+   /* We rely on the extension to check that DGA is active */
+
+   if (pScreenPriv->funcs->Sync)
+      (*pScreenPriv->funcs->Sync)(pScreenPriv->pScrn);
+
+   return Success;
+}
+
+int
+DGAFillRect(
+   int index,
+   int x, int y, int w, int h,
+   unsigned long color
+){
+   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
+   
+   /* We rely on the extension to check that DGA is active */
+
+   if(pScreenPriv->funcs->FillRect && 
+	(pScreenPriv->current->mode->flags & DGA_FILL_RECT)) {
+
+	(*pScreenPriv->funcs->FillRect)(pScreenPriv->pScrn, x, y, w, h, color);
+	return Success;
+   }
+   return BadMatch;
+}
+
+int
+DGABlitRect(
+   int index,
+   int srcx, int srcy, 
+   int w, int h, 
+   int dstx, int dsty
+){
+   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
+   
+   /* We rely on the extension to check that DGA is active */
+
+   if(pScreenPriv->funcs->BlitRect &&
+	(pScreenPriv->current->mode->flags & DGA_BLIT_RECT)) {
+
+	(*pScreenPriv->funcs->BlitRect)(pScreenPriv->pScrn, 	
+		srcx, srcy, w, h, dstx, dsty);
+	return Success;
+   }
+   return BadMatch;
+}
+
+int
+DGABlitTransRect(
+   int index,
+   int srcx, int srcy, 
+   int w, int h, 
+   int dstx, int dsty,
+   unsigned long color
+){
+   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
+   
+   /* We rely on the extension to check that DGA is active */
+
+   if(pScreenPriv->funcs->BlitTransRect && 
+	(pScreenPriv->current->mode->flags & DGA_BLIT_RECT_TRANS)) {
+
+	(*pScreenPriv->funcs->BlitTransRect)(pScreenPriv->pScrn, 	
+		srcx, srcy, w, h, dstx, dsty, color);
+	return Success;
+   }
+   return BadMatch;
+}
+
+
+int
+DGAGetModes(int index)
+{
+   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
+   /* We rely on the extension to check that DGA is available */
+
+   return pScreenPriv->numModes;
+}
+
+
+int
+DGAGetModeInfo(
+  int index,
+  XDGAModePtr mode,
+  int num
+){
+   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
+   /* We rely on the extension to check that DGA is available */
+
+   if((num <= 0) || (num > pScreenPriv->numModes))
+	return BadValue;
+
+   DGACopyModeInfo(&(pScreenPriv->modes[num - 1]), mode);
+
+   return Success;
+}
+
+
+static void
+DGACopyModeInfo(
+   DGAModePtr mode,
+   XDGAModePtr xmode
+){
+   DisplayModePtr dmode = mode->mode;
+
+   xmode->num = mode->num;
+   xmode->name = dmode->name;
+   xmode->VSync_num = (int)(dmode->VRefresh * 1000.0); 
+   xmode->VSync_den = 1000;
+   xmode->flags = mode->flags;
+   xmode->imageWidth = mode->imageWidth;
+   xmode->imageHeight = mode->imageHeight;
+   xmode->pixmapWidth = mode->pixmapWidth;
+   xmode->pixmapHeight = mode->pixmapHeight;
+   xmode->bytesPerScanline = mode->bytesPerScanline;
+   xmode->byteOrder = mode->byteOrder;
+   xmode->depth = mode->depth;
+   xmode->bitsPerPixel = mode->bitsPerPixel;
+   xmode->red_mask = mode->red_mask;
+   xmode->green_mask = mode->green_mask;
+   xmode->blue_mask = mode->blue_mask;
+   xmode->visualClass = mode->visualClass;
+   xmode->viewportWidth = mode->viewportWidth;
+   xmode->viewportHeight = mode->viewportHeight;
+   xmode->xViewportStep = mode->xViewportStep;
+   xmode->yViewportStep = mode->yViewportStep;
+   xmode->maxViewportX = mode->maxViewportX;
+   xmode->maxViewportY = mode->maxViewportY;
+   xmode->viewportFlags = mode->viewportFlags;
+   xmode->reserved1 = mode->reserved1;
+   xmode->reserved2 = mode->reserved2;
+   xmode->offset = mode->offset;
+
+   if(dmode->Flags & V_INTERLACE) xmode->flags |= DGA_INTERLACED;
+   if(dmode->Flags & V_DBLSCAN) xmode->flags |= DGA_DOUBLESCAN;
+}
+
+
+Bool
+DGAVTSwitch(void)
+{
+    ScreenPtr pScreen;
+    int i;
+
+    for(i = 0; i < screenInfo.numScreens; i++) {
+       pScreen = screenInfo.screens[i];	
+
+       /* Alternatively, this could send events to DGA clients */
+
+       if(DGAScreenKeyRegistered) {
+	   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
+
+	   if(pScreenPriv && pScreenPriv->current)
+		return FALSE;
+       }
+    }
+
+   return TRUE;
+}
+
+Bool
+DGAStealKeyEvent(DeviceIntPtr dev, int index, int key_code, int is_down)
+{
+   DGAScreenPtr pScreenPriv;
+   DGAEvent     event;
+
+   if(!DGAScreenKeyRegistered) /* no DGA */
+        return FALSE;
+
+   if (key_code < 8 || key_code > 255)
+       return FALSE;
+
+   pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
+
+   if(!pScreenPriv || !pScreenPriv->grabKeyboard) /* no direct mode */
+        return FALSE; 
+
+    memset(&event, 0, sizeof(event));
+    event.header = ET_Internal;
+    event.type = ET_DGAEvent;
+    event.length = sizeof(event);
+    event.time = GetTimeInMillis();
+    event.subtype = (is_down ? ET_KeyPress : ET_KeyRelease);
+    event.detail = key_code;
+    event.dx = 0;
+    event.dy = 0;
+    mieqEnqueue (dev, (InternalEvent*)&event);
+
+   return TRUE;
+}  
+
+Bool
+DGAStealMotionEvent(DeviceIntPtr dev, int index, int dx, int dy)
+{
+   DGAScreenPtr pScreenPriv;
+   DGAEvent event;
+
+   if(!DGAScreenKeyRegistered) /* no DGA */
+        return FALSE;
+    
+   pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
+
+   if(!pScreenPriv || !pScreenPriv->grabMouse) /* no direct mode */
+        return FALSE;
+
+    memset(&event, 0, sizeof(event));
+    event.header = ET_Internal;
+    event.type = ET_DGAEvent;
+    event.length = sizeof(event);
+    event.time = GetTimeInMillis();
+    event.subtype = ET_Motion;
+    event.detail = 0;
+    event.dx = dx;
+    event.dy = dy;
+    mieqEnqueue (dev, (InternalEvent*)&event);
+    return TRUE;
+}
+
+Bool
+DGAStealButtonEvent(DeviceIntPtr dev, int index, int button, int is_down)
+{
+    DGAScreenPtr pScreenPriv;
+    DGAEvent event;
+
+    if(!DGAScreenKeyRegistered) /* no DGA */
+        return FALSE;
+    
+    pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
+
+    if (!pScreenPriv || !pScreenPriv->grabMouse)
+        return FALSE;
+
+    memset(&event, 0, sizeof(event));
+    event.header = ET_Internal;
+    event.type = ET_DGAEvent;
+    event.length = sizeof(event);
+    event.time = GetTimeInMillis();
+    event.subtype = (is_down ? ET_ButtonPress : ET_ButtonRelease);
+    event.detail = button;
+    event.dx = 0;
+    event.dy = 0;
+    mieqEnqueue (dev, (InternalEvent*)&event);
+
+    return TRUE;
+}
+
+/* We have the power to steal or modify events that are about to get queued */
+
+#define NoSuchEvent 0x80000000	/* so doesn't match NoEventMask */
+static Mask filters[] =
+{
+	NoSuchEvent,		       /* 0 */
+	NoSuchEvent,		       /* 1 */
+	KeyPressMask,		       /* KeyPress */
+	KeyReleaseMask,		       /* KeyRelease */
+	ButtonPressMask,	       /* ButtonPress */
+	ButtonReleaseMask,	       /* ButtonRelease */
+	PointerMotionMask,	       /* MotionNotify (initial state) */
+};
+
+static void
+DGAProcessKeyboardEvent (ScreenPtr pScreen, DGAEvent *event, DeviceIntPtr keybd)
+{
+    KeyClassPtr	    keyc = keybd->key;
+    DGAScreenPtr    pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
+    DeviceIntPtr    pointer = GetPairedDevice(keybd);
+    DeviceEvent     ev;
+
+    memset(&ev, 0, sizeof(ev));
+    ev.header = ET_Internal;
+    ev.length = sizeof(ev);
+    ev.detail.key = event->detail;
+    ev.type = event->subtype;
+    ev.root_x = 0;
+    ev.root_y = 0;
+    ev.corestate = XkbStateFieldFromRec(&keyc->xkbInfo->state);
+    ev.corestate |= pointer->button->state;
+
+    UpdateDeviceState(keybd, &ev);
+
+    /*
+     * Deliver the DGA event
+     */
+    if (pScreenPriv->client)
+    {
+        dgaEvent de;
+        de.u.u.type = *XDGAEventBase + GetCoreType((InternalEvent*)&ev);
+        de.u.u.detail = event->detail;
+        de.u.event.time = event->time;
+        de.u.event.dx = event->dx;
+        de.u.event.dy = event->dy;
+        de.u.event.screen = pScreen->myNum;
+        de.u.event.state = ev.corestate;
+
+	/* If the DGA client has selected input, then deliver based on the usual filter */
+	TryClientEvents (pScreenPriv->client, keybd, (xEvent *)&de, 1,
+			 filters[ev.type], pScreenPriv->input, 0);
+    }
+    else
+    {
+	/* If the keyboard is actively grabbed, deliver a grabbed core event */
+	if (keybd->deviceGrab.grab && !keybd->deviceGrab.fromPassiveGrab)
+	{
+            ev.detail.key = event->detail;
+            ev.time       = event->time;
+            ev.root_x     = event->dx;
+            ev.root_y     = event->dy;
+            ev.corestate  = event->state;
+            ev.deviceid   = keybd->id;
+	    DeliverGrabbedEvent ((InternalEvent*)&ev, keybd, FALSE);
+	}
+    }
+}
+
+static void
+DGAProcessPointerEvent (ScreenPtr pScreen, DGAEvent *event, DeviceIntPtr mouse)
+{
+    ButtonClassPtr  butc = mouse->button;
+    DGAScreenPtr    pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
+    DeviceEvent     ev;
+    DeviceIntPtr    master = GetMaster(mouse, MASTER_KEYBOARD);
+
+    memset(&ev, 0, sizeof(ev));
+    ev.header = ET_Internal;
+    ev.length = sizeof(ev);
+    ev.type = event->subtype;
+    ev.corestate  = butc ? butc->state : 0;
+    if (master && master->key)
+        ev.corestate |= XkbStateFieldFromRec(&master->key->xkbInfo->state);
+
+    UpdateDeviceState(mouse, &ev);
+
+    /*
+     * Deliver the DGA event
+     */
+    if (pScreenPriv->client)
+    {
+        dgaEvent        de;
+        int		coreEquiv;
+
+        coreEquiv = GetCoreType((InternalEvent*)&ev);
+
+        de.u.u.type = *XDGAEventBase + coreEquiv;
+        de.u.u.detail = event->detail;
+        de.u.event.time = event->time;
+        de.u.event.dx = event->dx;
+        de.u.event.dy = event->dy;
+        de.u.event.screen = pScreen->myNum;
+        de.u.event.state = ev.corestate;
+
+	/* If the DGA client has selected input, then deliver based on the usual filter */
+	TryClientEvents (pScreenPriv->client, mouse, (xEvent *)&de, 1,
+			 filters[coreEquiv], pScreenPriv->input, 0);
+    }
+    else
+    {
+	/* If the pointer is actively grabbed, deliver a grabbed core event */
+	if (mouse->deviceGrab.grab && !mouse->deviceGrab.fromPassiveGrab)
+	{
+            ev.detail.button    = event->detail;
+            ev.time             = event->time;
+            ev.root_x           = event->dx;
+            ev.root_y           = event->dy;
+            ev.corestate        = event->state;
+            /* DGA is core only, so valuators.data doesn't actually matter.
+             * Mask must be set for EventToCore to create motion events. */
+            SetBit(ev.valuators.mask, 0);
+            SetBit(ev.valuators.mask, 1);
+	    DeliverGrabbedEvent ((InternalEvent*)&ev, mouse, FALSE);
+	}
+    }
+}
+
+Bool
+DGAOpenFramebuffer(
+   int index,
+   char **name,
+   unsigned char **mem,
+   int *size,
+   int *offset,
+   int *flags
+){
+   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
+
+   /* We rely on the extension to check that DGA is available */
+
+   return (*pScreenPriv->funcs->OpenFramebuffer)(pScreenPriv->pScrn, 
+				name, mem, size, offset, flags);
+}
+
+void
+DGACloseFramebuffer(int index)
+{
+   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
+
+   /* We rely on the extension to check that DGA is available */
+   if(pScreenPriv->funcs->CloseFramebuffer)
+	(*pScreenPriv->funcs->CloseFramebuffer)(pScreenPriv->pScrn);
+}
+
+/*  For DGA 1.0 backwards compatibility only */
+
+int
+DGAGetOldDGAMode(int index)
+{
+   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
+   ScrnInfoPtr pScrn = pScreenPriv->pScrn;
+   DGAModePtr mode;
+   int i, w, h, p;
+
+   /* We rely on the extension to check that DGA is available */
+
+   w = pScrn->currentMode->HDisplay;
+   h = pScrn->currentMode->VDisplay;
+   p = pad_to_int32(pScrn->displayWidth * bits_to_bytes(pScrn->bitsPerPixel));
+
+   for(i = 0; i < pScreenPriv->numModes; i++) {
+	mode = &(pScreenPriv->modes[i]);
+  	      
+	if((mode->viewportWidth == w) && (mode->viewportHeight == h) &&
+		(mode->bytesPerScanline == p) && 
+		(mode->bitsPerPixel == pScrn->bitsPerPixel) &&
+		(mode->depth == pScrn->depth)) {
+
+		return mode->num;
+	}
+   }
+
+   return 0;
+}
+
+static void
+DGAHandleEvent(int screen_num, InternalEvent *ev, DeviceIntPtr device)
+{
+    DGAEvent	    *event= &ev->dga_event;
+    ScreenPtr       pScreen = screenInfo.screens[screen_num];
+    DGAScreenPtr    pScreenPriv;
+
+    /* no DGA */
+    if (!DGAScreenKeyRegistered || XDGAEventBase == 0)
+	return;
+    pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
+
+    /* DGA not initialized on this screen */
+    if (!pScreenPriv)
+	return;
+
+    if (!IsMaster(device))
+	return;
+
+    switch (event->subtype) {
+    case KeyPress:
+    case KeyRelease:
+	DGAProcessKeyboardEvent (pScreen, event, device);
+	break;
+    case MotionNotify:
+    case ButtonPress:
+    case ButtonRelease:
+	DGAProcessPointerEvent (pScreen, event, device);
+        break;
+    default:
+	break;
+    }
+}
diff --git a/xorg-server/hw/xfree86/common/xf86Module.h b/xorg-server/hw/xfree86/common/xf86Module.h
index 0e7be4dd7..49a98bd05 100644
--- a/xorg-server/hw/xfree86/common/xf86Module.h
+++ b/xorg-server/hw/xfree86/common/xf86Module.h
@@ -1,212 +1,212 @@
-/*

- * Copyright (c) 1997-2003 by The XFree86 Project, Inc.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included in

- * all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

- * OTHER DEALINGS IN THE SOFTWARE.

- *

- * Except as contained in this notice, the name of the copyright holder(s)

- * and author(s) shall not be used in advertising or otherwise to promote

- * the sale, use or other dealings in this Software without prior written

- * authorization from the copyright holder(s) and author(s).

- */

-

-/*

- * This file contains the parts of the loader interface that are visible

- * to modules.  This is the only loader-related header that modules should

- * include.

- *

- * It should include a bare minimum of other headers.

- *

- * Longer term, the module/loader code should probably live directly under

- * Xserver/.

- *

- * XXX This file arguably belongs in xfree86/loader/.

- */

-

-#ifndef _XF86MODULE_H

-#define _XF86MODULE_H

-

-#include "misc.h"

-#ifndef NULL

-#define NULL ((void *)0)

-#endif

-

-typedef enum {

-    LD_RESOLV_IFDONE		= 0,	/* only check if no more

-					   delays pending */

-    LD_RESOLV_NOW		= 1,	/* finish one delay step */

-    LD_RESOLV_FORCE		= 2	/* force checking... */

-} LoaderResolveOptions;

-

-#define DEFAULT_LIST ((char *)-1)

-

-/* This indicates a special module that doesn't have the usual entry point */

-#define EXTERN_MODULE ((pointer)-1)

-

-/* Built-in ABI classes.  These definitions must not be changed. */

-#define ABI_CLASS_NONE		NULL

-#define ABI_CLASS_ANSIC		"X.Org ANSI C Emulation"

-#define ABI_CLASS_VIDEODRV	"X.Org Video Driver"

-#define ABI_CLASS_XINPUT	"X.Org XInput driver"

-#define ABI_CLASS_EXTENSION	"X.Org Server Extension"

-#define ABI_CLASS_FONT		"X.Org Font Renderer"

-

-#define ABI_MINOR_MASK		0x0000FFFF

-#define ABI_MAJOR_MASK		0xFFFF0000

-#define GET_ABI_MINOR(v)	((v) & ABI_MINOR_MASK)

-#define GET_ABI_MAJOR(v)	(((v) & ABI_MAJOR_MASK) >> 16)

-#define SET_ABI_VERSION(maj, min) \

-		((((maj) << 16) & ABI_MAJOR_MASK) | ((min) & ABI_MINOR_MASK))

-

-/*

- * ABI versions.  Each version has a major and minor revision.  Modules

- * using lower minor revisions must work with servers of a higher minor

- * revision.  There is no compatibility between different major revisions.

- * Whenever the ABI_ANSIC_VERSION is changed, the others must also be

- * changed.  The minor revision mask is 0x0000FFFF and the major revision

- * mask is 0xFFFF0000.

- */

-#define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)

-#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(9, 0)

-#define ABI_XINPUT_VERSION	SET_ABI_VERSION(12, 1)

-#define ABI_EXTENSION_VERSION	SET_ABI_VERSION(5, 0)

-#define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)

-

-#define MODINFOSTRING1	0xef23fdc5

-#define MODINFOSTRING2	0x10dc023a

-

-#ifndef MODULEVENDORSTRING

-#define MODULEVENDORSTRING	"X.Org Foundation"

-#endif

-

-/* Error return codes for errmaj.  New codes must only be added at the end. */

-typedef enum {

-    LDR_NOERROR = 0,

-    LDR_NOMEM,		/* memory allocation failed */

-    LDR_NOENT,		/* Module file does not exist */

-    LDR_NOSUBENT,	/* pre-requsite file to be sub-loaded does not exist */

-    LDR_NOSPACE,	/* internal module array full */

-    LDR_NOMODOPEN,	/* module file could not be opened (check errmin) */

-    LDR_UNKTYPE,	/* file is not a recognized module type */

-    LDR_NOLOAD,		/* type specific loader failed */

-    LDR_ONCEONLY,	/* Module should only be loaded once (not an error) */

-    LDR_NOPORTOPEN,	/* could not open port (check errmin) */

-    LDR_NOHARDWARE,	/* could not query/initialize the hardware device */

-    LDR_MISMATCH,	/* the module didn't match the spec'd requirments */

-    LDR_BADUSAGE,	/* LoadModule is called with bad arguments */

-    LDR_INVALID,	/* The module doesn't have a valid ModuleData object */

-    LDR_BADOS,		/* The module doesn't support the OS */

-    LDR_MODSPECIFIC	/* A module-specific error in the SetupProc */

-} LoaderErrorCode;

-

-/*

- * Some common module classes.  The moduleclass can be used to identify

- * that modules loaded are of the correct type.  This is a finer

- * classification than the ABI classes even though the default set of

- * classes have the same names.  For example, not all modules that require

- * the video driver ABI are themselves video drivers.

- */

-#define MOD_CLASS_NONE		NULL

-#define MOD_CLASS_VIDEODRV	"X.Org Video Driver"

-#define MOD_CLASS_XINPUT	"X.Org XInput Driver"

-#define MOD_CLASS_FONT		"X.Org Font Renderer"

-#define MOD_CLASS_EXTENSION	"X.Org Server Extension"

-

-/* This structure is expected to be returned by the initfunc */

-typedef struct {

-    const char * modname;	/* name of module, e.g. "foo" */

-    const char * vendor;	/* vendor specific string */

-    CARD32	 _modinfo1_;	/* constant MODINFOSTRING1/2 to find */

-    CARD32	 _modinfo2_;	/* infoarea with a binary editor or sign tool */

-    CARD32	 xf86version;	/* contains XF86_VERSION_CURRENT */

-    CARD8	 majorversion;	/* module-specific major version */

-    CARD8	 minorversion;	/* module-specific minor version */

-    CARD16	 patchlevel;	/* module-specific patch level */

-    const char * abiclass;	/* ABI class that the module uses */

-    CARD32	 abiversion;	/* ABI version */

-    const char * moduleclass;	/* module class description */

-    CARD32	 checksum[4];	/* contains a digital signature of the */

-				/* version info structure */

-} XF86ModuleVersionInfo;

-

-/*

- * This structure can be used to callers of LoadModule and LoadSubModule to

- * specify version and/or ABI requirements.

- */

-typedef struct {

-    CARD8	 majorversion;	/* module-specific major version */

-    CARD8	 minorversion;	/* moudle-specific minor version */

-    CARD16	 patchlevel;	/* module-specific patch level */

-    const char * abiclass;	/* ABI class that the module uses */

-    CARD32	 abiversion;	/* ABI version */

-    const char * moduleclass;	/* module class */

-} XF86ModReqInfo;

-

-/* values to indicate unspecified fields in XF86ModReqInfo. */

-#define MAJOR_UNSPEC		0xFF

-#define MINOR_UNSPEC		0xFF

-#define PATCH_UNSPEC		0xFFFF

-#define ABI_VERS_UNSPEC		0xFFFFFFFF

-

-#define MODULE_VERSION_NUMERIC(maj, min, patch) \

-	((((maj) & 0xFF) << 24) | (((min) & 0xFF) << 16) | (patch & 0xFFFF))

-#define GET_MODULE_MAJOR_VERSION(vers)	(((vers) >> 24) & 0xFF)

-#define GET_MODULE_MINOR_VERSION(vers)	(((vers) >> 16) & 0xFF)

-#define GET_MODULE_PATCHLEVEL(vers)	((vers) & 0xFFFF)

-

-#define INITARGS void

-

-typedef void (*InitExtension)(INITARGS);

-

-typedef struct {

-    InitExtension	initFunc;

-    const char *	name;

-    Bool		*disablePtr;

-    InitExtension	setupFunc;	

-    const char **	initDependencies;

-} ExtensionModule;

-

-extern _X_EXPORT ExtensionModule *ExtensionModuleList;

-

-/* Prototypes for Loader functions that are exported to modules */

-extern _X_EXPORT pointer LoadSubModule(pointer, const char *, const char **,

-		      const char **, pointer, const XF86ModReqInfo *,

-		      int *, int *);

-extern _X_EXPORT void UnloadSubModule(pointer);

-extern _X_EXPORT void UnloadModule (pointer);

-extern _X_EXPORT pointer LoaderSymbol(const char *);

-extern _X_EXPORT char **LoaderListDirs(const char **, const char **);

-extern _X_EXPORT void LoaderFreeDirList(char **);

-extern _X_EXPORT void LoaderErrorMsg(const char *, const char *, int, int);

-extern _X_EXPORT void LoadExtension(ExtensionModule *, Bool);

-extern _X_EXPORT void LoaderGetOS(const char **name, int *major, int *minor, int *teeny);

-extern _X_EXPORT Bool LoaderShouldIgnoreABI(void);

-extern _X_EXPORT int LoaderGetABIVersion(const char *abiclass);

-

-typedef pointer (*ModuleSetupProc)(pointer, pointer, int *, int *);

-typedef void (*ModuleTearDownProc)(pointer);

-#define MODULESETUPPROTO(func) pointer func(pointer, pointer, int*, int*)

-#define MODULETEARDOWNPROTO(func) void func(pointer)

-

-typedef struct {

-    XF86ModuleVersionInfo *	vers;

-    ModuleSetupProc		setup;

-    ModuleTearDownProc		teardown;

-} XF86ModuleData;

-

-#endif /* _XF86STR_H */

+/*
+ * Copyright (c) 1997-2003 by The XFree86 Project, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name of the copyright holder(s)
+ * and author(s) shall not be used in advertising or otherwise to promote
+ * the sale, use or other dealings in this Software without prior written
+ * authorization from the copyright holder(s) and author(s).
+ */
+
+/*
+ * This file contains the parts of the loader interface that are visible
+ * to modules.  This is the only loader-related header that modules should
+ * include.
+ *
+ * It should include a bare minimum of other headers.
+ *
+ * Longer term, the module/loader code should probably live directly under
+ * Xserver/.
+ *
+ * XXX This file arguably belongs in xfree86/loader/.
+ */
+
+#ifndef _XF86MODULE_H
+#define _XF86MODULE_H
+
+#include "misc.h"
+#ifndef NULL
+#define NULL ((void *)0)
+#endif
+
+typedef enum {
+    LD_RESOLV_IFDONE		= 0,	/* only check if no more
+					   delays pending */
+    LD_RESOLV_NOW		= 1,	/* finish one delay step */
+    LD_RESOLV_FORCE		= 2	/* force checking... */
+} LoaderResolveOptions;
+
+#define DEFAULT_LIST ((char *)-1)
+
+/* This indicates a special module that doesn't have the usual entry point */
+#define EXTERN_MODULE ((pointer)-1)
+
+/* Built-in ABI classes.  These definitions must not be changed. */
+#define ABI_CLASS_NONE		NULL
+#define ABI_CLASS_ANSIC		"X.Org ANSI C Emulation"
+#define ABI_CLASS_VIDEODRV	"X.Org Video Driver"
+#define ABI_CLASS_XINPUT	"X.Org XInput driver"
+#define ABI_CLASS_EXTENSION	"X.Org Server Extension"
+#define ABI_CLASS_FONT		"X.Org Font Renderer"
+
+#define ABI_MINOR_MASK		0x0000FFFF
+#define ABI_MAJOR_MASK		0xFFFF0000
+#define GET_ABI_MINOR(v)	((v) & ABI_MINOR_MASK)
+#define GET_ABI_MAJOR(v)	(((v) & ABI_MAJOR_MASK) >> 16)
+#define SET_ABI_VERSION(maj, min) \
+		((((maj) << 16) & ABI_MAJOR_MASK) | ((min) & ABI_MINOR_MASK))
+
+/*
+ * ABI versions.  Each version has a major and minor revision.  Modules
+ * using lower minor revisions must work with servers of a higher minor
+ * revision.  There is no compatibility between different major revisions.
+ * Whenever the ABI_ANSIC_VERSION is changed, the others must also be
+ * changed.  The minor revision mask is 0x0000FFFF and the major revision
+ * mask is 0xFFFF0000.
+ */
+#define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)
+#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(9, 0)
+#define ABI_XINPUT_VERSION	SET_ABI_VERSION(12, 2)
+#define ABI_EXTENSION_VERSION	SET_ABI_VERSION(5, 0)
+#define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)
+
+#define MODINFOSTRING1	0xef23fdc5
+#define MODINFOSTRING2	0x10dc023a
+
+#ifndef MODULEVENDORSTRING
+#define MODULEVENDORSTRING	"X.Org Foundation"
+#endif
+
+/* Error return codes for errmaj.  New codes must only be added at the end. */
+typedef enum {
+    LDR_NOERROR = 0,
+    LDR_NOMEM,		/* memory allocation failed */
+    LDR_NOENT,		/* Module file does not exist */
+    LDR_NOSUBENT,	/* pre-requsite file to be sub-loaded does not exist */
+    LDR_NOSPACE,	/* internal module array full */
+    LDR_NOMODOPEN,	/* module file could not be opened (check errmin) */
+    LDR_UNKTYPE,	/* file is not a recognized module type */
+    LDR_NOLOAD,		/* type specific loader failed */
+    LDR_ONCEONLY,	/* Module should only be loaded once (not an error) */
+    LDR_NOPORTOPEN,	/* could not open port (check errmin) */
+    LDR_NOHARDWARE,	/* could not query/initialize the hardware device */
+    LDR_MISMATCH,	/* the module didn't match the spec'd requirments */
+    LDR_BADUSAGE,	/* LoadModule is called with bad arguments */
+    LDR_INVALID,	/* The module doesn't have a valid ModuleData object */
+    LDR_BADOS,		/* The module doesn't support the OS */
+    LDR_MODSPECIFIC	/* A module-specific error in the SetupProc */
+} LoaderErrorCode;
+
+/*
+ * Some common module classes.  The moduleclass can be used to identify
+ * that modules loaded are of the correct type.  This is a finer
+ * classification than the ABI classes even though the default set of
+ * classes have the same names.  For example, not all modules that require
+ * the video driver ABI are themselves video drivers.
+ */
+#define MOD_CLASS_NONE		NULL
+#define MOD_CLASS_VIDEODRV	"X.Org Video Driver"
+#define MOD_CLASS_XINPUT	"X.Org XInput Driver"
+#define MOD_CLASS_FONT		"X.Org Font Renderer"
+#define MOD_CLASS_EXTENSION	"X.Org Server Extension"
+
+/* This structure is expected to be returned by the initfunc */
+typedef struct {
+    const char * modname;	/* name of module, e.g. "foo" */
+    const char * vendor;	/* vendor specific string */
+    CARD32	 _modinfo1_;	/* constant MODINFOSTRING1/2 to find */
+    CARD32	 _modinfo2_;	/* infoarea with a binary editor or sign tool */
+    CARD32	 xf86version;	/* contains XF86_VERSION_CURRENT */
+    CARD8	 majorversion;	/* module-specific major version */
+    CARD8	 minorversion;	/* module-specific minor version */
+    CARD16	 patchlevel;	/* module-specific patch level */
+    const char * abiclass;	/* ABI class that the module uses */
+    CARD32	 abiversion;	/* ABI version */
+    const char * moduleclass;	/* module class description */
+    CARD32	 checksum[4];	/* contains a digital signature of the */
+				/* version info structure */
+} XF86ModuleVersionInfo;
+
+/*
+ * This structure can be used to callers of LoadModule and LoadSubModule to
+ * specify version and/or ABI requirements.
+ */
+typedef struct {
+    CARD8	 majorversion;	/* module-specific major version */
+    CARD8	 minorversion;	/* moudle-specific minor version */
+    CARD16	 patchlevel;	/* module-specific patch level */
+    const char * abiclass;	/* ABI class that the module uses */
+    CARD32	 abiversion;	/* ABI version */
+    const char * moduleclass;	/* module class */
+} XF86ModReqInfo;
+
+/* values to indicate unspecified fields in XF86ModReqInfo. */
+#define MAJOR_UNSPEC		0xFF
+#define MINOR_UNSPEC		0xFF
+#define PATCH_UNSPEC		0xFFFF
+#define ABI_VERS_UNSPEC		0xFFFFFFFF
+
+#define MODULE_VERSION_NUMERIC(maj, min, patch) \
+	((((maj) & 0xFF) << 24) | (((min) & 0xFF) << 16) | (patch & 0xFFFF))
+#define GET_MODULE_MAJOR_VERSION(vers)	(((vers) >> 24) & 0xFF)
+#define GET_MODULE_MINOR_VERSION(vers)	(((vers) >> 16) & 0xFF)
+#define GET_MODULE_PATCHLEVEL(vers)	((vers) & 0xFFFF)
+
+#define INITARGS void
+
+typedef void (*InitExtension)(INITARGS);
+
+typedef struct {
+    InitExtension	initFunc;
+    const char *	name;
+    Bool		*disablePtr;
+    InitExtension	setupFunc;	
+    const char **	initDependencies;
+} ExtensionModule;
+
+extern _X_EXPORT ExtensionModule *ExtensionModuleList;
+
+/* Prototypes for Loader functions that are exported to modules */
+extern _X_EXPORT pointer LoadSubModule(pointer, const char *, const char **,
+		      const char **, pointer, const XF86ModReqInfo *,
+		      int *, int *);
+extern _X_EXPORT void UnloadSubModule(pointer);
+extern _X_EXPORT void UnloadModule (pointer);
+extern _X_EXPORT pointer LoaderSymbol(const char *);
+extern _X_EXPORT char **LoaderListDirs(const char **, const char **);
+extern _X_EXPORT void LoaderFreeDirList(char **);
+extern _X_EXPORT void LoaderErrorMsg(const char *, const char *, int, int);
+extern _X_EXPORT void LoadExtension(ExtensionModule *, Bool);
+extern _X_EXPORT void LoaderGetOS(const char **name, int *major, int *minor, int *teeny);
+extern _X_EXPORT Bool LoaderShouldIgnoreABI(void);
+extern _X_EXPORT int LoaderGetABIVersion(const char *abiclass);
+
+typedef pointer (*ModuleSetupProc)(pointer, pointer, int *, int *);
+typedef void (*ModuleTearDownProc)(pointer);
+#define MODULESETUPPROTO(func) pointer func(pointer, pointer, int*, int*)
+#define MODULETEARDOWNPROTO(func) void func(pointer)
+
+typedef struct {
+    XF86ModuleVersionInfo *	vers;
+    ModuleSetupProc		setup;
+    ModuleTearDownProc		teardown;
+} XF86ModuleData;
+
+#endif /* _XF86STR_H */
diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.c b/xorg-server/hw/xfree86/common/xf86Xinput.c
index b9006ab07..74365e10b 100644
--- a/xorg-server/hw/xfree86/common/xf86Xinput.c
+++ b/xorg-server/hw/xfree86/common/xf86Xinput.c
@@ -1011,11 +1011,6 @@ xf86PostMotionEventM(DeviceIntPtr	device,
     DeviceEvent *event;
     int flags = 0;
 
-#if XFreeXDGA
-    int index;
-    int dx = 0, dy = 0;
-#endif
-
     if (valuator_mask_num_valuators(mask) > 0)
     {
         if (is_absolute)
@@ -1029,7 +1024,9 @@ xf86PostMotionEventM(DeviceIntPtr	device,
     if (valuator_mask_isset(mask, 0) ||
         valuator_mask_isset(mask, 1))
         if (miPointerGetScreen(device)) {
-            index = miPointerGetScreen(device)->myNum;
+            int index = miPointerGetScreen(device)->myNum;
+            int dx = 0, dy = 0;
+
             if (valuator_mask_isset(mask, 0))
             {
                 dx = valuator_mask_get(mask, 0);
@@ -1160,10 +1157,6 @@ xf86PostButtonEventM(DeviceIntPtr	device,
     int i = 0, nevents = 0;
     int flags = 0;
 
-#if XFreeXDGA
-    int index;
-#endif
-
     if (valuator_mask_num_valuators(mask) > 0)
     {
         if (is_absolute)
@@ -1174,7 +1167,8 @@ xf86PostButtonEventM(DeviceIntPtr	device,
 
 #if XFreeXDGA
     if (miPointerGetScreen(device)) {
-        index = miPointerGetScreen(device)->myNum;
+        int index = miPointerGetScreen(device)->myNum;
+
         if (DGAStealButtonEvent(device, index, button, is_down))
             return;
     }
@@ -1240,6 +1234,19 @@ xf86PostKeyEventM(DeviceIntPtr	device,
 {
     int i = 0, nevents = 0;
 
+#if XFreeXDGA
+    DeviceIntPtr pointer;
+
+    /* Some pointers send key events, paired device is wrong then. */
+    pointer = IsPointerDevice(device) ? device : GetPairedDevice(device);
+    if (miPointerGetScreen(pointer)) {
+        int index = miPointerGetScreen(pointer)->myNum;
+
+        if (DGAStealKeyEvent(device, index, key_code, is_down))
+            return;
+    }
+#endif
+
     if (is_absolute) {
         nevents = GetKeyboardValuatorEvents(xf86Events, device,
                                             is_down ? KeyPress : KeyRelease,