Commit 5c20e4b8 authored by Olivier Fourdan's avatar Olivier Fourdan
Browse files

xwayland: Disable the MIT-SCREEN-SAVER extension when rootless

Xwayland is just a Wayland client, no X11 screensaver should be
expected to work reliably on Xwayland when running rootless because
Xwayland cannot grab the input devices so it has no way to actually
lock the screen managed by the Wayland compositor.

Turn off the screensaver on Xwayland when running rootless by setting
the screensaver timeout and interval and their default values to zero
and disable the MIT-SCREEN-SAVER extension.

Closes: xorg/xserver#1051

Signed-off-by: default avatarOlivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer's avatarMichel Dänzer <mdaenzer@redhat.com>
Reviewed-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
parent aac28e16
......@@ -575,6 +575,19 @@ xwl_screen_init(ScreenPtr pScreen, int argc, char **argv)
for (i = 1; i < argc; i++) {
if (strcmp(argv[i], "-rootless") == 0) {
xwl_screen->rootless = 1;
/* Disable the XSS extension on Xwayland rootless.
*
* Xwayland is just a Wayland client, no X11 screensaver
* should be expected to work reliably on Xwayland rootless.
*/
#ifdef SCREENSAVER
noScreenSaverExtension = TRUE;
#endif
ScreenSaverTime = 0;
ScreenSaverInterval = 0;
defaultScreenSaverTime = 0;
defaultScreenSaverInterval = 0;
}
else if (strcmp(argv[i], "-shm") == 0) {
xwl_screen->glamor = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment