From 819e3b852c2efdb413e6aee148dbf001c8e2a7f4 Mon Sep 17 00:00:00 2001
From: thelamer <ryankuba@gmail.com>
Date: Sat, 12 Feb 2022 15:21:38 -0800
Subject: [PATCH] do not rebind touch on guac reset

---
 public/js/rdp.js | 102 +++++++++++++++++++++++------------------------
 1 file changed, 51 insertions(+), 51 deletions(-)

diff --git a/public/js/rdp.js b/public/js/rdp.js
index cc556f6..c1c64b1 100644
--- a/public/js/rdp.js
+++ b/public/js/rdp.js
@@ -61,57 +61,6 @@ function runGuac(reset) {
   mouse.onmousemove = function(mouseState) {
     guac.sendMouseState(mouseState);
   };
-  // Touchscreen
-  var timeOut = 1000;
-  var timer;
-  var timerFired;
-  var startX;
-  var startY;
-  $('#display').bind('touchmove', function(e) {
-    e.preventDefault();
-    let touch = e.originalEvent.touches[0] || e.originalEvent.changedTouches[0];
-    let xPos = Math.round(touch.pageX);
-    let yPos = Math.round(touch.pageY);
-    if ((Math.abs(yPos - startY) > 1) || (Math.abs(xPos - startX) > 1)) {
-      startX = 0;
-      startY = 0;
-      clearTimeout(timer);
-      touchState.left = true;
-      touchState.x = xPos;
-      touchState.y = yPos;
-      guac.sendMouseState(touchState);
-    }
-  });
-  $('#display').bind('touchstart', function(e) {
-    e.preventDefault();
-    let touch = e.originalEvent.touches[0] || e.originalEvent.changedTouches[0];
-    startX = Math.round(touch.pageX);
-    startY = Math.round(touch.pagey);
-    touchState.x = Math.round(touch.pageX);
-    touchState.y = Math.round(touch.pageY);
-    guac.sendMouseState(touchState);
-    timer = setTimeout(function() {
-      touchState.left = false;
-      touchState.right = true;
-      guac.sendMouseState(touchState);
-      touchState.right = false;
-      guac.sendMouseState(touchState);
-      timerFired = true;
-    }, timeOut);
-  });
-  $('#display').bind('touchend', function(e) {
-    e.preventDefault();
-    clearTimeout(timer);
-    if (timerFired) {
-      timerFired = false;
-    } else {
-      touchState.left = true;
-    }
-    guac.sendMouseState(touchState);
-    touchState.left = false;
-    touchState.right = false;
-    guac.sendMouseState(touchState);
-  });
   // Audio
   guac.onaudio = function clientAudio(stream, mimetype) {
     let context = Guacamole.AudioContextFactory.getAudioContext();
@@ -138,6 +87,57 @@ function runGuac(reset) {
         guac.sendKeyEvent(0, keysym);
       };
     });
+    // Touchscreen
+    var timeOut = 1000;
+    var timer;
+    var timerFired;
+    var startX;
+    var startY;
+    $('#display').bind('touchmove', function(e) {
+      e.preventDefault();
+      let touch = e.originalEvent.touches[0] || e.originalEvent.changedTouches[0];
+      let xPos = Math.round(touch.pageX);
+      let yPos = Math.round(touch.pageY);
+      if ((Math.abs(yPos - startY) > 1) || (Math.abs(xPos - startX) > 1)) {
+        startX = 0;
+        startY = 0;
+        clearTimeout(timer);
+        touchState.left = true;
+        touchState.x = xPos;
+        touchState.y = yPos;
+        guac.sendMouseState(touchState);
+      }
+    });
+    $('#display').bind('touchstart', function(e) {
+      e.preventDefault();
+      let touch = e.originalEvent.touches[0] || e.originalEvent.changedTouches[0];
+      startX = Math.round(touch.pageX);
+      startY = Math.round(touch.pagey);
+      touchState.x = Math.round(touch.pageX);
+      touchState.y = Math.round(touch.pageY);
+      guac.sendMouseState(touchState);
+      timer = setTimeout(function() {
+        touchState.left = false;
+        touchState.right = true;
+        guac.sendMouseState(touchState);
+        touchState.right = false;
+        guac.sendMouseState(touchState);
+        timerFired = true;
+      }, timeOut);
+    });
+    $('#display').bind('touchend', function(e) {
+      e.preventDefault();
+      clearTimeout(timer);
+      if (timerFired) {
+        timerFired = false;
+      } else {
+        touchState.left = true;
+      }
+      guac.sendMouseState(touchState);
+      touchState.left = false;
+      touchState.right = false;
+      guac.sendMouseState(touchState);
+    });
   }
 }