From 7780dd0eb56740761aadb968995129c2274898b6 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Tue, 6 Feb 2024 13:45:31 +0100
Subject: [PATCH] dix: drop -retro flag

The -retro flag makes the Xserver by default look like in the old times,
weave pattern instead of just having white or black background. Those are
usually changed by DEs or session scripts anyways, so most likely unnoticed.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 dix/globals.c    |  1 -
 dix/window.c     | 22 +++++++---------------
 include/opaque.h |  1 -
 man/Xserver.man  |  8 +-------
 os/utils.c       |  3 ---
 xfixes/cursor.c  |  5 +----
 6 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/dix/globals.c b/dix/globals.c
index 4b8b52e29..3491ff3a1 100644
--- a/dix/globals.c
+++ b/dix/globals.c
@@ -106,7 +106,6 @@ const char *defaultFontPath = COMPILEDDEFAULTFONTPATH;
 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 whiteRoot = FALSE;
 
 TimeStamp currentTime;
diff --git a/dix/window.c b/dix/window.c
index 284aa6dd7..353db5787 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -670,11 +670,7 @@ InitRootWindow(WindowPtr pWin)
     pWin->cursorIsNone = FALSE;
     pWin->optional->cursor = RefCursor(rootCursor);
 
-    if (party_like_its_1989) {
-        MakeRootTile(pWin);
-        backFlag |= CWBackPixmap;
-    }
-    else if (pScreen->canDoBGNoneRoot && bgNoneRoot) {
+    if (pScreen->canDoBGNoneRoot && bgNoneRoot) {
         pWin->backgroundState = XaceBackgroundNoneState(pWin);
         pWin->background.pixel = pScreen->whitePixel;
         backFlag |= CWBackPixmap;
@@ -1133,16 +1129,12 @@ SetRootWindowBackground(WindowPtr pWin, ScreenPtr pScreen, Mask *index2)
         pWin->backgroundState = XaceBackgroundNoneState(pWin);
         pWin->background.pixel = pScreen->whitePixel;
     }
-    else if (party_like_its_1989)
-        MakeRootTile(pWin);
-    else {
-        pWin->backgroundState = BackgroundPixel;
-        if (whiteRoot)
-            pWin->background.pixel = pScreen->whitePixel;
-        else
-            pWin->background.pixel = pScreen->blackPixel;
-        *index2 = CWBackPixel;
-    }
+    pWin->backgroundState = BackgroundPixel;
+    if (whiteRoot)
+        pWin->background.pixel = pScreen->whitePixel;
+    else
+        pWin->background.pixel = pScreen->blackPixel;
+    *index2 = CWBackPixel;
 }
 
 /*****
diff --git a/include/opaque.h b/include/opaque.h
index 398d4b4e5..94d0a9022 100644
--- a/include/opaque.h
+++ b/include/opaque.h
@@ -67,7 +67,6 @@ extern _X_EXPORT int limitNoFile;
 #endif
 extern _X_EXPORT Bool defeatAccessControl;
 extern _X_EXPORT long maxBigRequestSize;
-extern _X_EXPORT Bool party_like_its_1989;
 extern _X_EXPORT Bool whiteRoot;
 extern _X_EXPORT Bool bgNoneRoot;
 
diff --git a/man/Xserver.man b/man/Xserver.man
index e7adf9eb3..f1b8a6601 100644
--- a/man/Xserver.man
+++ b/man/Xserver.man
@@ -109,7 +109,7 @@ show a previous user session.
 .TP 8
 .B \-br
 sets the default root window to solid black instead of the standard root weave
-pattern.   This is the default unless -retro or -wr is specified.
+pattern. This is the default.
 .TP 8
 .B \-bs
 disables backing store support on all screens.
@@ -250,12 +250,6 @@ turns off auto-repeat.
 .B r
 turns on auto-repeat.
 .TP 8
-.B -retro
-starts the server 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(). For kdrive
-servers, this implies -zap.
-.TP 8
 .B \-s \fIminutes\fP
 sets screen-saver timeout time in minutes.
 .TP 8
diff --git a/os/utils.c b/os/utils.c
index a4712d0bf..d955cbf2b 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -571,7 +571,6 @@ UseMsg(void)
     ErrorF("-r                     turns off auto-repeat\n");
     ErrorF("r                      turns on auto-repeat \n");
     ErrorF("-render [default|mono|gray|color] set render color alloc policy\n");
-    ErrorF("-retro                 start with classic stipple and cursor\n");
     ErrorF("-s #                   screen-saver timeout (minutes)\n");
     ErrorF("-seat string           seat to run on\n");
     ErrorF("-t #                   default pointer threshold (pixels/t)\n");
@@ -923,8 +922,6 @@ 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)
                 defaultScreenSaverTime = ((CARD32) atoi(argv[i])) *
diff --git a/xfixes/cursor.c b/xfixes/cursor.c
index 83282ff0e..0bf5c90dd 100644
--- a/xfixes/cursor.c
+++ b/xfixes/cursor.c
@@ -1071,10 +1071,7 @@ XFixesCursorInit(void)
 {
     int i;
 
-    if (party_like_its_1989)
-        CursorVisible = EnableCursor;
-    else
-        CursorVisible = FALSE;
+    CursorVisible = FALSE;
 
     if (!dixRegisterPrivateKey(&CursorScreenPrivateKeyRec, PRIVATE_SCREEN, 0))
         return FALSE;