diff options
| -rw-r--r-- | dix/globals.c | 4 | ||||
| -rw-r--r-- | dix/window.c | 11 | ||||
| -rw-r--r-- | doc/Xserver.man.pre | 5 | ||||
| -rw-r--r-- | include/opaque.h | 2 | ||||
| -rw-r--r-- | os/utils.c | 6 | ||||
| -rwxr-xr-x | xfixes/cursor.c | 3 |
6 files changed, 20 insertions, 11 deletions
diff --git a/dix/globals.c b/dix/globals.c index 80a9ff504..60fd9a9ea 100644 --- a/dix/globals.c +++ b/dix/globals.c @@ -139,8 +139,8 @@ char *defaultCursorFont = COMPILEDCURSORFONT; FontPtr defaultFont; /* not declared in dix.h to avoid including font.h in every compilation of dix code */ CursorPtr rootCursor; -Bool blackRoot=FALSE; -Bool whiteRoot=FALSE; +Bool party_like_its_1989 = FALSE; +Bool whiteRoot = FALSE; _X_EXPORT int cursorScreenDevPriv[MAXSCREENS]; diff --git a/dix/window.c b/dix/window.c index b588f4466..6cba23d0b 100644 --- a/dix/window.c +++ b/dix/window.c @@ -486,15 +486,14 @@ InitRootWindow(WindowPtr pWin) rootCursor->refcnt++; - if (!blackRoot && !whiteRoot) { + if (party_like_its_1989) { MakeRootTile(pWin); backFlag |= CWBackPixmap; - } - else { - if (blackRoot) - pWin->background.pixel = pScreen->blackPixel; - else + } else { + if (whiteRoot) pWin->background.pixel = pScreen->whitePixel; + else + pWin->background.pixel = pScreen->blackPixel; backFlag |= CWBackPixel; } diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre index 8fe3b76a2..6cf08cea4 100644 --- a/doc/Xserver.man.pre +++ b/doc/Xserver.man.pre @@ -219,6 +219,11 @@ turns off auto-repeat. .B r turns on auto-repeat. .TP 8 +.B -retro +starts the stipple with the classic stipple and cursor visible. The default +is to start with a black root window, and to suppress display of the cursor +until the first time an application calls XDefineCursor(). +.TP 8 .B \-s \fIminutes\fP sets screen-saver timeout time in minutes. .TP 8 diff --git a/include/opaque.h b/include/opaque.h index ab39cc8d0..07a0715ef 100644 --- a/include/opaque.h +++ b/include/opaque.h @@ -69,7 +69,7 @@ extern int limitNoFile; #endif extern Bool defeatAccessControl; extern long maxBigRequestSize; -extern Bool blackRoot; +extern Bool party_like_its_1989; extern Bool whiteRoot; extern Bool CoreDump; diff --git a/os/utils.c b/os/utils.c index bf52ea01e..709b5df58 100644 --- a/os/utils.c +++ b/os/utils.c @@ -533,6 +533,7 @@ void UseMsg(void) #ifdef RENDER ErrorF("-render [default|mono|gray|color] set render color alloc policy\n"); #endif + ErrorF("-retro start with classic stipple and cursor\n"); ErrorF("-s # screen-saver timeout (minutes)\n"); ErrorF("-t # mouse threshold (pixels)\n"); ErrorF("-terminate terminate at server reset\n"); @@ -641,8 +642,7 @@ ProcessCommandLine(int argc, char *argv[]) else UseMsg(); } - else if ( strcmp( argv[i], "-br") == 0) - blackRoot = TRUE; + else if ( strcmp( argv[i], "-br") == 0) ; /* default */ else if ( strcmp( argv[i], "+bs") == 0) enableBackingStore = TRUE; else if ( strcmp( argv[i], "-bs") == 0) @@ -828,6 +828,8 @@ ProcessCommandLine(int argc, char *argv[]) defaultKeyboardControl.autoRepeat = TRUE; else if ( strcmp( argv[i], "-r") == 0) defaultKeyboardControl.autoRepeat = FALSE; + else if ( strcmp( argv[i], "-retro") == 0) + party_like_its_1989 = TRUE; else if ( strcmp( argv[i], "-s") == 0) { if(++i < argc) diff --git a/xfixes/cursor.c b/xfixes/cursor.c index c4069d9b6..4b85b7089 100755 --- a/xfixes/cursor.c +++ b/xfixes/cursor.c @@ -1060,6 +1060,9 @@ Bool XFixesCursorInit (void) { int i; + + if (party_like_its_1989) + CursorVisible = TRUE; for (i = 0; i < screenInfo.numScreens; i++) { |