From 3ecee5be77e20340ffa9424229ce17ad44af897d Mon Sep 17 00:00:00 2001
From: Maxim Stewart <maximstewart1@gmail.com>
Date: Mon, 29 Jun 2020 18:31:57 -0500
Subject: [PATCH] Fixed bug, cleaned up routes

---
 src/core/routes/Routes.py    | 57 -----------------------------
 src/core/routes/Sockets.py   | 70 ++++++++++++++++++++++++++++++++++++
 src/core/routes/__init__.py  |  1 +
 src/core/static/js/events.js |  4 +--
 4 files changed, 73 insertions(+), 59 deletions(-)
 create mode 100644 src/core/routes/Sockets.py

diff --git a/src/core/routes/Routes.py b/src/core/routes/Routes.py
index 884be67..a73e233 100644
--- a/src/core/routes/Routes.py
+++ b/src/core/routes/Routes.py
@@ -10,8 +10,6 @@ from core import app, socketio                   # Get from __init__
 from core.MessageHandler import MessageHandler   # Get simple message processor
 
 
-
-
 msgHandler = MessageHandler()
 TITLE      = app.config['TITLE']
 
@@ -32,61 +30,6 @@ def home():
                             message='Must use GET request type...')
 
 
-
-@app.route('/mouse-down')
-@socketio.on('mouse_down')
-def mouseDown(eve = None):
-    pyautogui.mouseDown()
-    return ""
-
-@app.route('/mouse-up')
-@socketio.on('mouse_up')
-def mouseUp(eve = None):
-    pyautogui.mouseUp()
-    return ""
-
-
-@app.route('/left-click')
-@socketio.on('left_click')
-def leftClick(eve = None):
-    pyautogui.click()
-    return ""
-
-@app.route('/right-click')
-@socketio.on('right_click')
-def rightClick(eve = None):
-    pyautogui.click(button='right')
-    return ""
-
-@app.route('/scroll-up')
-@socketio.on('scroll_up')
-def scrollUp(eve = None):
-    pyautogui.scroll(1)
-    return ""
-
-@app.route('/scroll-down')
-@socketio.on('scroll_down')
-def scrollDown(eve = None):
-    pyautogui.scroll(-1)
-    return ""
-
-@app.route('/get-coords')
-def getCoords():
-    x, y = pyautogui.position();
-    return '{"x": "'+ str(x) +'", "y":"' + str(y) + '"}'
-
-
-@socketio.on('update_coords')
-def updateCoords(message):
-    try:
-        parts = message.split(",")
-        x     = float( parts[0] )
-        y     = float( parts[1] )
-        # print(str(x) + "," + str(y))
-        pyautogui.moveRel(x, y);
-    except Exception as e:
-        print( repr(e) )
-
 @app.route('/update-coords/xy/<x>/<y>')
 def updateCoords2(x, y):
     try:
diff --git a/src/core/routes/Sockets.py b/src/core/routes/Sockets.py
new file mode 100644
index 0000000..32d0931
--- /dev/null
+++ b/src/core/routes/Sockets.py
@@ -0,0 +1,70 @@
+# Python imports
+
+# Lib imports
+import pyautogui
+from flask import request, render_template
+
+
+# App imports
+from core import app, socketio                   # Get from __init__
+from core.MessageHandler import MessageHandler   # Get simple message processor
+
+
+
+
+msgHandler = MessageHandler()
+
+pyautogui.FAILSAFE = False                       # If we hit corner, that's ok
+# Let piautogui make updates as quick as it can...
+pyautogui.MINIMUM_DURATION = 0
+pyautogui.PAUSE = 0
+
+
+@app.route('/mouse-down')
+@socketio.on('mouse_down')
+def mouseDown(eve = None):
+    pyautogui.mouseDown()
+    return ""
+
+@app.route('/mouse-up')
+@socketio.on('mouse_up')
+def mouseUp(eve = None):
+    pyautogui.mouseUp()
+    return ""
+
+
+@app.route('/left-click')
+@socketio.on('left_click')
+def leftClick(eve = None):
+    pyautogui.click()
+    return ""
+
+@app.route('/right-click')
+@socketio.on('right_click')
+def rightClick(eve = None):
+    pyautogui.click(button='right')
+    return ""
+
+@app.route('/scroll-up')
+@socketio.on('scroll_up')
+def scrollUp(eve = None):
+    pyautogui.scroll(1)
+    return ""
+
+@app.route('/scroll-down')
+@socketio.on('scroll_down')
+def scrollDown(eve = None):
+    pyautogui.scroll(-1)
+    return ""
+
+
+@socketio.on('update_coords')
+def updateCoords(message):
+    try:
+        parts = message.split(",")
+        x     = float( parts[0] )
+        y     = float( parts[1] )
+        # print(str(x) + "," + str(y))
+        pyautogui.moveRel(x, y);
+    except Exception as e:
+        print( repr(e) )
diff --git a/src/core/routes/__init__.py b/src/core/routes/__init__.py
index ffe39af..87f0c04 100644
--- a/src/core/routes/__init__.py
+++ b/src/core/routes/__init__.py
@@ -1 +1,2 @@
 from . import Routes
+from . import Sockets
diff --git a/src/core/static/js/events.js b/src/core/static/js/events.js
index fce49e7..f20c1ea 100644
--- a/src/core/static/js/events.js
+++ b/src/core/static/js/events.js
@@ -125,7 +125,7 @@ function scrollToggle() {
 }
 
 
-function scrollToggle() {
+function holdToggle() {
     if (isHoldingMouse) {
         isHoldingMouse = false;
         mouseHoldToggle.classList.add("btn-success");
@@ -159,4 +159,4 @@ document.getElementById("leftClickBtn").addEventListener("mouseup", leftClick, t
 document.getElementById("rightClickBtn").addEventListener("mouseup", rightClick, true);
 
 document.getElementById("scrollToggle").addEventListener("mouseup", scrollToggle, true);
-document.getElementById("mouseHoldToggle").addEventListener("mouseup", mouseHoldToggle, true);
+document.getElementById("mouseHoldToggle").addEventListener("mouseup", holdToggle, true);