diff options
| author | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2015-06-16 13:56:57 +0300 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2015-06-22 15:19:39 +0300 |
| commit | b37ac4006a555d78293eba2146210a461e395ba4 (patch) | |
| tree | d3acee670e8db39a7ab64124c21354a9dadc69bf /man | |
| parent | 0a9d348fd8e9672185dfebefd52e3dfeaa8c68cd (diff) | |
desktop-shell: remove screensaver support
This is a follow-up for the patch that removed weston-screensaver. The
aim is to clean up shell.c a little by removing non-essential
components. Vanilla Weston desktop is only a demo, external projects are
encouraged to create user-friendly desktop environments.
The support for launching a screensaver client and the protocol bindings
are removed. With them, all related configuration options are removed,
and the manuals are updated accordingly.
The screensaver protocol definition is left in desktop-shell.xml for
posterity.
This does not affect Weston's or desktop-shells ability to put screens
to sleep after inactivity. The inactivity timer continues to operate as
before. Also screen locking is unaffected.
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Acked-by: Giulio Camuffo <giuliocamuffo@gmail.com>
Diffstat (limited to 'man')
| -rw-r--r-- | man/weston.ini.man | 26 | ||||
| -rw-r--r-- | man/weston.man | 4 |
2 files changed, 3 insertions, 27 deletions
diff --git a/man/weston.ini.man b/man/weston.ini.man index fe86bb6c..a9b60267 100644 --- a/man/weston.ini.man +++ b/man/weston.ini.man @@ -73,7 +73,6 @@ The section headers are: .BR "libinput " "Input device configuration" .BR "shell " "Desktop customization" .BR "launcher " "Add launcher to the panel" -.BR "screensaver " "Screensaver selection" .BR "output " "Output configuration" .BR "input-method " "Onscreen keyboard input" .BR "keyboard " "Keyboard layouts" @@ -160,10 +159,7 @@ By default, xrgb8888 is used. .BI "idle-time="seconds sets Weston's idle timeout in seconds. This idle timeout is the time after which Weston will enter an "inactive" mode and screen will fade to -black. Note that a screensaver may also start at this moment after fade-out -(if enabled in the SCREENSAVER section below), but the current idle-time -option has nothing to do with screensavers. A value of 0 disables the -timeout. +black. A value of 0 disables the timeout. .IR Important : This option may also be set via Weston's '-i' command @@ -305,26 +301,6 @@ path=GDK_BACKEND=wayland gnome-terminal --full-screen .in .fi .PP -.RE -.SH "SCREENSAVER SECTION" -The -.B screensaver -section is used to select and schedule a screensaver. -The -.B screensaver -section is optional, as are all of the entries that may be specified in -it. -.TP 7 -.BI "path=" /usr/libexec/weston-screensaver -This instructs the compositor to use the selected screensaver client on a given -path (string). If this line is missing or commented out, the screensaver in -.B "weston(1)" -is disabled. -.RE -.TP 7 -.BI "duration=" 600 -The time in seconds until the screensaver disappears in order to save power -(unsigned integer). .SH "OUTPUT SECTION" There can be multiple output sections, each corresponding to one output. It is currently only recognized by the drm and x11 backends. diff --git a/man/weston.man b/man/weston.man index c5dc2f20..0c3e8dc8 100644 --- a/man/weston.man +++ b/man/weston.man @@ -134,8 +134,8 @@ Set the idle timeout to .I N seconds. The default timeout is 300 seconds. When there has not been any user input for the idle timeout, Weston enters an inactive mode. The -screen fades to black, and depending on the shell in use, a screensaver -may activate, monitors may switch off, and the shell may lock the session. +screen fades to black, monitors may switch off, and the shell may lock +the session. A value of 0 effectively disables the timeout. .TP \fB\-\-log\fR=\fIfile.log\fR |