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

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>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-02-06 13:45:31 +01:00
parent b3b86ae674
commit 7780dd0eb5
6 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dix/globals.c
View File

@ -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;

10
dix/window.c
View File

@ -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;
}
}
/*****

1
include/opaque.h
View File

@ -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;

8
man/Xserver.man
View File

@ -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

3
os/utils.c
View File

@ -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])) *

3
xfixes/cursor.c
View File

@ -1071,9 +1071,6 @@ XFixesCursorInit(void)
{
int i;
if (party_like_its_1989)
CursorVisible = EnableCursor;
else
CursorVisible = FALSE;
if (!dixRegisterPrivateKey(&CursorScreenPrivateKeyRec, PRIVATE_SCREEN, 0))