Remove non-JavaScript render code

[mirror_novnc.git] / tests / vnc_perf.html

diff --git a/tests/vnc_perf.html b/tests/vnc_perf.html
index 10c8971724fce5c4a633e11a9aa3ce04574b5692..001ac2860f35d93cec6ffa98152813cd43461ca2 100644 (file)
--- a/tests/vnc_perf.html
+++ b/tests/vnc_perf.html
@@ -31,23 +31,32 @@
     </body>
 
     <!--
-    <script type='text/javascript' 
+    <script type='text/javascript'
         src='http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js'></script>
     -->
 
     <script type="text/javascript">
-        var INCLUDE_URI= "../include/";
-        // TODO: Data file should override
-        var VNC_frame_encoding = "base64";
+        var INCLUDE_URI= "../";
     </script>
-    <script src="../include/util.js"></script>
-    <script src="../include/playback.js"></script>
-    <script src="../data/multi.js"></script>
+    <script src="../core/util.js"></script>
+    <script src="../app/webutil.js"></script>
 
     <script>
-        // Load supporting scripts
-        Util.load_scripts(["webutil.js", "base64.js", "websock.js", "des.js",
-                           "input.js", "display.js", "jsunzip.js", "rfb.js"]);
+        var fname = WebUtil.getQueryVar('data', null);
+        if (fname) {
+            msg("Loading " + fname);
+
+            // Load supporting scripts
+            WebUtil.load_scripts({
+                'core': ["base64.js", "websock.js", "des.js", "input/keysym.js",
+                         "input/keysymdef.js", "input/xtscancodes.js", "input/util.js",
+                         "input/keyboard.js", "input/mouse.js", "display.js", "rfb.js",
+                         "inflator.js", "input/vkeys.js", "input/fixedkeys.js"],
+                'tests': ["playback.js"],
+                'recordings': [fname]});
+        } else {
+            msg("Must specifiy data=FOO.js in query string.");
+        }
 
         var start_time, VNC_frame_data, pass, passes, encIdx,
             encOrder = ['raw', 'rre', 'hextile', 'tightpng', 'copyrect'],
@@ -56,8 +65,8 @@
 
         function msg(str) {
             console.log(str);
-            var cell = $D('messages');
-            cell.innerHTML += str + "\n";
+            var cell = document.getElementById('messages');
+            cell.textContent += str + "\n";
             cell.scrollTop = cell.scrollHeight;
         }
         function dbgmsg(str) {
@@ -66,31 +75,26 @@
             }
         }
 
-        updateState = function (rfb, state, oldstate, mesg) {
-            switch (state) {
-                case 'failed':
-                case 'fatal':
-                    msg("noVNC sent '" + state +
-                        "' state during pass " + pass +
-                        ", iteration " + iteration +
-                        " frame " + frame_idx);
-                    test_state = 'failed';
-                    break;
-                case 'loaded':
-                    $D('startButton').disabled = false;
-                    break;
-            }
-            if (typeof mesg !== 'undefined') {
-                $D('VNC_status').innerHTML = mesg;
+        disconnected = function (rfb, reason) {
+            if (reason) {
+                msg("noVNC sent '" + state +
+                    "' state during pass " + pass +
+                    ", iteration " + iteration +
+                    " frame " + frame_idx);
+                test_state = 'failed';
             }
         }
 
+        notification = function (rfb, mesg, level, options) {
+            document.getElementById('VNC_status').textContent = mesg;
+        }
+
         function do_test() {
-            $D('startButton').value = "Running";
-            $D('startButton').disabled = true;
+            document.getElementById('startButton').value = "Running";
+            document.getElementById('startButton').disabled = true;
 
             mode = 'perftest'; // full-speed
-            passes = $D('passes').value;
+            passes = document.getElementById('passes').value;
             pass = 1;
             encIdx = 0;
 
@@ -134,8 +138,8 @@
                     // Shut-off event interception
                     rfb.get_mouse().ungrab();
                     rfb.get_keyboard().ungrab();
-                    $D('startButton').disabled = false;
-                    $D('startButton').value = "Start";
+                    document.getElementById('startButton').disabled = false;
+                    document.getElementById('startButton').value = "Start";
                     finish_passes();
                     return; // We are finished, terminate
                 }
@@ -182,7 +186,7 @@
                 enc = encOrder[i];
                 avg = (encTot[i] / passes).toFixed(1);
                 msg("  " + enc + ": " + encTot[i] + " ms, " +
-                    encMin[i] + "/" + avg + "/" + encMax[i] + 
+                    encMin[i] + "/" + avg + "/" + encMax[i] +
                     " (min/avg/max)");
 
             }
@@ -200,9 +204,7 @@
                 enc = encOrder[i];
                 dbgmsg("  " + enc + ": " + VNC_frame_data_multi[enc].length);
             }
-            rfb = new RFB({'target': $D('VNC_canvas'),
-                           'updateState': updateState});
-            rfb.testMode(send_array, VNC_frame_encoding);
+            document.getElementById('startButton').disabled = false;
         }
     </script>
 </html>