diff options
| author | Simon Rettberg | 2020-03-09 16:24:58 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2020-03-09 16:24:58 +0100 |
| commit | 90f53d7678108619c690afc4bdafd57b0ca1bba1 (patch) | |
| tree | 37fb28087ae8f2115c408389906fcdf8677c73ca /core/modules/beamergui | |
| parent | [vmware-common] Remove ide1:* lines before adding CD-ROM drives (diff) | |
| download | mltk-90f53d7678108619c690afc4bdafd57b0ca1bba1.tar.gz mltk-90f53d7678108619c690afc4bdafd57b0ca1bba1.tar.xz mltk-90f53d7678108619c690afc4bdafd57b0ca1bba1.zip | |
[beamergui] Support SLX vars for manual screen config
SLX_FORCE_RESOLUTION is a list of space separated resolutions. It will
be applied to all outputs in alphabetical order. If there are more
outputs than resolutions in this list, it will "loop around", starting
to assign resolutions from the beginning of the list.
SLX_RESOLUTION_MAPPING can be given in addition to the above. In this
case, the resolutions won't be assigned in alphabetical order. The
variable is supposed to contain a list of space separated assignments
of the form <output>=<index>, for example
HDMI-2=0 DP-3=0 HDMI-1=1
would assign HDMI-2 and DP-3 to the first resolution of SLX_FORCE_RESOLUTION
and HDMI-1 to the second resolution, making the first two outputs a
clone of each other, and HDMI-1 extend to the right.
Diffstat (limited to 'core/modules/beamergui')
| -rwxr-xr-x | core/modules/beamergui/data/etc/X11/Xsession.d/99-beamergui-starter_script | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/core/modules/beamergui/data/etc/X11/Xsession.d/99-beamergui-starter_script b/core/modules/beamergui/data/etc/X11/Xsession.d/99-beamergui-starter_script index 981e87ba..a569d671 100755 --- a/core/modules/beamergui/data/etc/X11/Xsession.d/99-beamergui-starter_script +++ b/core/modules/beamergui/data/etc/X11/Xsession.d/99-beamergui-starter_script @@ -1,13 +1,22 @@ #!/bin/ash -/opt/openslx/bin/beamergui -a -# Detach -/bin/bash <<HERE -{ - ulimit -c unlimited - cd /tmp/ - /opt/openslx/bin/beamergui -b & -} & +[ -z "$SLX_KCL_SERVERS" ] && . /opt/openslx/config + +if [ -z "$SLX_FORCE_RESOLUTION" ]; then + /opt/openslx/bin/beamergui -a + # Detach + /bin/bash <<HERE + { + ulimit -c unlimited + cd /tmp/ + /opt/openslx/bin/beamergui -b & + } & HERE +elif [ -z "$SLX_RESOLUTION_MAPPING" ]; then + /opt/openslx/bin/beamergui --resolutions "$SLX_FORCE_RESOLUTION" +else + /opt/openslx/bin/beamergui --resolutions "$SLX_FORCE_RESOLUTION" --mapping "$SLX_RESOLUTION_MAPPING" +fi + true |