Only cancel key events if they are non-typable. Track key states to avoid doubling...

[guacamole.git] / src / main / webapp / scripts / interface.js

diff --git a/src/main/webapp/scripts/interface.js b/src/main/webapp/scripts/interface.js
index be79b38..c8d8ee9 100644 (file)
--- a/src/main/webapp/scripts/interface.js
+++ b/src/main/webapp/scripts/interface.js
@@ -349,13 +349,6 @@ var GuacamoleUI = {
         menuShowLongPressTimeout = null;
     };
 
-    // Reset event target (add content, reposition cursor in middle.
-    GuacamoleUI.resetEventTarget = function() {
-        GuacamoleUI.eventTarget.value = "GUAC";
-        GuacamoleUI.eventTarget.selectionStart =
-        GuacamoleUI.eventTarget.selectionEnd   = 2;
-    };
-
     // Detect long-press at bottom of screen
     GuacamoleUI.display.addEventListener('touchstart', function(e) {
         
@@ -421,7 +414,7 @@ var GuacamoleUI = {
 GuacamoleUI.attach = function(guac) {
 
     var title_prefix = null;
-    var connection_name = null 
+    var connection_name = "Guacamole"; 
     
     var guac_display = guac.getDisplay();
 
@@ -494,6 +487,11 @@ GuacamoleUI.attach = function(guac) {
 
     // Keyboard
     var keyboard = new Guacamole.Keyboard(document);
+    var keysymPressed = [];
+
+    function isTypableCharacter(keysym) {
+        return (keysym & 0xFFFF00) != 0xFF00;
+    }
 
     function disableKeyboard() {
         keyboard.onkeydown = null;
@@ -501,21 +499,19 @@ GuacamoleUI.attach = function(guac) {
     }
 
     function enableKeyboard() {
-        keyboard.onkeydown = 
-            function (keysym) {
-          
-                // If we're using native OSK, ensure event target is reset
-                // on each key event.
-                if (GuacamoleUI.oskMode == GuacamoleUI.OSK_MODE_NATIVE)
-                    GuacamoleUI.resetEventTarget();
-                
-                guac.sendKeyEvent(1, keysym);
-            };
 
-        keyboard.onkeyup = 
-            function (keysym) {
-                guac.sendKeyEvent(0, keysym);
-            };
+        keyboard.onkeydown = function (keysym) {
+            guac.sendKeyEvent(1, keysym);
+            keysymPressed[keysym] = true;
+            return isTypableCharacter(keysym);
+        };
+
+        keyboard.onkeyup = function (keysym) {
+            guac.sendKeyEvent(0, keysym);
+            keysymPressed[keysym] = false;
+            return isTypableCharacter(keysym);
+        };
+
     }
 
     // Enable keyboard by default
@@ -547,13 +543,7 @@ GuacamoleUI.attach = function(guac) {
 
             // Connected
             case 3:
-                
                 GuacamoleUI.hideStatus();
-                GuacamoleUI.display.className =
-                    GuacamoleUI.display.className.replace(/guac-loading/, '');
-
-                GuacamoleUI.menu.className = "connected";
-
                 title_prefix = null;
                 break;
 
@@ -600,6 +590,54 @@ GuacamoleUI.attach = function(guac) {
         guac.disconnect();
     };
 
+    // Save length for calculation of changed value
+    var currentLength = GuacamoleUI.eventTarget.value.length;
+
+    // If text is input directly into event target without typing (as with
+    // voice input, for example), type automatically.
+    GuacamoleUI.eventTarget.oninput = function(e) {
+
+        // Calculate current length and change in length
+        var newLength = GuacamoleUI.eventTarget.value.length;
+        var changeLength = newLength - currentLength;
+        currentLength = newLength;
+        
+        // If deleted or replaced text, ignore
+        if (changeLength <= 0)
+            return;
+
+        // Get changed text
+        var text = GuacamoleUI.eventTarget.value.substring(
+            GuacamoleUI.eventTarget.selectionStart,
+            GuacamoleUI.eventTarget.selectionStart + changeLength
+        );
+
+        // Send each character
+        for (var i=0; i<text.length; i++) {
+
+            // Get char code
+            var charCode = text.charCodeAt(i);
+
+            // Convert to keysym
+            var keysym = 0x003F; // Default to a question mark
+            if (charCode >= 0x0000 && charCode <= 0x00FF)
+                keysym = charCode;
+            else if (charCode >= 0x0100 && charCode <= 0x10FFFF)
+                keysym = 0x01000000 | charCode;
+
+            // Send keysym only if not already pressed
+            if (!keysymPressed[keysym]) {
+
+                // Press and release key
+                guac.sendKeyEvent(1, keysym);
+                guac.sendKeyEvent(0, keysym);
+
+            }
+
+        }
+
+    }
+
     // Handle clipboard events
     GuacamoleUI.clipboard.onchange = function() {