[PATCH] dix/configure: remove null root cursor option
Tiago Vignatti
vignatti at freedesktop.org
Wed Jan 27 14:43:49 PST 2010
Peter Hutterer wrote:
> On Thu, Jan 14, 2010 at 05:18:28PM +0200, Tiago Vignatti wrote:
>> 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>
>> ---
>> configure.ac | 7 -------
>> dix/cursor.c | 17 -----------------
>> include/dix-config.h.in | 3 ---
>> 3 files changed, 0 insertions(+), 27 deletions(-)
>>
>> diff --git a/configure.ac b/configure.ac
>> index 43bc365..3692033 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -565,9 +565,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])
>> @@ -1146,10 +1143,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 6103b15..9f81ded 100644
>> --- a/dix/cursor.c
>> +++ b/dix/cursor.c
>> @@ -520,26 +520,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);
>> @@ -553,7 +537,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 f46260d..b8a735e 100644
>> --- a/include/dix-config.h.in
>> +++ b/include/dix-config.h.in
>> @@ -405,9 +405,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
>>
>> --
>> 1.6.0.4
>
> Acked-by: Peter Hutterer <peter.hutterer at who-t.net>
>
> though I'd recommend wait for Daniel or others to comment on whether this is
> still needed.
ping keithp (though Daniel didn't say anything yet).
More information about the xorg-devel
mailing list