Removes spice-client support

1 files changed, 13 insertions, 7 deletions

diff --git a/kvmx b/kvmx
index 06fd288..40d70d4 100755
--- a/kvmx
+++ b/kvmx
@@ -254,29 +254,35 @@ function kvmx_spice {
     spicy -h localhost -p $PORT &
   elif [ "$spice_client" == "virt-viewer" ] && which virt-viewer &> /dev/null; then
     remote-viewer spice://localhost:$PORT &
-  elif [ ! -z "$spice_client" ] && [ "$spice_client" != "spicec" ]; then
+  #elif [ ! -z "$spice_client" ] && [ "$spice_client" != "spicec" ]; then
+  elif [ ! -z "$spice_client" ]; then
     echo "$BASENAME: spice_client $spice_client not currently supported"
     exit 1
   else
-    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 &
+    if which spicy &> /dev/null; then
+      spicy -h localhost -p $PORT &
     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="$!"
   echo "$SPICEPID" > $SPICEFILE
 
   # Give time to connect
-  sleep 1
+  sleep 2
 
   # Fix window title an position
   if which /usr/bin/xdotool &> /dev/null; then
     if [ ! -z "$xclient_windowmove" ]; then
-      xdotool search --name "SPICEc:0" windowmove $xclient_windowmove
+      #xdotool search --name "SPICEc:0" windowmove $xclient_windowmove
+      xdotool search --name "spice display 0:0" windowmove $xclient_windowmove
     fi
 
-    xdotool search --name "SPICEc:0" set_window --name $VM
+    #xdotool search --name "SPICEc:0" set_window --name $VM
     xdotool search --name "spice display 0:0" set_window --name $VM
   fi