svn merge ^/branches/released .

25 files changed, 124 insertions, 150 deletions

diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac
index 83ec3f9d0..6e12f3555 100644
--- a/xorg-server/configure.ac
+++ b/xorg-server/configure.ac
@@ -32,13 +32,20 @@ AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])

 AM_MAINTAINER_MODE

 

-# Require xorg-macros minimum of 1.10 for XORG_CHECK_SGML_DOCTOOLS

+# Require xorg-macros minimum of 1.13 for XORG_ENABLE_UNIT_TESTS

 m4_ifndef([XORG_MACROS_VERSION],

-          [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])])

+          [m4_fatal([must install xorg-macros 1.13 or later before running autoconf/autogen])])

 XORG_MACROS_VERSION(1.10)

 XORG_DEFAULT_OPTIONS

 XORG_WITH_DOXYGEN(1.6.1)

 XORG_CHECK_SGML_DOCTOOLS(1.5)

+XORG_ENABLE_DOCS

+XORG_ENABLE_DEVEL_DOCS

+XORG_WITH_XMLTO(0.0.20)

+XORG_WITH_FOP

+XORG_ENABLE_UNIT_TESTS

+XORG_WITH_GLIB

+XORG_LD_WRAP

 

 m4_ifndef([XORG_FONT_MACROS_VERSION], [m4_fatal([must install fontutil 1.1 or later before running autoconf/autogen])])

 XORG_FONT_MACROS_VERSION(1.1)

@@ -454,9 +461,6 @@ AC_ARG_ENABLE(werror,        AS_HELP_STRING([--enable-werror],
 AC_ARG_ENABLE(debug,         AS_HELP_STRING([--enable-debug],

 				  [Enable debugging (default: disabled)]),

 			        [DEBUGGING=$enableval], [DEBUGGING=no])

-AC_ARG_ENABLE(unit-tests,    AS_HELP_STRING([--enable-unit-tests],

-                                  [Enable unit-tests (default: auto)]),

-                                [UNITTESTS=$enableval], [UNITTESTS=auto])

 AC_ARG_ENABLE(use-sigio-by-default, AS_HELP_STRING([--enable-use-sigio-by-default]

   [Enable SIGIO input handlers by default (default: $USE_SIGIO_BY_DEFAULT)]),

                                 [USE_SIGIO_BY_DEFAULT=$enableval], [])

@@ -698,11 +702,6 @@ if test "x$INT10" = xyes; then
 	AC_CHECK_HEADERS([sys/vm86.h sys/io.h])

 fi

 

-XORG_ENABLE_DOCS

-XORG_ENABLE_DEVEL_DOCS

-XORG_WITH_XMLTO(0.0.20)

-XORG_WITH_FOP

-

 dnl Handle installing libxf86config

 AM_CONDITIONAL(INSTALL_LIBXF86CONFIG, [test "x$INSTALL_LIBXF86CONFIG" = xyes])

 

@@ -1271,50 +1270,6 @@ if test "x$DEBUGGING" = xyes; then
 fi

 AM_CONDITIONAL(DEBUG, [test "x$DEBUGGING" = xyes])

 

-# If unittests aren't explicitly disabled, check for required support

-if test "x$UNITTESTS" != xno ; then

-       PKG_CHECK_MODULES([GLIB], $LIBGLIB,

-                         [HAVE_GLIB=yes], [HAVE_GLIB=no])

-

-       # Check if linker supports -wrap, passed via compiler flags

-       # When cross-compiling, reports no, since unit tests run from

-       # "make check", so would be running on build machine,  not target

-       AC_MSG_CHECKING([whether the linker supports -wrap])

-       save_LDFLAGS="$LDFLAGS"

-       LDFLAGS="$LDFLAGS -Wl,-wrap,exit"

-       AC_RUN_IFELSE([AC_LANG_PROGRAM([[

-	void __wrap_exit (int s)

-	{

-	    __real_exit (0);

-	}]],

-	[[exit (1);]])],

-                     [linker_can_wrap="yes"],

-                     [linker_can_wrap="no"],

-                     [linker_can_wrap="no"])

-       AC_MSG_RESULT([$linker_can_wrap])

-       LDFLAGS="$save_LDFLAGS"

-fi

-

-if test "x$UNITTESTS" = xauto; then

-       if test "x$HAVE_GLIB" = xyes && test "x$linker_can_wrap" = xyes; then

-           UNITTESTS=yes

-       else

-           UNITTESTS=no

-       fi

-fi

-if test "x$UNITTESTS" = xyes; then

-       if test "x$HAVE_GLIB" = xno; then

-           AC_MSG_ERROR([glib required to build unit tests])

-       fi

-       if test "x$linker_can_wrap" = xno; then

-           AC_MSG_ERROR([ld -wrap support required to build unit tests])

-       fi

-       AC_DEFINE(UNITTESTS, 1, [Enable unit tests])

-       AC_SUBST([GLIB_LIBS])

-       AC_SUBST([GLIB_CFLAGS])

-fi

-AM_CONDITIONAL(UNITTESTS, [test "x$UNITTESTS" = xyes])

-

 AC_DEFINE(XTEST, 1, [Support XTest extension])

 AC_DEFINE(XSYNC, 1, [Support XSync extension])

 AC_DEFINE(XCMISC, 1, [Support XCMisc extension])

diff --git a/xorg-server/exa/exa.h b/xorg-server/exa/exa.h
index b65118883..3109607d8 100644
--- a/xorg-server/exa/exa.h
+++ b/xorg-server/exa/exa.h
@@ -712,7 +712,7 @@ typedef struct _ExaDriver {
      * driver MUST fill out new_fb_pitch with valid pitch of pixmap

      */

     void *(*CreatePixmap2)(ScreenPtr pScreen, int width, int height,

-			   int depth, int class, int bitsPerPixel,

+			   int depth, int usage_hint, int bitsPerPixel,

 			   int *new_fb_pitch);

     /** @} */

 } ExaDriverRec, *ExaDriverPtr;

diff --git a/xorg-server/exa/exa_classic.c b/xorg-server/exa/exa_classic.c
index 809b3f660..1a1467848 100644
--- a/xorg-server/exa/exa_classic.c
+++ b/xorg-server/exa/exa_classic.c
@@ -54,7 +54,7 @@ ExaGetPixmapAddress(PixmapPtr p)
  */

 PixmapPtr

 exaCreatePixmap_classic(ScreenPtr pScreen, int w, int h, int depth,

-		unsigned class)

+		unsigned usage_hint)

 {

     PixmapPtr pPixmap;

     ExaPixmapPrivPtr	pExaPixmap;

@@ -66,7 +66,7 @@ exaCreatePixmap_classic(ScreenPtr pScreen, int w, int h, int depth,
 	return NullPixmap;

 

     swap(pExaScr, pScreen, CreatePixmap);

-    pPixmap = pScreen->CreatePixmap (pScreen, w, h, depth, class);

+    pPixmap = pScreen->CreatePixmap (pScreen, w, h, depth, usage_hint);

     swap(pExaScr, pScreen, CreatePixmap);

 

     if (!pPixmap)

diff --git a/xorg-server/exa/exa_driver.c b/xorg-server/exa/exa_driver.c
index 8893452a8..bfc89295f 100644
--- a/xorg-server/exa/exa_driver.c
+++ b/xorg-server/exa/exa_driver.c
@@ -48,7 +48,7 @@ ExaGetPixmapAddress(PixmapPtr p)
  */

 PixmapPtr

 exaCreatePixmap_driver(ScreenPtr pScreen, int w, int h, int depth,

-		unsigned class)

+		unsigned usage_hint)

 {

     PixmapPtr pPixmap;

     ExaPixmapPrivPtr	pExaPixmap;

@@ -60,7 +60,7 @@ exaCreatePixmap_driver(ScreenPtr pScreen, int w, int h, int depth,
 	return NullPixmap;

 

     swap(pExaScr, pScreen, CreatePixmap);

-    pPixmap = pScreen->CreatePixmap(pScreen, 0, 0, depth, class);

+    pPixmap = pScreen->CreatePixmap(pScreen, 0, 0, depth, usage_hint);

     swap(pExaScr, pScreen, CreatePixmap);

 

     if (!pPixmap)

@@ -78,7 +78,7 @@ exaCreatePixmap_driver(ScreenPtr pScreen, int w, int h, int depth,
 

     if (pExaScr->info->CreatePixmap2) {

 	int new_pitch = 0;

-	pExaPixmap->driverPriv = pExaScr->info->CreatePixmap2(pScreen, w, h, depth, class, bpp, &new_pitch);

+	pExaPixmap->driverPriv = pExaScr->info->CreatePixmap2(pScreen, w, h, depth, usage_hint, bpp, &new_pitch);

 	paddedWidth = pExaPixmap->fb_pitch = new_pitch;

     }

     else {

diff --git a/xorg-server/exa/exa_migration_mixed.c b/xorg-server/exa/exa_migration_mixed.c
index 00227e3c4..9489b2927 100644
--- a/xorg-server/exa/exa_migration_mixed.c
+++ b/xorg-server/exa/exa_migration_mixed.c
@@ -39,7 +39,7 @@ exaCreateDriverPixmap_mixed(PixmapPtr pPixmap)
     ExaPixmapPriv(pPixmap);

     int w = pPixmap->drawable.width, h = pPixmap->drawable.height;

     int depth = pPixmap->drawable.depth, bpp = pPixmap->drawable.bitsPerPixel;

-    int class = pPixmap->drawable.class;

+    int usage_hint = pPixmap->usage_hint;

     int paddedWidth = pExaPixmap->sys_pitch;

 

     /* Already done. */

@@ -55,7 +55,7 @@ exaCreateDriverPixmap_mixed(PixmapPtr pPixmap)
 

     if (pExaScr->info->CreatePixmap2) {

 	int new_pitch = 0;

-        pExaPixmap->driverPriv = pExaScr->info->CreatePixmap2(pScreen, w, h, depth, class, bpp, &new_pitch);

+        pExaPixmap->driverPriv = pExaScr->info->CreatePixmap2(pScreen, w, h, depth, usage_hint, bpp, &new_pitch);

 	paddedWidth = pExaPixmap->fb_pitch = new_pitch;

     } else {

 	if (paddedWidth < pExaPixmap->fb_pitch)

diff --git a/xorg-server/exa/exa_mixed.c b/xorg-server/exa/exa_mixed.c
index 38700e900..188a7e0a6 100644
--- a/xorg-server/exa/exa_mixed.c
+++ b/xorg-server/exa/exa_mixed.c
@@ -47,7 +47,7 @@ ExaGetPixmapAddress(PixmapPtr p)
  */

 PixmapPtr

 exaCreatePixmap_mixed(ScreenPtr pScreen, int w, int h, int depth,

-		unsigned class)

+		unsigned usage_hint)

 {

     PixmapPtr pPixmap;

     ExaPixmapPrivPtr	pExaPixmap;

@@ -59,7 +59,7 @@ exaCreatePixmap_mixed(ScreenPtr pScreen, int w, int h, int depth,
 	return NullPixmap;

 

     swap(pExaScr, pScreen, CreatePixmap);

-    pPixmap = pScreen->CreatePixmap(pScreen, 0, 0, depth, class);

+    pPixmap = pScreen->CreatePixmap(pScreen, 0, 0, depth, usage_hint);

     swap(pExaScr, pScreen, CreatePixmap);

 

     if (!pPixmap)

diff --git a/xorg-server/exa/exa_priv.h b/xorg-server/exa/exa_priv.h
index 546a3e6e8..1b8cf294a 100644
--- a/xorg-server/exa/exa_priv.h
+++ b/xorg-server/exa/exa_priv.h
@@ -588,7 +588,7 @@ extern const GCFuncs exaGCFuncs;
 /* exa_classic.c */

 PixmapPtr

 exaCreatePixmap_classic(ScreenPtr pScreen, int w, int h, int depth,

-		unsigned class);

+		unsigned usage_hint);

 

 Bool

 exaModifyPixmapHeader_classic(PixmapPtr pPixmap, int width, int height, int depth,

@@ -603,7 +603,7 @@ exaPixmapHasGpuCopy_classic(PixmapPtr pPixmap);
 /* exa_driver.c */

 PixmapPtr

 exaCreatePixmap_driver(ScreenPtr pScreen, int w, int h, int depth,

-		unsigned class);

+		unsigned usage_hint);

 

 Bool

 exaModifyPixmapHeader_driver(PixmapPtr pPixmap, int width, int height, int depth,

@@ -618,7 +618,7 @@ exaPixmapHasGpuCopy_driver(PixmapPtr pPixmap);
 /* exa_mixed.c */

 PixmapPtr

 exaCreatePixmap_mixed(ScreenPtr pScreen, int w, int h, int depth,

-		unsigned class);

+		unsigned usage_hint);

 

 Bool

 exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth,

diff --git a/xorg-server/fb/fb.h b/xorg-server/fb/fb.h
index a33cc40ce..29eecadb3 100644
--- a/xorg-server/fb/fb.h
+++ b/xorg-server/fb/fb.h
@@ -1598,11 +1598,11 @@ fbPictureInit (ScreenPtr pScreen,
 

 extern _X_EXPORT PixmapPtr

 fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp,

-		   unsigned class);

+		   unsigned usage_hint);

 

 extern _X_EXPORT PixmapPtr

 fbCreatePixmap (ScreenPtr pScreen, int width, int height, int depth,

-		unsigned class);

+		unsigned usage_hint);

 

 extern _X_EXPORT Bool

 fbDestroyPixmap (PixmapPtr pPixmap);

diff --git a/xorg-server/fb/fb24_32.c b/xorg-server/fb/fb24_32.c
index b402a2357..748a0ec04 100644
--- a/xorg-server/fb/fb24_32.c
+++ b/xorg-server/fb/fb24_32.c
@@ -546,7 +546,7 @@ fb24_32ReformatTile(PixmapPtr pOldTile, int bitsPerPixel)
     pNewTile = pScreen->CreatePixmap(pScreen, pOldTile->drawable.width,

 				     pOldTile->drawable.height,

 				     pOldTile->drawable.depth,

-				     pOldTile->drawable.class);

+				     pOldTile->usage_hint);

     if (!pNewTile)

 	return 0;

     fbGetDrawable (&pOldTile->drawable, 

diff --git a/xorg-server/fb/fbpixmap.c b/xorg-server/fb/fbpixmap.c
index e73a2f02d..80d3252d2 100644
--- a/xorg-server/fb/fbpixmap.c
+++ b/xorg-server/fb/fbpixmap.c
@@ -30,7 +30,7 @@
 

 PixmapPtr

 fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp,

-		   unsigned class)

+		   unsigned usage_hint)

 {

     PixmapPtr	pPixmap;

     size_t	datasize;

@@ -54,7 +54,7 @@ fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp,
     if (!pPixmap)

 	return NullPixmap;

     pPixmap->drawable.type = DRAWABLE_PIXMAP;

-    pPixmap->drawable.class = class;

+    pPixmap->drawable.class = 0;

     pPixmap->drawable.pScreen = pScreen;

     pPixmap->drawable.depth = depth;

     pPixmap->drawable.bitsPerPixel = bpp;

@@ -78,12 +78,14 @@ fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp,
     pPixmap->screen_y = 0;

 #endif

 

+    pPixmap->usage_hint = usage_hint;

+

     return pPixmap;

 }

 

 PixmapPtr

 fbCreatePixmap (ScreenPtr pScreen, int width, int height, int depth,

-		unsigned class)

+		unsigned usage_hint)

 {

     int	bpp;

     bpp = BitsPerPixel (depth);

@@ -91,7 +93,7 @@ fbCreatePixmap (ScreenPtr pScreen, int width, int height, int depth,
     if (bpp == 32 && depth <= 24)

 	bpp = fbGetScreenPrivate(pScreen)->pix32bpp;

 #endif

-    return fbCreatePixmapBpp (pScreen, width, height, depth, bpp, class);

+    return fbCreatePixmapBpp (pScreen, width, height, depth, bpp, usage_hint);

 }

 

 Bool

diff --git a/xorg-server/hw/dmx/dmxpixmap.c b/xorg-server/hw/dmx/dmxpixmap.c
index 9a098777d..119dd1134 100644
--- a/xorg-server/hw/dmx/dmxpixmap.c
+++ b/xorg-server/hw/dmx/dmxpixmap.c
@@ -82,7 +82,7 @@ void dmxBECreatePixmap(PixmapPtr pPixmap)
 /** Create a pixmap for \a pScreen with the specified \a width, \a

  *  height, and \a depth. */

 PixmapPtr dmxCreatePixmap(ScreenPtr pScreen, int width, int height, int depth,

-			  unsigned class)

+			  unsigned usage_hint)

 {

     DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];

     PixmapPtr      pPixmap;

@@ -104,7 +104,7 @@ PixmapPtr dmxCreatePixmap(ScreenPtr pScreen, int width, int height, int depth,
 	return NullPixmap;

 

     pPixmap->drawable.type = DRAWABLE_PIXMAP;

-    pPixmap->drawable.class = class;

+    pPixmap->drawable.class = 0;

     pPixmap->drawable.pScreen = pScreen;

     pPixmap->drawable.depth = depth;

     pPixmap->drawable.bitsPerPixel = bpp;

@@ -116,6 +116,7 @@ PixmapPtr dmxCreatePixmap(ScreenPtr pScreen, int width, int height, int depth,
     pPixmap->drawable.height = height;

     pPixmap->devKind = PixmapBytePad(width, bpp);

     pPixmap->refcnt = 1;

+    pPixmap->usage_hint = usage_hint;

 

     pPixPriv = DMX_GET_PIXMAP_PRIV(pPixmap);

     pPixPriv->pixmap = (Pixmap)0;

diff --git a/xorg-server/hw/dmx/dmxpixmap.h b/xorg-server/hw/dmx/dmxpixmap.h
index 70aa5075c..a41918ce4 100644
--- a/xorg-server/hw/dmx/dmxpixmap.h
+++ b/xorg-server/hw/dmx/dmxpixmap.h
@@ -50,7 +50,7 @@ extern Bool      dmxInitPixmap(ScreenPtr pScreen);
 

 extern PixmapPtr dmxCreatePixmap(ScreenPtr pScreen,

 				 int width, int height, int depth,

-				 unsigned class);

+				 unsigned usage_hint);

 extern Bool      dmxDestroyPixmap(PixmapPtr pPixmap);

 extern RegionPtr dmxBitmapToRegion(PixmapPtr pPixmap);

 

diff --git a/xorg-server/hw/xfree86/common/xf86VGAarbiter.c b/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
index a6266e725..0aa6f2cf4 100644
--- a/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
+++ b/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
@@ -369,13 +369,13 @@ VGAarbiterClearToBackground (
 }

 

 static PixmapPtr

-VGAarbiterCreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned class)

+VGAarbiterCreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned usage_hint)

 {

     PixmapPtr pPix;

 

     SCREEN_PROLOG ( CreatePixmap);

     VGAGet(pScreen);

-    pPix = (*pScreen->CreatePixmap) (pScreen, w, h, depth, class);

+    pPix = (*pScreen->CreatePixmap) (pScreen, w, h, depth, usage_hint);

     VGAPut();

     SCREEN_EPILOG (CreatePixmap, VGAarbiterCreatePixmap);

 

diff --git a/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h b/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
index 0f8416b71..13fde5e79 100644
--- a/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
+++ b/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
@@ -155,7 +155,7 @@ static void VGAarbiterCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg,
 static void VGAarbiterClearToBackground (WindowPtr pWin, int x, int y, int w,

     int h, Bool generateExposures);

 static PixmapPtr VGAarbiterCreatePixmap(ScreenPtr pScreen, int w, int h,

-    int depth, unsigned int class);

+    int depth, unsigned int usage_hint);

 static Bool  VGAarbiterCreateGC(GCPtr pGC);

 static Bool VGAarbiterSaveScreen(ScreenPtr pScreen, Bool unblank);

 static void VGAarbiterStoreColors (ColormapPtr pmap, int ndef, xColorItem

diff --git a/xorg-server/hw/xfree86/xaa/xaaInit.c b/xorg-server/hw/xfree86/xaa/xaaInit.c
index c0617149a..ff1dd3d8b 100644
--- a/xorg-server/hw/xfree86/xaa/xaaInit.c
+++ b/xorg-server/hw/xfree86/xaa/xaaInit.c
@@ -34,7 +34,7 @@ static void XAAGetImage(DrawablePtr pDrawable, int sx, int sy, int w, int h,
 static void XAAGetSpans(DrawablePtr pDrawable, int wMax, DDXPointPtr ppt,

 			int *pwidth, int nspans, char *pdstStart);

 static PixmapPtr XAACreatePixmap(ScreenPtr pScreen, int w, int h, int depth,

-				 unsigned class);

+				 unsigned usage_hint);

 static Bool XAADestroyPixmap(PixmapPtr pPixmap);

 static Bool XAAEnterVT (int index, int flags);

 static void XAALeaveVT (int index, int flags);

@@ -331,7 +331,7 @@ XAAInitializeOffscreenDepths (ScreenPtr pScreen)
 }

 

 static PixmapPtr 

-XAACreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned class)

+XAACreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned usage_hint)

 {

     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);

     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];

@@ -346,7 +346,7 @@ XAACreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned class)
 	XAAInitializeOffscreenDepths (pScreen);

 

     if(pScrn->vtSema &&

-	(class != CREATE_PIXMAP_USAGE_GLYPH_PICTURE) &&

+	(usage_hint != CREATE_PIXMAP_USAGE_GLYPH_PICTURE) &&

 	(infoRec->offscreenDepths & (1 << (depth - 1))) &&

 	(size >= MIN_OFFPIX_SIZE) && !SwitchedOut &&

 	(!infoRec->maxOffPixWidth || (w <= infoRec->maxOffPixWidth)) &&

@@ -379,7 +379,7 @@ XAACreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned class)
 	}

 

 	XAA_SCREEN_PROLOGUE (pScreen, CreatePixmap);

-	pPix = (*pScreen->CreatePixmap) (pScreen, 0, 0, depth, class);

+	pPix = (*pScreen->CreatePixmap) (pScreen, 0, 0, depth, usage_hint);

 	XAA_SCREEN_EPILOGUE (pScreen, CreatePixmap, XAACreatePixmap);

 

 	if (!pPix) {

@@ -411,7 +411,7 @@ XAACreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned class)
     }

 BAILOUT:

     XAA_SCREEN_PROLOGUE (pScreen, CreatePixmap);

-    pPix = (*pScreen->CreatePixmap) (pScreen, w, h, depth, class);

+    pPix = (*pScreen->CreatePixmap) (pScreen, w, h, depth, usage_hint);

     XAA_SCREEN_EPILOGUE (pScreen, CreatePixmap, XAACreatePixmap);

 

     if(pPix) {

diff --git a/xorg-server/hw/xnest/Pixmap.c b/xorg-server/hw/xnest/Pixmap.c
index efb2774d3..da81a1d06 100644
--- a/xorg-server/hw/xnest/Pixmap.c
+++ b/xorg-server/hw/xnest/Pixmap.c
@@ -37,7 +37,7 @@ DevPrivateKeyRec xnestPixmapPrivateKeyRec;
 

 PixmapPtr

 xnestCreatePixmap(ScreenPtr pScreen, int width, int height, int depth,

-		  unsigned class)

+		  unsigned usage_hint)

 {

   PixmapPtr pPixmap;

 

@@ -45,7 +45,7 @@ xnestCreatePixmap(ScreenPtr pScreen, int width, int height, int depth,
   if (!pPixmap)

     return NullPixmap;

   pPixmap->drawable.type = DRAWABLE_PIXMAP;

-  pPixmap->drawable.class = class;

+  pPixmap->drawable.class = 0;

   pPixmap->drawable.depth = depth;

   pPixmap->drawable.bitsPerPixel = depth;

   pPixmap->drawable.id = 0;

@@ -57,6 +57,7 @@ xnestCreatePixmap(ScreenPtr pScreen, int width, int height, int depth,
   pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;

   pPixmap->refcnt = 1;

   pPixmap->devKind = PixmapBytePad(width, depth);

+  pPixmap->usage_hint = usage_hint;

   if (width && height)

       xnestPixmapPriv(pPixmap)->pixmap = 

 	  XCreatePixmap(xnestDisplay, 

diff --git a/xorg-server/hw/xnest/XNPixmap.h b/xorg-server/hw/xnest/XNPixmap.h
index c9223e5ce..0d7c6b61e 100644
--- a/xorg-server/hw/xnest/XNPixmap.h
+++ b/xorg-server/hw/xnest/XNPixmap.h
@@ -30,7 +30,7 @@ typedef struct {
 #define xnestSharePixmap(pPixmap) ((pPixmap)->refcnt++)

 

 PixmapPtr xnestCreatePixmap(ScreenPtr pScreen, int width, int height,

-			    int depth, unsigned class);

+			    int depth, unsigned usage_hint);

 Bool xnestDestroyPixmap(PixmapPtr pPixmap);

 RegionPtr xnestPixmapToRegion(PixmapPtr pPixmap);

 

diff --git a/xorg-server/hw/xwin/win.h b/xorg-server/hw/xwin/win.h
index e01955cb1..2dad44778 100644
--- a/xorg-server/hw/xwin/win.h
+++ b/xorg-server/hw/xwin/win.h
@@ -1036,7 +1036,7 @@ winSetEngineFunctionsPrimaryDD (ScreenPtr pScreen);
 

 PixmapPtr

 winCreatePixmapNativeGDI (ScreenPtr pScreen, int width, int height, int depth,

-			  unsigned class);

+			  unsigned usage_hint);

 

 Bool

 winDestroyPixmapNativeGDI (PixmapPtr pPixmap);

diff --git a/xorg-server/hw/xwin/winpixmap.c b/xorg-server/hw/xwin/winpixmap.c
index d174d70d3..2af95f225 100644
--- a/xorg-server/hw/xwin/winpixmap.c
+++ b/xorg-server/hw/xwin/winpixmap.c
@@ -57,7 +57,7 @@ winCopyRotatePixmapNativeGDI (PixmapPtr psrcPix, PixmapPtr *ppdstPix,
 PixmapPtr

 winCreatePixmapNativeGDI (ScreenPtr pScreen,

 			  int iWidth, int iHeight,

-			  int iDepth, unsigned class)

+			  int iDepth, unsigned usage_hint)

 {

   winPrivPixmapPtr	pPixmapPriv = NULL;

   PixmapPtr		pPixmap = NULL;

@@ -71,12 +71,12 @@ winCreatePixmapNativeGDI (ScreenPtr pScreen,
     }

 

   winDebug ("winCreatePixmap () - w %d h %d d %d uh %d bw %d\n",

-	  iWidth, iHeight, iDepth, class,

+	  iWidth, iHeight, iDepth, usage_hint,

 	  PixmapBytePad (iWidth, iDepth));

 

   /* Setup pixmap values */

   pPixmap->drawable.type = DRAWABLE_PIXMAP;

-  pPixmap->drawable.class = class;

+  pPixmap->drawable.class = 0;

   pPixmap->drawable.pScreen = pScreen;

   pPixmap->drawable.depth = iDepth;

   pPixmap->drawable.bitsPerPixel = BitsPerPixel (iDepth);

@@ -89,6 +89,7 @@ winCreatePixmapNativeGDI (ScreenPtr pScreen,
   pPixmap->devKind = 0;

   pPixmap->refcnt = 1;

   pPixmap->devPrivate.ptr = NULL;

+  pPixmap->usage_hint = usage_hint;

 

   /* Pixmap privates are allocated by AllocatePixmap */

   pPixmapPriv = winGetPixmapPriv (pPixmap);

diff --git a/xorg-server/include/pixmapstr.h b/xorg-server/include/pixmapstr.h
index 47dce91e1..19190e697 100644
--- a/xorg-server/include/pixmapstr.h
+++ b/xorg-server/include/pixmapstr.h
@@ -78,6 +78,7 @@ typedef struct _Pixmap {
     DevUnion		devPrivate; /* When !NULL, devPrivate.ptr points to the raw pixel data. */

     short		screen_x;

     short		screen_y;

+    unsigned		usage_hint; /* see CREATE_PIXMAP_USAGE_* */

 } PixmapRec;

 

 #endif /* PIXMAPSTRUCT_H */

diff --git a/xorg-server/include/scrnintstr.h b/xorg-server/include/scrnintstr.h
index 28dd2c011..a373acd27 100644
--- a/xorg-server/include/scrnintstr.h
+++ b/xorg-server/include/scrnintstr.h
@@ -208,7 +208,7 @@ typedef    PixmapPtr (* CreatePixmapProcPtr)(
 	int /*width*/,

 	int /*height*/,

 	int /*depth*/,

-	unsigned /*class*/);

+	unsigned /*usage_hint*/);

 

 typedef    Bool (* DestroyPixmapProcPtr)(

 	PixmapPtr /*pPixmap*/);

diff --git a/xorg-server/test/Makefile.am b/xorg-server/test/Makefile.am
index d93c7a223..ea886a961 100644
--- a/xorg-server/test/Makefile.am
+++ b/xorg-server/test/Makefile.am
@@ -1,4 +1,6 @@
-if UNITTESTS

+if ENABLE_UNIT_TESTS

+if HAVE_GLIB

+if HAVE_LD_WRAP

 SUBDIRS= . xi2

 check_PROGRAMS = xkb input xtest list

 check_LTLIBRARIES = libxservertest.la

@@ -35,6 +37,8 @@ libxservertest_la_LIBADD = \
             $(top_builddir)/os/libos.la \

             @XORG_LIBS@

 endif

+endif

+endif

 

 CLEANFILES=libxservertest.c

 

diff --git a/xorg-server/test/xi2/Makefile.am b/xorg-server/test/xi2/Makefile.am
index d8dc7e9ce..b7948b151 100644
--- a/xorg-server/test/xi2/Makefile.am
+++ b/xorg-server/test/xi2/Makefile.am
@@ -1,51 +1,55 @@
-if UNITTESTS
-check_PROGRAMS =  \
-	protocol-xiqueryversion \
-	protocol-xiquerydevice \
-	protocol-xiselectevents \
-	protocol-xigetselectedevents \
-        protocol-xisetclientpointer \
-        protocol-xigetclientpointer \
-        protocol-xiquerypointer \
-        protocol-xiwarppointer \
-        protocol-eventconvert
-
-TESTS=$(check_PROGRAMS)
-
-AM_CFLAGS = $(DIX_CFLAGS) $(GLIB_CFLAGS) @XORG_CFLAGS@
-INCLUDES = @XORG_INCS@
-TEST_LDADD=../libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLIB_LIBS)
-COMMON_SOURCES=protocol-common.h protocol-common.c
-
-if SPECIAL_DTRACE_OBJECTS
-TEST_LDADD += $(OS_LIB) $(DIX_LIB)
-endif
-
-protocol_xiqueryversion_LDADD=$(TEST_LDADD)
-protocol_xiquerydevice_LDADD=$(TEST_LDADD)
-protocol_xiselectevents_LDADD=$(TEST_LDADD)
-protocol_xigetselectedevents_LDADD=$(TEST_LDADD)
-protocol_xisetclientpointer_LDADD=$(TEST_LDADD)
-protocol_xigetclientpointer_LDADD=$(TEST_LDADD)
-protocol_xiquerypointer_LDADD=$(TEST_LDADD)
-protocol_xiwarppointer_LDADD=$(TEST_LDADD)
-protocol_eventconvert_LDADD=$(TEST_LDADD)
-
-protocol_xiqueryversion_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient
-protocol_xiquerydevice_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient
-protocol_xiselectevents_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,dixLookupWindow -Wl,-wrap,XISetEventMask
-protocol_xigetselectedevents_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient -Wl,-wrap,dixLookupWindow -Wl,-wrap,AddResource
-protocol_xisetclientpointer_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,dixLookupClient
-protocol_xigetclientpointer_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient -Wl,-wrap,dixLookupClient
-protocol_xiquerypointer_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient -Wl,-wrap,dixLookupWindow
-protocol_xiwarppointer_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient -Wl,-wrap,dixLookupWindow
-
-protocol_xiqueryversion_SOURCES=$(COMMON_SOURCES) protocol-xiqueryversion.c
-protocol_xiquerydevice_SOURCES=$(COMMON_SOURCES) protocol-xiquerydevice.c
-protocol_xiselectevents_SOURCES=$(COMMON_SOURCES) protocol-xiselectevents.c
-protocol_xigetselectedevents_SOURCES=$(COMMON_SOURCES) protocol-xigetselectedevents.c
-protocol_xisetclientpointer_SOURCES=$(COMMON_SOURCES) protocol-xisetclientpointer.c
-protocol_xigetclientpointer_SOURCES=$(COMMON_SOURCES) protocol-xigetclientpointer.c
-protocol_xiquerypointer_SOURCES=$(COMMON_SOURCES) protocol-xiquerypointer.c
-protocol_xiwarppointer_SOURCES=$(COMMON_SOURCES) protocol-xiwarppointer.c
-endif
+if ENABLE_UNIT_TESTS

+if HAVE_GLIB

+if HAVE_LD_WRAP

+check_PROGRAMS =  \

+	protocol-xiqueryversion \

+	protocol-xiquerydevice \

+	protocol-xiselectevents \

+	protocol-xigetselectedevents \

+        protocol-xisetclientpointer \

+        protocol-xigetclientpointer \

+        protocol-xiquerypointer \

+        protocol-xiwarppointer \

+        protocol-eventconvert

+

+TESTS=$(check_PROGRAMS)

+

+AM_CFLAGS = $(DIX_CFLAGS) $(GLIB_CFLAGS) @XORG_CFLAGS@

+INCLUDES = @XORG_INCS@

+TEST_LDADD=../libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLIB_LIBS)

+COMMON_SOURCES=protocol-common.h protocol-common.c

+

+if SPECIAL_DTRACE_OBJECTS

+TEST_LDADD += $(OS_LIB) $(DIX_LIB)

+endif

+

+protocol_xiqueryversion_LDADD=$(TEST_LDADD)

+protocol_xiquerydevice_LDADD=$(TEST_LDADD)

+protocol_xiselectevents_LDADD=$(TEST_LDADD)

+protocol_xigetselectedevents_LDADD=$(TEST_LDADD)

+protocol_xisetclientpointer_LDADD=$(TEST_LDADD)

+protocol_xigetclientpointer_LDADD=$(TEST_LDADD)

+protocol_xiquerypointer_LDADD=$(TEST_LDADD)

+protocol_xiwarppointer_LDADD=$(TEST_LDADD)

+protocol_eventconvert_LDADD=$(TEST_LDADD)

+

+protocol_xiqueryversion_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient

+protocol_xiquerydevice_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient

+protocol_xiselectevents_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,dixLookupWindow -Wl,-wrap,XISetEventMask

+protocol_xigetselectedevents_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient -Wl,-wrap,dixLookupWindow -Wl,-wrap,AddResource

+protocol_xisetclientpointer_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,dixLookupClient

+protocol_xigetclientpointer_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient -Wl,-wrap,dixLookupClient

+protocol_xiquerypointer_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient -Wl,-wrap,dixLookupWindow

+protocol_xiwarppointer_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient -Wl,-wrap,dixLookupWindow

+

+protocol_xiqueryversion_SOURCES=$(COMMON_SOURCES) protocol-xiqueryversion.c

+protocol_xiquerydevice_SOURCES=$(COMMON_SOURCES) protocol-xiquerydevice.c

+protocol_xiselectevents_SOURCES=$(COMMON_SOURCES) protocol-xiselectevents.c

+protocol_xigetselectedevents_SOURCES=$(COMMON_SOURCES) protocol-xigetselectedevents.c

+protocol_xisetclientpointer_SOURCES=$(COMMON_SOURCES) protocol-xisetclientpointer.c

+protocol_xigetclientpointer_SOURCES=$(COMMON_SOURCES) protocol-xigetclientpointer.c

+protocol_xiquerypointer_SOURCES=$(COMMON_SOURCES) protocol-xiquerypointer.c

+protocol_xiwarppointer_SOURCES=$(COMMON_SOURCES) protocol-xiwarppointer.c

+endif

+endif

+endif

diff --git a/xorg-server/xkeyboard-config/symbols/cd.in b/xorg-server/xkeyboard-config/symbols/cd.in
index 8a12a384e..e11b82233 100644
--- a/xorg-server/xkeyboard-config/symbols/cd.in
+++ b/xorg-server/xkeyboard-config/symbols/cd.in
@@ -19,14 +19,14 @@ xkb_symbols "basic" {
     key <AE06> { [ braceright,         6, greater                         ] };

     key <AE07> { [parenright,          7, bracketright                    ] };

     key <AE08> { [0x01000302,          8, guillemotright                  ] };

-    key <AE09> { [0x0100030c,          9                                  ] };

+    key <AE09> { [0x0100030c,          9, 0x0100030D                      ] };

     key <AE10> { [0x01000308,          0, at                              ] };

-    key <AE11> { [     minus,      underscore,   percent                  ] };

+    key <AE11> { [     minus,      underscore,  percent,          degree  ] };

     key <AE12> { [     equal,      plus,       multiply,        division  ] };

 

-    key <AD01> { [         a,          A                                  ] };

+    key <AD01> { [         a,          A,            ae,              AE  ] };

     key <AD02> { [	   z,          Z                                  ] };

-    key <AD03> { [	   e,          E                                  ] };

+    key <AD03> { [	   e,          E,            oe,              OE  ] };

     key <AD04> { [         r,          R                                  ] };

     key <AD05> { [	   t,          T                                  ] };

     key <AD06> { [	   y,          Y                                  ] };

@@ -63,7 +63,7 @@ xkb_symbols "basic" {
     key <BKSL> { [  quotedbl,  backslash,            bar                  ] };

 

     // SPACE, SPACE, SPACE, NO-BREAK SPACE, SPACE

-    key <SPCE> { [ space,          space,  nobreakspace,     nobreakspace ] };

+    key <SPCE> { [ space,          space,    nobreakspace,     0x0100202F ] };

 

     include "level3(ralt_switch)"

 };

diff --git a/xorg-server/xkeyboard-config/symbols/inet b/xorg-server/xkeyboard-config/symbols/inet
index 5fbc8a7a7..c3366b1d8 100644
--- a/xorg-server/xkeyboard-config/symbols/inet
+++ b/xorg-server/xkeyboard-config/symbols/inet
@@ -167,6 +167,11 @@ xkb_symbols "evdev" {
     key <I188>   {      [ parenright            ]       };

     key <I189>   {      [ XF86New               ]       };

     key <I190>   {      [ Redo                  ]       };

+    key <I192>   {      [ XF86LaunchA           ]       };

+    key <I193>   {      [ XF86LaunchC           ]       };

+    key <I194>   {      [ XF86LaunchD           ]       };

+    key <I195>   {      [ XF86LaunchE           ]       };

+    key <I196>   {      [ XF86LaunchF           ]       };

     key <I208>   {      [ XF86AudioPlay         ]       };

     key <I209>   {      [ XF86AudioPause        ]       };

     key <I210>   {      [ XF86Launch3           ]       };