From 25e3811d7e26ad427f2f628bf0d8260b76c15cf6 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 29 Dec 2022 01:23:04 -0300
Subject: Fix: spice clients support

---
 IDEAS.md |  2 ++
 kvmx     | 16 +++++++++-------
 kvmxfile |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/IDEAS.md b/IDEAS.md
index 471f9c9..7bb6e90 100644
--- a/IDEAS.md
+++ b/IDEAS.md
@@ -12,6 +12,8 @@
 
 * Shell completions.
 
+* Support for other Spice clients such as [Remmina](https://remmina.org).
+
 * Support for multiple source/targets pairs (analogous to `shared_folders`) at:
   * `provision_rsync`
 
diff --git a/kvmx b/kvmx
index fb0faec..1ca55e1 100755
--- a/kvmx
+++ b/kvmx
@@ -257,10 +257,17 @@ function kvmx_spice {
   if [ "$spice_client" == "spicy" ] && which spicy &> /dev/null; then
     #spicy -h localhost -p $PORT &
     spicy --uri=spice+unix://$SPICESOCKET &
-  elif [ "$spice_client" == "virt-viewer" ] && which virt-viewer &> /dev/null; then
+  elif [ "$spice_client" == "remote-viewer" ] && which remote-viewer &> /dev/null; then
     #remote-viewer spice://localhost:$PORT &
     remote-viewer spice+unix://$SPICESOCKET &
-  #elif [ ! -z "$spice_client" ] && [ "$spice_client" != "spicec" ]; then
+  # This is untested due to libvirt requirements
+  elif [ "$spice_client" == "virt-viewer" ] && which virt-viewer &> /dev/null; then
+    #virt-viewer spice://localhost:$PORT &
+    virt-viewer spice+unix://$SPICESOCKET &
+  # Unsupported as spicec was deprecated
+  #elif [ "$spice_client" != "spicec" ] && which spicec &> /dev/null; then
+  #  # https://lists.freedesktop.org/archives/spice-devel/2013-September/014643.html
+  #  SPICE_NOGRAB=1 spicec --host localhost --port $PORT &> $SPICELOG &
   elif [ ! -z "$spice_client" ]; then
     echo "$BASENAME: spice_client $spice_client not currently supported"
     exit 1
@@ -269,11 +276,6 @@ function kvmx_spice {
       #spicy -h localhost -p $PORT &
       spicy --uri=spice+unix://$SPICESOCKET &
     fi
-
-    #if which spicec &> /dev/null; then
-    #  # https://lists.freedesktop.org/archives/spice-devel/2013-September/014643.html
-    #  SPICE_NOGRAB=1 spicec --host localhost --port $PORT &> $SPICELOG &
-    #fi
   fi
 
   SPICEPID="$!"
diff --git a/kvmxfile b/kvmxfile
index d517972..8d7246c 100644
--- a/kvmxfile
+++ b/kvmxfile
@@ -105,7 +105,7 @@ spice="1"
 run_spice_client="1"
 
 # SPICE client
-#spice_client="spicec"
+#spice_client="remote-viewer"
 #spice_client="virt-viewer"
 spice_client="spicy"
 
-- 
cgit v1.2.3