diff options
| author | Jonathan Bauer | 2021-03-23 15:46:38 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2021-03-23 15:46:38 +0100 |
| commit | 8bb56845eab1155ad46e17f6cad8ef03196d443c (patch) | |
| tree | feeb575cee10d7286ece3553538e722689a42ace | |
| parent | Merge branch 'master' into installer (diff) | |
| parent | [kiosk-common/kiosk-chromium] Support multimedia keys (diff) | |
| download | mltk-8bb56845eab1155ad46e17f6cad8ef03196d443c.tar.gz mltk-8bb56845eab1155ad46e17f6cad8ef03196d443c.tar.xz mltk-8bb56845eab1155ad46e17f6cad8ef03196d443c.zip | |
Merge branch 'master' into installer
4 files changed, 40 insertions, 23 deletions
diff --git a/core/modules/kiosk-chromium/data/opt/openslx/scripts/kiosk-launch.d/00-chromium b/core/modules/kiosk-chromium/data/opt/openslx/scripts/kiosk-launch.d/00-chromium index a98332df..bb4204e0 100644 --- a/core/modules/kiosk-chromium/data/opt/openslx/scripts/kiosk-launch.d/00-chromium +++ b/core/modules/kiosk-chromium/data/opt/openslx/scripts/kiosk-launch.d/00-chromium @@ -75,29 +75,6 @@ if [ -z "$SLX_BROWSER_INTERACTIVE" ]; then # Autologin active, go full fullscreen chromium_args+=("--kiosk") fi - - # swallow keyboard shortcuts of chromium - cat <<- EOF > "$HOME/.xbindkeysrc" - "true" - Control+d - "true" - Control+t - "true" - Control+s - "true" - Control+n - "true" - Control+j - "true" - Control+p - "true" - Control+h - "true" - Control+Shift+o - EOF - # xbinkeys requires a daemon, run it - xbindkeys_autostart & - fi if [ -n "$SLX_BROWSER_RELOAD_SECS" ] && [ "$SLX_BROWSER_RELOAD_SECS" -gt 0 ]; then diff --git a/core/modules/kiosk-common/data/opt/openslx/lightdm/xbindkeys-kiosk-interactive.rc b/core/modules/kiosk-common/data/opt/openslx/lightdm/xbindkeys-kiosk-interactive.rc new file mode 100644 index 00000000..70e197a1 --- /dev/null +++ b/core/modules/kiosk-common/data/opt/openslx/lightdm/xbindkeys-kiosk-interactive.rc @@ -0,0 +1,8 @@ + "pactl set-sink-volume @DEFAULT_SINK@ +1000" + XF86AudioRaiseVolume + "pactl set-sink-volume @DEFAULT_SINK@ -1000" + XF86AudioLowerVolume + "pactl set-sink-mute @DEFAULT_SINK@ toggle" + XF86AudioMute + "pactl set-source-mute @DEFAULT_SOURCE@ toggle" + XF86AudioMicMute diff --git a/core/modules/kiosk-common/data/opt/openslx/lightdm/xbindkeys-kiosk.rc b/core/modules/kiosk-common/data/opt/openslx/lightdm/xbindkeys-kiosk.rc new file mode 100644 index 00000000..4f9e7cf5 --- /dev/null +++ b/core/modules/kiosk-common/data/opt/openslx/lightdm/xbindkeys-kiosk.rc @@ -0,0 +1,24 @@ + "true" + Control+d + "true" + Control+t + "true" + Control+s + "true" + Control+n + "true" + Control+j + "true" + Control+p + "true" + Control+h + "true" + Control+Shift+o + "pactl set-sink-volume @DEFAULT_SINK@ +1000" + XF86AudioRaiseVolume + "pactl set-sink-volume @DEFAULT_SINK@ -1000" + XF86AudioLowerVolume + "pactl set-sink-mute @DEFAULT_SINK@ toggle" + XF86AudioMute + "pactl set-source-mute @DEFAULT_SOURCE@ toggle" + XF86AudioMicMute diff --git a/core/modules/kiosk-common/data/opt/openslx/scripts/kiosk-launch b/core/modules/kiosk-common/data/opt/openslx/scripts/kiosk-launch index 8525d2f2..263ff855 100755 --- a/core/modules/kiosk-common/data/opt/openslx/scripts/kiosk-launch +++ b/core/modules/kiosk-common/data/opt/openslx/scripts/kiosk-launch @@ -19,6 +19,14 @@ openbox --config-file "/etc/xdg/openbox/rc.xml.kiosk" & # move the mouse away xdotool mousemove 20000 20000 +if [ -z "$SLX_BROWSER_INTERACTIVE" ]; then + # swallow keyboard shortcuts of chromium + xbindkeys -f /opt/openslx/lightdm/xbindkeys-kiosk.rc & +else + # volume controls only + xbindkeys -f /opt/openslx/lightdm/xbindkeys-kiosk-interactive.rc & +fi + # Remember list of jobs running the background, so we can clean up # any mess left around by failed attempts below # |