x11-base/xorg-server/files/1.9.3-no-default-cursor.patch

diff -paur xorg-server-1.9.3.orig/configure.ac xorg-server-1.9.3.work/configure.ac
--- xorg-server-1.9.3.orig/configure.ac	2010-12-22 18:58:55.415573000 -0800
+++ xorg-server-1.9.3.work/configure.ac	2011-04-05 19:36:56.449395000 -0700
@@ -593,6 +593,9 @@ 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])
@@ -1220,6 +1223,10 @@ AC_CHECK_FUNC(strncasecmp, [], AC_DEFINE
 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])
Only in xorg-server-1.9.3.work/: configure.ac.orig
diff -paur xorg-server-1.9.3.orig/dix/cursor.c xorg-server-1.9.3.work/dix/cursor.c
--- xorg-server-1.9.3.orig/dix/cursor.c	2010-12-22 18:58:55.482521000 -0800
+++ xorg-server-1.9.3.work/dix/cursor.c	2011-04-05 19:36:56.460368000 -0700
@@ -490,10 +490,26 @@ 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);
@@ -507,6 +523,7 @@ CreateRootCursor(char *unused1, unsigned
     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;
Only in xorg-server-1.9.3.work/dix: cursor.c.orig
diff -paur xorg-server-1.9.3.orig/include/dix-config.h.in xorg-server-1.9.3.work/include/dix-config.h.in
--- xorg-server-1.9.3.orig/include/dix-config.h.in	2010-12-22 18:59:00.418106000 -0800
+++ xorg-server-1.9.3.work/include/dix-config.h.in	2011-04-05 19:36:56.486367000 -0700
@@ -411,6 +411,9 @@
 /* Support HAL for hotplug */
 #undef CONFIG_HAL
 
+/* Use an empty root cursor */
+#undef NULL_ROOT_CURSOR
+
 /* Have a monotonic clock from clock_gettime() */
 #undef MONOTONIC_CLOCK
 
Only in xorg-server-1.9.3.work/include: dix-config.h.in.orig