From 466cd6f43cafbbf07bcc94d46af55c74b3666cc0 Mon Sep 17 00:00:00 2001
From: thelamer <ryankuba@gmail.com>
Date: Mon, 11 Mar 2024 14:45:45 -0700
Subject: [PATCH] arch add option to disable DRI keyboard shortcuts for decor

---
 Dockerfile                                  | 1 +
 Dockerfile.aarch64                          | 1 +
 root/etc/s6-overlay/s6-rc.d/svc-kasmvnc/run | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index edfd1a7..c26d173 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -324,6 +324,7 @@ RUN \
   sed -i \
     -e 's/NLIMC/NLMC/g' \
     -e 's|</applications>|  <application class="*"><maximized>yes</maximized></application>\n</applications>|' \
+    -e 's|</keyboard>|  <keybind key="C-S-d"><action name="ToggleDecorations"/></keybind>\n</keyboard>|' \
     /etc/xdg/openbox/rc.xml && \
   echo "**** kasm support ****" && \
   mkdir -p /kasmbins && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 353f96f..0e1f308 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -324,6 +324,7 @@ RUN \
   sed -i \
     -e 's/NLIMC/NLMC/g' \
     -e 's|</applications>|  <application class="*"><maximized>yes</maximized></application>\n</applications>|' \
+    -e 's|</keyboard>|  <keybind key="C-S-d"><action name="ToggleDecorations"/></keybind>\n</keyboard>|' \
     /etc/xdg/openbox/rc.xml && \
   echo "**** kasm support ****" && \
   mkdir -p /kasmbins && \
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