summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2010-10-20 01:23:06 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2010-10-24 13:28:45 +0200
commit7c75a71491a58b71bd56eebb2935f765ef726528 (patch)
treec1ac639746534cff3ce5d0ae2668d4664b88aeb9
parent1a0d9324b3d9fd93e685066e0e5cea0611878c0d (diff)
xserver: Enable visible cursor on start without -retro #26798master-retro
Not having a visible cursor by default poses problems with a lot of users: when they are faced with a completely dark screen without even a moving mouse, they think their machine is completely hung, while it could just be that X clients can't connect or are not starting for some reason. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=26798 Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
-rw-r--r--doc/Xserver.man.pre5
-rw-r--r--os/utils.c2
-rw-r--r--xfixes/cursor.c3
3 files changed, 4 insertions, 6 deletions
diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre
index ce3b3a10b..9a93d1207 100644
--- a/doc/Xserver.man.pre
+++ b/doc/Xserver.man.pre
@@ -208,9 +208,8 @@ turns off auto-repeat.
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(). For the Xorg
+starts the stipple with the classic stipple. The default
+is to start with a black root window. For the Xorg
server, this also sets the default for the DontZap option to FALSE. For
kdrive servers, this implies -zap.
.TP 8
diff --git a/os/utils.c b/os/utils.c
index 8921d7c5f..d9d31640d 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -509,7 +509,7 @@ void 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("-retro start with classic stipple\n");
ErrorF("-s # screen-saver timeout (minutes)\n");
ErrorF("-t # default pointer threshold (pixels/t)\n");
ErrorF("-terminate terminate at server reset\n");
diff --git a/xfixes/cursor.c b/xfixes/cursor.c
index 41ba0fbac..22477ffd4 100644
--- a/xfixes/cursor.c
+++ b/xfixes/cursor.c
@@ -1034,8 +1034,7 @@ XFixesCursorInit (void)
{
int i;
- if (party_like_its_1989)
- CursorVisible = EnableCursor;
+ CursorVisible = EnableCursor;
if (!dixRegisterPrivateKey(&CursorScreenPrivateKeyRec, PRIVATE_SCREEN, 0))
return FALSE;