Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/common.py
	mesalib/docs/GL3.txt
	mesalib/scons/custom.py
	mesalib/scons/gallium.py
	mesalib/src/SConscript
	xorg-server/Xext/xtest.c
	xorg-server/dix/getevents.c
	xorg-server/dix/window.c
	xorg-server/exa/exa_accel.c
	xorg-server/exa/exa_migration_classic.c
	xorg-server/exa/exa_unaccel.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/ephyr.h
	xorg-server/hw/kdrive/ephyr/ephyrinit.c
	xorg-server/hw/kdrive/ephyr/hostx.c
	xorg-server/hw/kdrive/src/kdrive.h
	xorg-server/hw/kdrive/src/kinput.c
	xorg-server/hw/xfree86/common/xf86Init.c
	xorg-server/hw/xfree86/dri2/dri2.c
	xorg-server/hw/xnest/Init.c
	xorg-server/hw/xquartz/darwin.c
	xorg-server/hw/xquartz/darwinEvents.c
	xorg-server/hw/xquartz/darwinEvents.h
	xorg-server/hw/xquartz/darwinXinput.c
	xorg-server/hw/xwin/InitInput.c
	xorg-server/include/input.h
	xorg-server/include/window.h
	xorg-server/mi/mipointer.c
	xorg-server/test/Makefile.am
	xorg-server/test/xi2/protocol-eventconvert.c

5 files changed, 501 insertions, 494 deletions

diff --git a/xorg-server/hw/kdrive/src/kcmap.c b/xorg-server/hw/kdrive/src/kcmap.c
index 127c7a078..6e0fc1417 100644
--- a/xorg-server/hw/kdrive/src/kcmap.c
+++ b/xorg-server/hw/kdrive/src/kcmap.c
@@ -1,246 +1,246 @@
-/*

- * Copyright © 1999 Keith Packard

- *

- * Permission to use, copy, modify, distribute, and sell this software and its

- * documentation for any purpose is hereby granted without fee, provided that

- * the above copyright notice appear in all copies and that both that

- * copyright notice and this permission notice appear in supporting

- * documentation, and that the name of Keith Packard not be used in

- * advertising or publicity pertaining to distribution of the software without

- * specific, written prior permission.  Keith Packard makes no

- * representations about the suitability of this software for any purpose.  It

- * is provided "as is" without express or implied warranty.

- *

- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR

- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

- * PERFORMANCE OF THIS SOFTWARE.

- */

-

-#ifdef HAVE_CONFIG_H

-#include <kdrive-config.h>

-#endif

-#include "kdrive.h"

-

-/*

- * Put the entire colormap into the DAC

- */

-

-void

-KdSetColormap (ScreenPtr pScreen)

-{

-    KdScreenPriv(pScreen);

-    ColormapPtr	pCmap = pScreenPriv->pInstalledmap;

-    Pixel	pixels[KD_MAX_PSEUDO_SIZE];

-    xrgb	colors[KD_MAX_PSEUDO_SIZE];

-    xColorItem	defs[KD_MAX_PSEUDO_SIZE];

-    int		i;

-

-    if (!pScreenPriv->card->cfuncs->putColors)

-	return;

-    if (pScreenPriv->screen->fb.depth > KD_MAX_PSEUDO_DEPTH)

-	return;

-

-    if (!pScreenPriv->enabled)

-	return;

-

-    if (!pCmap)

-	return;

-

-    /*

-     * Make DIX convert pixels into RGB values -- this handles

-     * true/direct as well as pseudo/static visuals

-     */

-

-    for (i = 0; i < (1 << pScreenPriv->screen->fb.depth); i++)

-	pixels[i] = i;

-

-    QueryColors (pCmap, (1 << pScreenPriv->screen->fb.depth), pixels, colors, serverClient);

-

-    for (i = 0; i < (1 << pScreenPriv->screen->fb.depth); i++)

-    {

-	defs[i].pixel = i;

-	defs[i].red = colors[i].red;

-	defs[i].green = colors[i].green;

-	defs[i].blue = colors[i].blue;

-	defs[i].flags = DoRed|DoGreen|DoBlue;

-    }

-

-    (*pScreenPriv->card->cfuncs->putColors) (pCmap->pScreen,

-					     (1 << pScreenPriv->screen->fb.depth),

-					     defs);

-

-    /* recolor hardware cursor */

-    if (pScreenPriv->card->cfuncs->recolorCursor)

-	(*pScreenPriv->card->cfuncs->recolorCursor) (pCmap->pScreen, 0, 0);

-}

-

-/*

- * When the hardware is enabled, save the hardware colors and store

- * the current colormap

- */

-void

-KdEnableColormap (ScreenPtr pScreen)

-{

-    KdScreenPriv(pScreen);

-    int	    i;

-

-    if (!pScreenPriv->card->cfuncs->putColors)

-	return;

-

-    if (pScreenPriv->screen->fb.depth <= KD_MAX_PSEUDO_DEPTH)

-    {

-	for (i = 0; i < (1 << pScreenPriv->screen->fb.depth); i++)

-	    pScreenPriv->systemPalette[i].pixel = i;

-	(*pScreenPriv->card->cfuncs->getColors) (pScreen,

-						 (1 << pScreenPriv->screen->fb.depth),

-						 pScreenPriv->systemPalette);

-    }

-    KdSetColormap (pScreen);

-}

-

-void

-KdDisableColormap (ScreenPtr pScreen)

-{

-    KdScreenPriv(pScreen);

-

-    if (!pScreenPriv->card->cfuncs->putColors)

-	return;

-

-    if (pScreenPriv->screen->fb.depth <= KD_MAX_PSEUDO_DEPTH)

-    {

-	(*pScreenPriv->card->cfuncs->putColors) (pScreen,

-						 (1 << pScreenPriv->screen->fb.depth),

-						 pScreenPriv->systemPalette);

-    }

-}

-

-/*

- * KdInstallColormap

- *

- * This function is called when the server receives a request to install a

- * colormap or when the server needs to install one on its own, like when

- * there's no window manager running and the user has moved the pointer over

- * an X client window.  It needs to build an identity Windows palette for the

- * colormap and realize it into the Windows system palette.

- */

-void

-KdInstallColormap (ColormapPtr pCmap)

-{

-    KdScreenPriv(pCmap->pScreen);

-

-    if (pCmap == pScreenPriv->pInstalledmap)

-	return;

-

-    /* Tell X clients that the installed colormap is going away. */

-    if (pScreenPriv->pInstalledmap)

-	WalkTree(pScreenPriv->pInstalledmap->pScreen, TellLostMap,

-		 (pointer) &(pScreenPriv->pInstalledmap->mid));

-

-    /* Take note of the new installed colorscreen-> */

-    pScreenPriv->pInstalledmap = pCmap;

-

-    KdSetColormap (pCmap->pScreen);

-

-    /* Tell X clients of the new colormap */

-    WalkTree(pCmap->pScreen, TellGainedMap, (pointer) &(pCmap->mid));

-}

-

-/*

- * KdUninstallColormap

- *

- * This function uninstalls a colormap by either installing

- * the default X colormap or erasing the installed colormap pointer.

- * The default X colormap itself cannot be uninstalled.

- */

-void

-KdUninstallColormap (ColormapPtr pCmap)

-{

-    KdScreenPriv(pCmap->pScreen);

-    Colormap	defMapID;

-    ColormapPtr defMap;

-

-    /* ignore if not installed */

-    if (pCmap != pScreenPriv->pInstalledmap)

-	return;

-

-    /* ignore attempts to uninstall default colormap */

-    defMapID = pCmap->pScreen->defColormap;

-    if ((Colormap) pCmap->mid == defMapID)

-	return;

-

-    /* install default */

-    dixLookupResourceByType((pointer *)&defMap, defMapID, RT_COLORMAP,

-			    serverClient, DixInstallAccess);

-    if (defMap)

-	(*pCmap->pScreen->InstallColormap)(defMap);

-    else

-    {

-	/* uninstall and clear colormap pointer */

-	WalkTree(pCmap->pScreen, TellLostMap,

-		 (pointer) &(pCmap->mid));

-	pScreenPriv->pInstalledmap = 0;

-    }

-}

-

-int

-KdListInstalledColormaps (ScreenPtr pScreen, Colormap *pCmaps)

-{

-    KdScreenPriv(pScreen);

-    int		n = 0;

-

-    if (pScreenPriv->pInstalledmap)

-    {

-	*pCmaps++ = pScreenPriv->pInstalledmap->mid;

-	n++;

-    }

-    return n;

-}

-

-/*

- * KdStoreColors

- *

- * This function is called whenever the server receives a request to store

- * color values into one or more entries in the currently installed X

- * colormap; it can be either the default colormap or a private colorscreen->

- */

-void

-KdStoreColors (ColormapPtr pCmap, int ndef, xColorItem *pdefs)

-{

-    KdScreenPriv(pCmap->pScreen);

-    VisualPtr           pVisual;

-    xColorItem          expanddefs[KD_MAX_PSEUDO_SIZE];

-

-    if (pCmap != pScreenPriv->pInstalledmap)

-	return;

-

-    if (!pScreenPriv->card->cfuncs->putColors)

-	return;

-

-    if (pScreenPriv->screen->fb.depth > KD_MAX_PSEUDO_DEPTH)

-	return;

-

-    if (!pScreenPriv->enabled)

-	return;

-

-    /* Check for DirectColor or TrueColor being simulated on a PseudoColor device. */

-    pVisual = pCmap->pVisual;

-    if ((pVisual->class | DynamicClass) == DirectColor)

-    {

-	/*

-	 * Expand DirectColor or TrueColor color values into a PseudoColor

-	 * format.  Defer to the Color Framebuffer (CFB) code to do that.

-	 */

-	ndef = fbExpandDirectColors(pCmap, ndef, pdefs, expanddefs);

-	pdefs = expanddefs;

-    }

-

-    (*pScreenPriv->card->cfuncs->putColors) (pCmap->pScreen, ndef, pdefs);

-

-    /* recolor hardware cursor */

-    if (pScreenPriv->card->cfuncs->recolorCursor)

-	(*pScreenPriv->card->cfuncs->recolorCursor) (pCmap->pScreen, ndef, pdefs);

-}

+/*
+ * Copyright © 1999 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <kdrive-config.h>
+#endif
+#include "kdrive.h"
+
+/*
+ * Put the entire colormap into the DAC
+ */
+
+void
+KdSetColormap (ScreenPtr pScreen)
+{
+    KdScreenPriv(pScreen);
+    ColormapPtr	pCmap = pScreenPriv->pInstalledmap;
+    Pixel	pixels[KD_MAX_PSEUDO_SIZE];
+    xrgb	colors[KD_MAX_PSEUDO_SIZE];
+    xColorItem	defs[KD_MAX_PSEUDO_SIZE];
+    int		i;
+
+    if (!pScreenPriv->card->cfuncs->putColors)
+	return;
+    if (pScreenPriv->screen->fb.depth > KD_MAX_PSEUDO_DEPTH)
+	return;
+
+    if (!pScreenPriv->enabled)
+	return;
+
+    if (!pCmap)
+	return;
+
+    /*
+     * Make DIX convert pixels into RGB values -- this handles
+     * true/direct as well as pseudo/static visuals
+     */
+
+    for (i = 0; i < (1 << pScreenPriv->screen->fb.depth); i++)
+	pixels[i] = i;
+
+    QueryColors (pCmap, (1 << pScreenPriv->screen->fb.depth), pixels, colors, serverClient);
+
+    for (i = 0; i < (1 << pScreenPriv->screen->fb.depth); i++)
+    {
+	defs[i].pixel = i;
+	defs[i].red = colors[i].red;
+	defs[i].green = colors[i].green;
+	defs[i].blue = colors[i].blue;
+	defs[i].flags = DoRed|DoGreen|DoBlue;
+    }
+
+    (*pScreenPriv->card->cfuncs->putColors) (pCmap->pScreen,
+					     (1 << pScreenPriv->screen->fb.depth),
+					     defs);
+
+    /* recolor hardware cursor */
+    if (pScreenPriv->card->cfuncs->recolorCursor)
+	(*pScreenPriv->card->cfuncs->recolorCursor) (pCmap->pScreen, 0, 0);
+}
+
+/*
+ * When the hardware is enabled, save the hardware colors and store
+ * the current colormap
+ */
+void
+KdEnableColormap (ScreenPtr pScreen)
+{
+    KdScreenPriv(pScreen);
+    int	    i;
+
+    if (!pScreenPriv->card->cfuncs->putColors)
+	return;
+
+    if (pScreenPriv->screen->fb.depth <= KD_MAX_PSEUDO_DEPTH)
+    {
+	for (i = 0; i < (1 << pScreenPriv->screen->fb.depth); i++)
+	    pScreenPriv->systemPalette[i].pixel = i;
+	(*pScreenPriv->card->cfuncs->getColors) (pScreen,
+						 (1 << pScreenPriv->screen->fb.depth),
+						 pScreenPriv->systemPalette);
+    }
+    KdSetColormap (pScreen);
+}
+
+void
+KdDisableColormap (ScreenPtr pScreen)
+{
+    KdScreenPriv(pScreen);
+
+    if (!pScreenPriv->card->cfuncs->putColors)
+	return;
+
+    if (pScreenPriv->screen->fb.depth <= KD_MAX_PSEUDO_DEPTH)
+    {
+	(*pScreenPriv->card->cfuncs->putColors) (pScreen,
+						 (1 << pScreenPriv->screen->fb.depth),
+						 pScreenPriv->systemPalette);
+    }
+}
+
+/*
+ * KdInstallColormap
+ *
+ * This function is called when the server receives a request to install a
+ * colormap or when the server needs to install one on its own, like when
+ * there's no window manager running and the user has moved the pointer over
+ * an X client window.  It needs to build an identity Windows palette for the
+ * colormap and realize it into the Windows system palette.
+ */
+void
+KdInstallColormap (ColormapPtr pCmap)
+{
+    KdScreenPriv(pCmap->pScreen);
+
+    if (pCmap == pScreenPriv->pInstalledmap)
+	return;
+
+    /* Tell X clients that the installed colormap is going away. */
+    if (pScreenPriv->pInstalledmap)
+	WalkTree(pScreenPriv->pInstalledmap->pScreen, TellLostMap,
+		 (pointer) &(pScreenPriv->pInstalledmap->mid));
+
+    /* Take note of the new installed colorscreen-> */
+    pScreenPriv->pInstalledmap = pCmap;
+
+    KdSetColormap (pCmap->pScreen);
+
+    /* Tell X clients of the new colormap */
+    WalkTree(pCmap->pScreen, TellGainedMap, (pointer) &(pCmap->mid));
+}
+
+/*
+ * KdUninstallColormap
+ *
+ * This function uninstalls a colormap by either installing
+ * the default X colormap or erasing the installed colormap pointer.
+ * The default X colormap itself cannot be uninstalled.
+ */
+void
+KdUninstallColormap (ColormapPtr pCmap)
+{
+    KdScreenPriv(pCmap->pScreen);
+    Colormap	defMapID;
+    ColormapPtr defMap;
+
+    /* ignore if not installed */
+    if (pCmap != pScreenPriv->pInstalledmap)
+	return;
+
+    /* ignore attempts to uninstall default colormap */
+    defMapID = pCmap->pScreen->defColormap;
+    if ((Colormap) pCmap->mid == defMapID)
+	return;
+
+    /* install default */
+    dixLookupResourceByType((pointer *)&defMap, defMapID, RT_COLORMAP,
+			    serverClient, DixInstallAccess);
+    if (defMap)
+	(*pCmap->pScreen->InstallColormap)(defMap);
+    else
+    {
+	/* uninstall and clear colormap pointer */
+	WalkTree(pCmap->pScreen, TellLostMap,
+		 (pointer) &(pCmap->mid));
+	pScreenPriv->pInstalledmap = 0;
+    }
+}
+
+int
+KdListInstalledColormaps (ScreenPtr pScreen, Colormap *pCmaps)
+{
+    KdScreenPriv(pScreen);
+    int		n = 0;
+
+    if (pScreenPriv->pInstalledmap)
+    {
+	*pCmaps++ = pScreenPriv->pInstalledmap->mid;
+	n++;
+    }
+    return n;
+}
+
+/*
+ * KdStoreColors
+ *
+ * This function is called whenever the server receives a request to store
+ * color values into one or more entries in the currently installed X
+ * colormap; it can be either the default colormap or a private colorscreen->
+ */
+void
+KdStoreColors (ColormapPtr pCmap, int ndef, xColorItem *pdefs)
+{
+    KdScreenPriv(pCmap->pScreen);
+    VisualPtr           pVisual;
+    xColorItem          expanddefs[KD_MAX_PSEUDO_SIZE];
+
+    if (pCmap != pScreenPriv->pInstalledmap)
+	return;
+
+    if (!pScreenPriv->card->cfuncs->putColors)
+	return;
+
+    if (pScreenPriv->screen->fb.depth > KD_MAX_PSEUDO_DEPTH)
+	return;
+
+    if (!pScreenPriv->enabled)
+	return;
+
+    /* Check for DirectColor or TrueColor being simulated on a PseudoColor device. */
+    pVisual = pCmap->pVisual;
+    if ((pVisual->class | DynamicClass) == DirectColor)
+    {
+	/*
+	 * Expand DirectColor or TrueColor color values into a PseudoColor
+	 * format.  Defer to the Color Framebuffer (CFB) code to do that.
+	 */
+	ndef = fbExpandDirectColors(pCmap, ndef, pdefs, expanddefs);
+	pdefs = expanddefs;
+    }
+
+    (*pScreenPriv->card->cfuncs->putColors) (pCmap->pScreen, ndef, pdefs);
+
+    /* recolor hardware cursor */
+    if (pScreenPriv->card->cfuncs->recolorCursor)
+	(*pScreenPriv->card->cfuncs->recolorCursor) (pCmap->pScreen, ndef, pdefs);
+}
diff --git a/xorg-server/hw/kdrive/src/kdrive.h b/xorg-server/hw/kdrive/src/kdrive.h
index e5928aa2b..4d0201fa1 100644
--- a/xorg-server/hw/kdrive/src/kdrive.h
+++ b/xorg-server/hw/kdrive/src/kdrive.h
@@ -1,5 +1,5 @@
 /*

- * Copyright © 1999 Keith Packard

+ * Copyright © 1999 Keith Packard

  *

  * Permission to use, copy, modify, distribute, and sell this software and its

  * documentation for any purpose is hereby granted without fee, provided that

@@ -500,6 +500,8 @@ KdScreenInfoDispose (KdScreenInfo *si);
 /* kinput.c */

 void

 KdInitInput(void);

+void

+KdCloseInput(void);

 

 void

 KdAddPointerDriver(KdPointerDriver *);

diff --git a/xorg-server/hw/kdrive/src/kinfo.c b/xorg-server/hw/kdrive/src/kinfo.c
index 90fe37ae9..7055fbf4a 100644
--- a/xorg-server/hw/kdrive/src/kinfo.c
+++ b/xorg-server/hw/kdrive/src/kinfo.c
@@ -1,163 +1,163 @@
-/*

- * Copyright © 1999 Keith Packard

- *

- * Permission to use, copy, modify, distribute, and sell this software and its

- * documentation for any purpose is hereby granted without fee, provided that

- * the above copyright notice appear in all copies and that both that

- * copyright notice and this permission notice appear in supporting

- * documentation, and that the name of Keith Packard not be used in

- * advertising or publicity pertaining to distribution of the software without

- * specific, written prior permission.  Keith Packard makes no

- * representations about the suitability of this software for any purpose.  It

- * is provided "as is" without express or implied warranty.

- *

- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR

- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

- * PERFORMANCE OF THIS SOFTWARE.

- */

-

-#ifdef HAVE_CONFIG_H

-#include <kdrive-config.h>

-#endif

-#include "kdrive.h"

-

-KdCardInfo  *kdCardInfo;

-

-KdCardInfo *

-KdCardInfoAdd (KdCardFuncs  *funcs,

-	       void	    *closure)

-{

-    KdCardInfo	*ci, **prev;

-

-    ci = calloc(1, sizeof (KdCardInfo));

-    if (!ci)

-	return 0;

-    for (prev = &kdCardInfo; *prev; prev = &(*prev)->next);

-    *prev = ci;

-    ci->cfuncs = funcs;

-    ci->closure = closure;

-    ci->screenList = 0;

-    ci->selected = 0;

-    ci->next = 0;

-    return ci;

-}

-

-KdCardInfo *

-KdCardInfoLast (void)

-{

-    KdCardInfo	*ci;

-

-    if (!kdCardInfo)

-	return 0;

-    for (ci = kdCardInfo; ci->next; ci = ci->next);

-    return ci;

-}

-

-void

-KdCardInfoDispose (KdCardInfo *ci)

-{

-    KdCardInfo	**prev;

-

-    for (prev = &kdCardInfo; *prev; prev = &(*prev)->next)

-	if (*prev == ci)

-	{

-	    *prev = ci->next;

-	    free(ci);

-	    break;

-	}

-}

-

-KdScreenInfo *

-KdScreenInfoAdd (KdCardInfo *ci)

-{

-    KdScreenInfo    *si, **prev;

-    int		    n;

-

-    si = calloc(1, sizeof (KdScreenInfo));

-    if (!si)

-	return 0;

-    for (prev = &ci->screenList, n = 0; *prev; prev = &(*prev)->next, n++);

-    *prev = si;

-    si->next = 0;

-    si->card = ci;

-    si->mynum = n;

-    return si;

-}

-

-void

-KdScreenInfoDispose (KdScreenInfo *si)

-{

-    KdCardInfo	    *ci = si->card;

-    KdScreenInfo    **prev;

-

-    for (prev = &ci->screenList; *prev; prev = &(*prev)->next) {

-	if (*prev == si)

-	{

-	    *prev = si->next;

-	    free(si);

-	    if (!ci->screenList)

-		KdCardInfoDispose (ci);

-	    break;

-	}

-    }

-}

-

-KdPointerInfo *

-KdNewPointer (void)

-{

-    KdPointerInfo *pi;

-    int i;

-

-    pi = (KdPointerInfo *)calloc(1, sizeof(KdPointerInfo));

-    if (!pi)

-        return NULL;

-

-    pi->name = strdup("Generic Pointer");

-    pi->path = NULL;

-    pi->inputClass = KD_MOUSE;

-    pi->driver = NULL;

-    pi->driverPrivate = NULL;

-    pi->next = NULL;

-    pi->options = NULL;

-    pi->nAxes = 3;

-    pi->nButtons = KD_MAX_BUTTON;

-    for (i = 1; i < KD_MAX_BUTTON; i++)

-        pi->map[i] = i;

-

-    return pi;

-}

-

-void

-KdFreePointer(KdPointerInfo *pi)

-{

-    InputOption *option, *prev = NULL;

-

-    free(pi->name);

-    free(pi->path);

-

-    for (option = pi->options; option; option = option->next) {

-        free(prev);

-        free(option->key);

-        free(option->value);

-        prev = option;

-    }

-

-    free(prev);

-    free(pi);

-}

-

-void

-KdFreeKeyboard(KdKeyboardInfo *ki)

-{

-    free(ki->name);

-    free(ki->path);

-    free(ki->xkbRules);

-    free(ki->xkbModel);

-    free(ki->xkbLayout);

-    ki->next = NULL;

-    free(ki);

-}

+/*
+ * Copyright © 1999 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <kdrive-config.h>
+#endif
+#include "kdrive.h"
+
+KdCardInfo  *kdCardInfo;
+
+KdCardInfo *
+KdCardInfoAdd (KdCardFuncs  *funcs,
+	       void	    *closure)
+{
+    KdCardInfo	*ci, **prev;
+
+    ci = calloc(1, sizeof (KdCardInfo));
+    if (!ci)
+	return 0;
+    for (prev = &kdCardInfo; *prev; prev = &(*prev)->next);
+    *prev = ci;
+    ci->cfuncs = funcs;
+    ci->closure = closure;
+    ci->screenList = 0;
+    ci->selected = 0;
+    ci->next = 0;
+    return ci;
+}
+
+KdCardInfo *
+KdCardInfoLast (void)
+{
+    KdCardInfo	*ci;
+
+    if (!kdCardInfo)
+	return 0;
+    for (ci = kdCardInfo; ci->next; ci = ci->next);
+    return ci;
+}
+
+void
+KdCardInfoDispose (KdCardInfo *ci)
+{
+    KdCardInfo	**prev;
+
+    for (prev = &kdCardInfo; *prev; prev = &(*prev)->next)
+	if (*prev == ci)
+	{
+	    *prev = ci->next;
+	    free(ci);
+	    break;
+	}
+}
+
+KdScreenInfo *
+KdScreenInfoAdd (KdCardInfo *ci)
+{
+    KdScreenInfo    *si, **prev;
+    int		    n;
+
+    si = calloc(1, sizeof (KdScreenInfo));
+    if (!si)
+	return 0;
+    for (prev = &ci->screenList, n = 0; *prev; prev = &(*prev)->next, n++);
+    *prev = si;
+    si->next = 0;
+    si->card = ci;
+    si->mynum = n;
+    return si;
+}
+
+void
+KdScreenInfoDispose (KdScreenInfo *si)
+{
+    KdCardInfo	    *ci = si->card;
+    KdScreenInfo    **prev;
+
+    for (prev = &ci->screenList; *prev; prev = &(*prev)->next) {
+	if (*prev == si)
+	{
+	    *prev = si->next;
+	    free(si);
+	    if (!ci->screenList)
+		KdCardInfoDispose (ci);
+	    break;
+	}
+    }
+}
+
+KdPointerInfo *
+KdNewPointer (void)
+{
+    KdPointerInfo *pi;
+    int i;
+
+    pi = (KdPointerInfo *)calloc(1, sizeof(KdPointerInfo));
+    if (!pi)
+        return NULL;
+
+    pi->name = strdup("Generic Pointer");
+    pi->path = NULL;
+    pi->inputClass = KD_MOUSE;
+    pi->driver = NULL;
+    pi->driverPrivate = NULL;
+    pi->next = NULL;
+    pi->options = NULL;
+    pi->nAxes = 3;
+    pi->nButtons = KD_MAX_BUTTON;
+    for (i = 1; i < KD_MAX_BUTTON; i++)
+        pi->map[i] = i;
+
+    return pi;
+}
+
+void
+KdFreePointer(KdPointerInfo *pi)
+{
+    InputOption *option, *prev = NULL;
+
+    free(pi->name);
+    free(pi->path);
+
+    for (option = pi->options; option; option = option->next) {
+        free(prev);
+        free(option->key);
+        free(option->value);
+        prev = option;
+    }
+
+    free(prev);
+    free(pi);
+}
+
+void
+KdFreeKeyboard(KdKeyboardInfo *ki)
+{
+    free(ki->name);
+    free(ki->path);
+    free(ki->xkbRules);
+    free(ki->xkbModel);
+    free(ki->xkbLayout);
+    ki->next = NULL;
+    free(ki);
+}
diff --git a/xorg-server/hw/kdrive/src/kinput.c b/xorg-server/hw/kdrive/src/kinput.c
index 36bfc8574..3358357f4 100644
--- a/xorg-server/hw/kdrive/src/kinput.c
+++ b/xorg-server/hw/kdrive/src/kinput.c
@@ -1,6 +1,6 @@
 /*

- * Copyright © 1999 Keith Packard

- * Copyright © 2006 Nokia Corporation

+ * Copyright © 1999 Keith Packard

+ * Copyright © 2006 Nokia Corporation

  *

  * Permission to use, copy, modify, distribute, and sell this software and its

  * documentation for any purpose is hereby granted without fee, provided that

@@ -1328,6 +1328,12 @@ KdInitInput (void)
     mieqInit();

 }

 

+void

+KdCloseInput (void)

+{

+    mieqFini();

+}

+

 /*

  * Middle button emulation state machine

  *

@@ -2183,7 +2189,6 @@ void
 ProcessInputEvents (void)

 {

     mieqProcessInputEvents();

-    miPointerUpdateSprite(inputInfo.pointer);

     if (kdSwitchPending)

 	KdProcessSwitch ();

     KdCheckLock ();

diff --git a/xorg-server/hw/kdrive/src/kshadow.c b/xorg-server/hw/kdrive/src/kshadow.c
index 4454020f0..63bb87bc6 100644
--- a/xorg-server/hw/kdrive/src/kshadow.c
+++ b/xorg-server/hw/kdrive/src/kshadow.c
@@ -1,81 +1,81 @@
-/*

- * Copyright © 1999 Keith Packard

- *

- * Permission to use, copy, modify, distribute, and sell this software and its

- * documentation for any purpose is hereby granted without fee, provided that

- * the above copyright notice appear in all copies and that both that

- * copyright notice and this permission notice appear in supporting

- * documentation, and that the name of Keith Packard not be used in

- * advertising or publicity pertaining to distribution of the software without

- * specific, written prior permission.  Keith Packard makes no

- * representations about the suitability of this software for any purpose.  It

- * is provided "as is" without express or implied warranty.

- *

- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR

- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

- * PERFORMANCE OF THIS SOFTWARE.

- */

-

-#ifdef HAVE_CONFIG_H

-#include <kdrive-config.h>

-#endif

-#include "kdrive.h"

-

-Bool

-KdShadowFbAlloc (KdScreenInfo *screen, Bool rotate)

-{

-    int	    paddedWidth;

-    void    *buf;

-    int	    width = rotate ? screen->height : screen->width;

-    int	    height = rotate ? screen->width : screen->height;

-    int	    bpp = screen->fb.bitsPerPixel;

-

-    /* use fb computation for width */

-    paddedWidth = ((width * bpp + FB_MASK) >> FB_SHIFT) * sizeof (FbBits);

-    buf = malloc(paddedWidth * height);

-    if (!buf)

-	return FALSE;

-    if (screen->fb.shadow)

-	free(screen->fb.frameBuffer);

-    screen->fb.shadow = TRUE;

-    screen->fb.frameBuffer = buf;

-    screen->fb.byteStride = paddedWidth;

-    screen->fb.pixelStride = paddedWidth * 8 / bpp;

-    return TRUE;

-}

-

-void

-KdShadowFbFree (KdScreenInfo *screen)

-{

-    if (screen->fb.shadow)

-    {

-	free(screen->fb.frameBuffer);

-	screen->fb.frameBuffer = 0;

-	screen->fb.shadow = FALSE;

-    }

-}

-

-Bool

-KdShadowSet (ScreenPtr pScreen, int randr, ShadowUpdateProc update, ShadowWindowProc window)

-{

-    KdScreenPriv(pScreen);

-    KdScreenInfo *screen = pScreenPriv->screen;

-

-    shadowRemove (pScreen, pScreen->GetScreenPixmap(pScreen));

-    if(screen->fb.shadow)

-    {

-	return shadowAdd (pScreen, pScreen->GetScreenPixmap(pScreen),

-			  update, window, randr, 0);

-    }

-    return TRUE;

-}

-

-void

-KdShadowUnset (ScreenPtr pScreen)

-{

-    shadowRemove(pScreen, pScreen->GetScreenPixmap(pScreen));

-}

+/*
+ * Copyright © 1999 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <kdrive-config.h>
+#endif
+#include "kdrive.h"
+
+Bool
+KdShadowFbAlloc (KdScreenInfo *screen, Bool rotate)
+{
+    int	    paddedWidth;
+    void    *buf;
+    int	    width = rotate ? screen->height : screen->width;
+    int	    height = rotate ? screen->width : screen->height;
+    int	    bpp = screen->fb.bitsPerPixel;
+
+    /* use fb computation for width */
+    paddedWidth = ((width * bpp + FB_MASK) >> FB_SHIFT) * sizeof (FbBits);
+    buf = malloc(paddedWidth * height);
+    if (!buf)
+	return FALSE;
+    if (screen->fb.shadow)
+	free(screen->fb.frameBuffer);
+    screen->fb.shadow = TRUE;
+    screen->fb.frameBuffer = buf;
+    screen->fb.byteStride = paddedWidth;
+    screen->fb.pixelStride = paddedWidth * 8 / bpp;
+    return TRUE;
+}
+
+void
+KdShadowFbFree (KdScreenInfo *screen)
+{
+    if (screen->fb.shadow)
+    {
+	free(screen->fb.frameBuffer);
+	screen->fb.frameBuffer = 0;
+	screen->fb.shadow = FALSE;
+    }
+}
+
+Bool
+KdShadowSet (ScreenPtr pScreen, int randr, ShadowUpdateProc update, ShadowWindowProc window)
+{
+    KdScreenPriv(pScreen);
+    KdScreenInfo *screen = pScreenPriv->screen;
+
+    shadowRemove (pScreen, pScreen->GetScreenPixmap(pScreen));
+    if(screen->fb.shadow)
+    {
+	return shadowAdd (pScreen, pScreen->GetScreenPixmap(pScreen),
+			  update, window, randr, 0);
+    }
+    return TRUE;
+}
+
+void
+KdShadowUnset (ScreenPtr pScreen)
+{
+    shadowRemove(pScreen, pScreen->GetScreenPixmap(pScreen));
+}