frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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@nokia.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Tiago Vignatti 2010-01-14 17:18:28 +02:00 committed by Keith Packard
parent b4baab90c0
commit 60b6477f6d
3 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -572,9 +572,6 @@ AC_ARG_ENABLE(install-libxf86config,
[Install libxf86config (default: disabled)]), [Install libxf86config (default: disabled)]),
[INSTALL_LIBXF86CONFIG=$enableval], [INSTALL_LIBXF86CONFIG=$enableval],
[INSTALL_LIBXF86CONFIG=no]) [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)]), AC_ARG_ENABLE(visibility, AC_HELP_STRING([--enable-visibility], [Enable symbol visibility (default: auto)]),
[SYMBOL_VISIBILITY=$enableval], [SYMBOL_VISIBILITY=$enableval],
[SYMBOL_VISIBILITY=auto]) [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, AC_CHECK_FUNC(strcasestr, [], AC_DEFINE([NEED_STRCASESTR], 1,
[Do not have 'strcasestr'.])) [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"]) PKG_CHECK_MODULES([XDMCP], [xdmcp], [have_libxdmcp="yes"], [have_libxdmcp="no"])
if test "x$have_libxdmcp" = xyes; then if test "x$have_libxdmcp" = xyes; then
AC_CHECK_LIB(Xdmcp, XdmcpWrap, [have_xdmcpwrap="yes"], [have_xdmcpwrap="no"], [$XDMCP_LIBS]) AC_CHECK_LIB(Xdmcp, XdmcpWrap, [have_xdmcpwrap="yes"], [have_xdmcpwrap="no"], [$XDMCP_LIBS])

17
dix/cursor.c
View File

@ -487,26 +487,10 @@ CursorPtr
CreateRootCursor(char *unused1, unsigned int unused2) CreateRootCursor(char *unused1, unsigned int unused2)
{ {
CursorPtr curs; CursorPtr curs;
#ifdef NULL_ROOT_CURSOR
CursorMetricRec cm;
#else
FontPtr cursorfont; FontPtr cursorfont;
int err; int err;
XID fontID; 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); fontID = FakeClientID(0);
err = OpenFont(serverClient, fontID, FontLoadAll | FontOpenSync, err = OpenFont(serverClient, fontID, FontLoadAll | FontOpenSync,
(unsigned)strlen(defaultCursorFont), defaultCursorFont); (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, if (AllocGlyphCursor(fontID, 0, fontID, 1, 0, 0, 0, ~0, ~0, ~0,
&curs, serverClient, (XID)0) != Success) &curs, serverClient, (XID)0) != Success)
return NullCursor; return NullCursor;
#endif
if (!AddResource(FakeClientID(0), RT_CURSOR, (pointer)curs)) if (!AddResource(FakeClientID(0), RT_CURSOR, (pointer)curs))
return NullCursor; return NullCursor;

3
include/dix-config.h.in
View File

@ -414,9 +414,6 @@
/* Use only built-in fonts */ /* Use only built-in fonts */
#undef BUILTIN_FONTS #undef BUILTIN_FONTS
/* Use an empty root cursor */
#undef NULL_ROOT_CURSOR
/* Have a monotonic clock from clock_gettime() */ /* Have a monotonic clock from clock_gettime() */
#undef MONOTONIC_CLOCK #undef MONOTONIC_CLOCK