xserver: Branch 'master' - 2 commits

[Keith Packard]

 configure.ac            |    7 -------
 dix/cursor.c            |   17 -----------------
 hw/xfree86/dri2/dri2.c  |    2 +-
 include/dix-config.h.in |    3 ---
 4 files changed, 1 insertion(+), 28 deletions(-)

New commits:
commit e38df06772965cd5099646f1e7032b7c944d16ed
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Thu Jan 28 14:33:25 2010 -0800

    DRI2: Bump the dri2 module version to 1.2.0 to reflect recent API changes.
    
    Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
    Acked-by: Jesse Barnes <jbarnes at virtuousgeek.org>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
index 587a928..cd69ca0 100644
--- a/hw/xfree86/dri2/dri2.c
+++ b/hw/xfree86/dri2/dri2.c
@@ -914,7 +914,7 @@ static XF86ModuleVersionInfo DRI2VersRec =
     MODINFOSTRING1,
     MODINFOSTRING2,
     XORG_VERSION_CURRENT,
-    1, 1, 0,
+    1, 2, 0,
     ABI_CLASS_EXTENSION,
     ABI_EXTENSION_VERSION,
     MOD_CLASS_NONE,
commit 60b6477f6dc005a1b052be8c5e5a549550a4aa88
Author: Tiago Vignatti <tiago.vignatti at nokia.com>
Date:   Thu Jan 14 17:18:28 2010 +0200

    dix/configure: remove null root cursor option
    
    The default behavior of the server is to start with an invisible root cursor.
    Be such cursor invisible or inexistent (null), in the end it doesn't matter -
    for the user. The content on screen will be the same. Besides, there's no
    difference, in terms of performance, whether such cursor is invisible or
    simply null. The paths that both take inside the server are roughly the same.
    
    Therefore create a null root cursor becomes irrelevant.
    
    Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
    Acked-by: Peter Hutterer <peter.hutterer at who-t.net>
    Acked-by: Daniel Stone <daniel at fooishbar.org>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index 425db40..ec9442b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -572,9 +572,6 @@ AC_ARG_ENABLE(install-libxf86config,
 				[Install libxf86config (default: disabled)]),
 				[INSTALL_LIBXF86CONFIG=$enableval],
 				[INSTALL_LIBXF86CONFIG=no])
-AC_ARG_ENABLE(null-root-cursor, AS_HELP_STRING([--enable-null-root-cursor], [Use an empty root cursor (default: use core cursor)]),
-                                 [NULL_ROOT_CURSOR=$enableval],
-                                 [NULL_ROOT_CURSOR=no])
 AC_ARG_ENABLE(visibility,     AC_HELP_STRING([--enable-visibility], [Enable symbol visibility (default: auto)]),
 				[SYMBOL_VISIBILITY=$enableval],
 				[SYMBOL_VISIBILITY=auto])
@@ -1187,10 +1184,6 @@ AC_CHECK_FUNC(strncasecmp, [], AC_DEFINE([NEED_STRNCASECMP], 1,
 AC_CHECK_FUNC(strcasestr, [], AC_DEFINE([NEED_STRCASESTR], 1,
                                        [Do not have 'strcasestr'.]))
 
-if test "x$NULL_ROOT_CURSOR" = xyes; then
-        AC_DEFINE(NULL_ROOT_CURSOR, 1, [Use an empty root cursor])
-fi
-
 PKG_CHECK_MODULES([XDMCP], [xdmcp], [have_libxdmcp="yes"], [have_libxdmcp="no"])
 if test "x$have_libxdmcp" = xyes; then
 	AC_CHECK_LIB(Xdmcp, XdmcpWrap, [have_xdmcpwrap="yes"], [have_xdmcpwrap="no"], [$XDMCP_LIBS])
diff --git a/dix/cursor.c b/dix/cursor.c
index 324d733..5d9c8b0 100644
--- a/dix/cursor.c
+++ b/dix/cursor.c
@@ -487,26 +487,10 @@ CursorPtr
 CreateRootCursor(char *unused1, unsigned int unused2)
 {
     CursorPtr 	curs;
-#ifdef NULL_ROOT_CURSOR
-    CursorMetricRec cm;
-#else
     FontPtr 	cursorfont;
     int	err;
     XID		fontID;
-#endif
-
-#ifdef NULL_ROOT_CURSOR
-    cm.width = 0;
-    cm.height = 0;
-    cm.xhot = 0;
-    cm.yhot = 0;
 
-    AllocARGBCursor(NULL, NULL, NULL, &cm, 0, 0, 0, 0, 0, 0,
-		    &curs, serverClient, (XID)0);
-
-    if (curs == NullCursor)
-        return NullCursor;
-#else
     fontID = FakeClientID(0);
     err = OpenFont(serverClient, fontID, FontLoadAll | FontOpenSync,
 	(unsigned)strlen(defaultCursorFont), defaultCursorFont);
@@ -520,7 +504,6 @@ CreateRootCursor(char *unused1, unsigned int unused2)
     if (AllocGlyphCursor(fontID, 0, fontID, 1, 0, 0, 0, ~0, ~0, ~0,
 			 &curs, serverClient, (XID)0) != Success)
 	return NullCursor;
-#endif
 
     if (!AddResource(FakeClientID(0), RT_CURSOR, (pointer)curs))
 	return NullCursor;
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 84c78db..e942dac 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -414,9 +414,6 @@
 /* Use only built-in fonts */
 #undef BUILTIN_FONTS
 
-/* Use an empty root cursor */
-#undef NULL_ROOT_CURSOR
-
 /* Have a monotonic clock from clock_gettime() */
 #undef MONOTONIC_CLOCK