Merge branch 'qemufix' of https://github.com/CendioOssman/noVNC

[mirror_novnc.git] / tests / input.html

diff --git a/tests/input.html b/tests/input.html
index a513645cac4970b8c7de4aa02b09fce4f4559f54..4925a3a80d3f45d87015b7c7694e09dec1aa0716 100644 (file)
--- a/tests/input.html
+++ b/tests/input.html
@@ -26,11 +26,12 @@
     <script src="../core/util.js"></script>
     <script src="../app/webutil.js"></script>
     <script src="../core/base64.js"></script>
-    <script src="../core/keysym.js"></script>
-    <script src="../core/keysymdef.js"></script> 
-    <script src="../core/xtscancodes.js"></script>
-    <script src="../core/keyboard.js"></script>
-    <script src="../core/input.js"></script>
+    <script src="../core/input/keysym.js"></script>
+    <script src="../core/input/keysymdef.js"></script>
+    <script src="../core/input/xtscancodes.js"></script>
+    <script src="../core/input/vkeys.js"></script>
+    <script src="../core/input/util.js"></script>
+    <script src="../core/input/devices.js"></script>
     <script src="../core/display.js"></script>
     <script>
         var msg_cnt = 0, iterations,
@@ -38,14 +39,11 @@
             canvas, keyboard, mouse;
 
         var newline = "\n";
-        if (Util.Engine.trident) {
-            var newline = "<br>\n";
-        }
 
         function message(str) {
             console.log(str);
             cell = document.getElementById('messages');
-            cell.innerHTML += msg_cnt + ": " + str + newline;
+            cell.textContent += msg_cnt + ": " + str + newline;
             cell.scrollTop = cell.scrollHeight;
             msg_cnt++;
         }
@@ -61,13 +59,9 @@
             //console.log(msg);
         }
 
-        function rfbKeyPress(keysym, down) {
+        function rfbKeyEvent(keysym, code, down) {
             var d = down ? "down" : " up ";
-            var key = keysyms.lookup(keysym);
-            var msg = "RFB keypress " + d + " keysym: " + keysym;
-            if (key && key.keyname) {
-                msg += " key name: " + key.keyname;
-            }
+            var msg = "RFB key event " + d + " keysym: " + keysym + " code: " + code;
             message(msg);
         }
         function rawKey(e) {
@@ -106,7 +100,7 @@
         window.onload = function() {
             canvas = new Display({'target' : document.getElementById('canvas')});
             keyboard = new Keyboard({'target': document,
-                                    'onKeyPress': rfbKeyPress});
+                                    'onKeyEvent': rfbKeyEvent});
             document.addEventListener('keypress', rawKey);
             document.addEventListener('keydown', rawKey);
             document.addEventListener('keyup', rawKey);
@@ -119,7 +113,7 @@
             mouse.grab();
             message("Display initialized");
 
-            if ('ontouchstart' in document.documentElement) {
+            if (Util.isTouchDevice) {
                 message("Touch device detected");
                 document.getElementById('button-selection').style.display = "inline";
                 document.getElementById('button1').onclick = function(){ selectButton(1) };