From ea86783651f5561bc735f7393a6d1b8aca81b4d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Fri, 25 Feb 2022 08:17:44 +0100
Subject: sway: improve integration

---
 local/bin/sshvnc    | 4 ++--
 local/bin/startsway | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'local/bin')

diff --git a/local/bin/sshvnc b/local/bin/sshvnc
index 8b6fa0d..af133b4 100755
--- a/local/bin/sshvnc
+++ b/local/bin/sshvnc
@@ -9,9 +9,9 @@ while lsof -i:$localport; do
 done
 
 ssh -L "$localport":localhost:5900 "$target" \
-	'x11vnc -bg -localhost -display :0'
+	'start-stop-daemon -v -w 1000 -bmp "/var/run/user/$(id -u)/sshvnc.pid" -e WAYLAND_DISPLAY=wayland-1 -S wayvnc localhost 5900'
 
 vncviewer "localhost:$localport"
 
-ssh "$target" 'x11vnc -remote stop -localhost -display :0'
+ssh "$target" 'start-stop-daemon -v -p /var/run/user/$(id -u)/sshvnc.pid -K wayvnc'
 ssh -O cancel -L "$localport":localhost:5900 "$target"
diff --git a/local/bin/startsway b/local/bin/startsway
index 995362e..63163ee 100755
--- a/local/bin/startsway
+++ b/local/bin/startsway
@@ -14,5 +14,7 @@ export force_s3tc_enable=true
 # Fix firefox touchscreen gestures and force wayland
 export MOZ_USE_XINPUT2=1
 export MOZ_ENABLE_WAYLAND=1
+# Java application do not display properly
+export _JAVA_AWT_WM_NONREPARENTING=1
 
 exec dbus-run-session sway
-- 
cgit v1.2.3