Module Name: xsrc
Committed By: snj
Date: Sat Sep 26 05:22:07 UTC 2009
Modified Files:
xsrc/external/mit/xorg-server/dist/dix [netbsd-5]: globals.c
xsrc/external/mit/xorg-server/dist/os [netbsd-5]: utils.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1018):
external/mit/xorg-server/dist/dix/globals.c: revision 1.2
external/mit/xorg-server/dist/os/utils.c: revision 1.2
By default, use the old X server background and cursor mode (option
"-retro"). Add a "-noretro" option to get the new (black background
and no cursor) behavior.
Addresses part of PR xsrc/41870
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 \
xsrc/external/mit/xorg-server/dist/dix/globals.c
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 \
xsrc/external/mit/xorg-server/dist/os/utils.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/dix/globals.c
diff -u xsrc/external/mit/xorg-server/dist/dix/globals.c:1.1.1.1.2.1 xsrc/external/mit/xorg-server/dist/dix/globals.c:1.1.1.1.2.2
--- xsrc/external/mit/xorg-server/dist/dix/globals.c:1.1.1.1.2.1 Thu Sep 17 03:34:54 2009
+++ xsrc/external/mit/xorg-server/dist/dix/globals.c Sat Sep 26 05:22:07 2009
@@ -139,7 +139,7 @@
FontPtr defaultFont; /* not declared in dix.h to avoid including font.h in
every compilation of dix code */
CursorPtr rootCursor;
-Bool party_like_its_1989 = FALSE;
+Bool party_like_its_1989 = TRUE;
Bool whiteRoot = FALSE;
int cursorScreenDevPriv[MAXSCREENS];
Index: xsrc/external/mit/xorg-server/dist/os/utils.c
diff -u xsrc/external/mit/xorg-server/dist/os/utils.c:1.1.1.1.2.1 xsrc/external/mit/xorg-server/dist/os/utils.c:1.1.1.1.2.2
--- xsrc/external/mit/xorg-server/dist/os/utils.c:1.1.1.1.2.1 Thu Sep 17 03:35:47 2009
+++ xsrc/external/mit/xorg-server/dist/os/utils.c Sat Sep 26 05:22:07 2009
@@ -525,6 +525,7 @@
ErrorF("-render [default|mono|gray|color] set render color alloc policy\n");
#endif
ErrorF("-retro start with classic stipple and cursor\n");
+ ErrorF("-noretro start with black background and no cursor\n");
ErrorF("-s # screen-saver timeout (minutes)\n");
ErrorF("-t # mouse threshold (pixels)\n");
ErrorF("-terminate terminate at server reset\n");
@@ -821,6 +822,8 @@
defaultKeyboardControl.autoRepeat = FALSE;
else if ( strcmp( argv[i], "-retro") == 0)
party_like_its_1989 = TRUE;
+ else if ( strcmp( argv[i], "-noretro") == 0)
+ party_like_its_1989 = FALSE;
else if ( strcmp( argv[i], "-s") == 0)
{
if(++i < argc)
