Merge pull request #334 from DSD-DBS/xpra-focus-fix

fix: Fix an issue where modals could be unfocused causing soft-locks

remote/Dockerfile

@@ -45,6 +45,22 @@ RUN wget -qO /usr/share/keyrings/xpra.asc ${XPRA_REGISTRY}/xpra.asc && \
         nginx && \
     rm -rf /var/lib/apt/lists/*
 
+# Inject script to force focus on modal windows in xpra client
+# and remove the compressed index.html files because they don't contain our fix
+RUN sed -i '/load_default_settings();/a \
+setInterval(() => {\
+for (const [id, win] of Object.entries(client.id_to_window).toReversed()) {\
+    if (win.metadata.modal) {\
+        if (client.topwindow !== parseInt(id)) {\
+            console.log("Forcing focus on modal window", id);\
+            client.set_focus(win);\
+            break;\
+        }\
+    }\
+}\
+}, 100);' /usr/share/xpra/www/index.html \
+&& rm /usr/share/xpra/www/index.html.gz \
+&& rm /usr/share/xpra/www/index.html.br
 COPY rc.xml /etc/xdg/openbox/rc.xml
 COPY menu.xml /etc/xdg/openbox/menu.xml