From 283259249495d2fc39465311f2130b1c77561384 Mon Sep 17 00:00:00 2001 From: thelamer Date: Mon, 11 Mar 2024 12:14:20 -0700 Subject: [PATCH] master add option to disable DRI keyboard shortcuts for decor --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + README.md | 3 ++- readme-vars.yml | 3 ++- root/etc/s6-overlay/s6-rc.d/svc-kasmvnc/run | 2 +- 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4188486..406f931 100644 --- a/Dockerfile +++ b/Dockerfile @@ -334,6 +334,7 @@ RUN \ sed -i \ -e 's/NLIMC/NLMC/g' \ -e 's|| yes\n|' \ + -e 's|| \n|' \ /etc/xdg/openbox/rc.xml && \ echo "**** user perms ****" && \ echo "abc:abc" | chpasswd && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 68744e4..08e96c1 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -338,6 +338,7 @@ RUN \ sed -i \ -e 's/NLIMC/NLMC/g' \ -e 's|| yes\n|' \ + -e 's|| \n|' \ /etc/xdg/openbox/rc.xml && \ echo "**** user perms ****" && \ echo "abc:abc" | chpasswd && \ diff --git a/README.md b/README.md index 4dc4088..805eff8 100644 --- a/README.md +++ b/README.md @@ -31,9 +31,10 @@ All application settings are passed via environment variables: | FM_HOME | This is the home directory (landing) for the file manager, default "/config". | | START_DOCKER | If set to false a container with privilege will not automatically start the DinD Docker setup. | | DRINODE | If mounting in /dev/dri for [DRI3 GPU Acceleration](https://www.kasmweb.com/kasmvnc/docs/master/gpu_acceleration.html) allows you to specify the device to use | +| DISABLE_DRI | When using privilged mode or mounting in a video card, do not attempt to use it for DRI3 acceleration in KasmVNC | | DISABLE_IPV6 | If set to true or any value this will disable IPv6 | | LC_ALL | Set the Language for the container to run as IE `fr_FR.UTF-8` `ar_AE.UTF-8` | -| NO_DECOR | If set the application will run without window borders for use as a PWA. | +| NO_DECOR | If set the application will run without window borders for use as a PWA. (Decor can be enabled and disabled with Ctrl+Shift+d) | | NO_FULL | Do not autmatically fullscreen applications when using openbox. | ## Language Support - Internationalization diff --git a/readme-vars.yml b/readme-vars.yml index 31a94ee..b181014 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -35,9 +35,10 @@ full_custom_readme: | | FM_HOME | This is the home directory (landing) for the file manager, default "/config". | | START_DOCKER | If set to false a container with privilege will not automatically start the DinD Docker setup. | | DRINODE | If mounting in /dev/dri for [DRI3 GPU Acceleration](https://www.kasmweb.com/kasmvnc/docs/master/gpu_acceleration.html) allows you to specify the device to use | + | DISABLE_DRI | When using privilged mode or mounting in a video card, do not attempt to use it for DRI3 acceleration in KasmVNC | | DISABLE_IPV6 | If set to true or any value this will disable IPv6 | | LC_ALL | Set the Language for the container to run as IE `fr_FR.UTF-8` `ar_AE.UTF-8` | - | NO_DECOR | If set the application will run without window borders for use as a PWA. | + | NO_DECOR | If set the application will run without window borders for use as a PWA. (Decor can be enabled and disabled with Ctrl+Shift+d) | | NO_FULL | Do not autmatically fullscreen applications when using openbox. | ## Language Support - Internationalization diff --git a/root/etc/s6-overlay/s6-rc.d/svc-kasmvnc/run b/root/etc/s6-overlay/s6-rc.d/svc-kasmvnc/run index 9634762..aebd469 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-kasmvnc/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-kasmvnc/run @@ -1,7 +1,7 @@ #!/usr/bin/with-contenv bash # Pass gpu flags if mounted -if ls /dev/dri/renderD* 1> /dev/null 2>&1; then +if ls /dev/dri/renderD* 1> /dev/null 2>&1 && [ -z ${DISABLE_DRI+x} ]; then HW3D="-hw3d" fi if [ -z ${DRINODE+x} ]; then