diff options
author | Solly Ross <sross@redhat.com> | 2015-05-15 14:27:23 -0400 |
---|---|---|
committer | Solly Ross <sross@redhat.com> | 2015-08-06 14:47:03 -0400 |
commit | efed2eeafd7f80f012fffbb18c05079db2bdbbd7 (patch) | |
tree | 133873f6a80185c53cb7e3c213c58ab3a28080ec | |
parent | bc4414f5b15c348bdc8a2abde0f4a34420c0c71c (diff) | |
download | novnc-efed2eeafd7f80f012fffbb18c05079db2bdbbd7.tar.gz |
Fix up vnc_playback.html and playback.js
This commit fixes vnc_playback.html and playback.js
so that they work with the current version of noVNC.
-rw-r--r-- | include/playback.js | 27 | ||||
-rw-r--r-- | tests/vnc_playback.html | 9 |
2 files changed, 26 insertions, 10 deletions
diff --git a/include/playback.js b/include/playback.js index 7756529..7d3d749 100644 --- a/include/playback.js +++ b/include/playback.js @@ -12,19 +12,36 @@ var rfb, mode, test_state, frame_idx, frame_length, iteration, iterations, istart_time, // Pre-declarations for jslint - send_array, next_iteration, queue_next_packet, do_packet; + send_array, next_iteration, queue_next_packet, do_packet, enable_test_mode; // Override send_array send_array = function (arr) { // Stub out send_array }; +enable_test_mode = function () { + rfb._sock._mode = VNC_frame_encoding; + rfb._sock.send = send_array; + rfb._sock.close = function () {}; + rfb._sock.flush = function () {}; + rfb._checkEvents = function () {}; + rfb.connect = function (host, port, password, path) { + this._rfb_host = host; + this._rfb_port = port; + this._rfb_password = (password !== undefined) ? password : ""; + this._rfb_path = (path !== undefined) ? path : ""; + this._updateState('ProtocolVersion', "Starting VNC handshake"); + }; +}; + next_iteration = function () { + rfb = new RFB({'target': $D('VNC_canvas'), + 'onUpdateState': updateState}); + enable_test_mode(); + if (iteration === 0) { frame_length = VNC_frame_data.length; test_state = 'running'; - } else { - rfb.disconnect(); } if (test_state !== 'running') { return; } @@ -91,9 +108,9 @@ do_packet = function () { for (var i = 0; i < frame.length - start; i++) { u8[i] = frame.charCodeAt(start + i); } - rfb.recv_message({'data' : u8}); + rfb._sock._recv_message({'data' : u8}); } else { - rfb.recv_message({'data' : frame.slice(start)}); + rfb._sock._recv_message({'data' : frame.slice(start)}); } frame_idx += 1; diff --git a/tests/vnc_playback.html b/tests/vnc_playback.html index b5faf93..8b0207b 100644 --- a/tests/vnc_playback.html +++ b/tests/vnc_playback.html @@ -59,7 +59,7 @@ if (fname) { message("Loading " + fname); // Load supporting scripts - Util.load_scripts(["base64.js", "websock.js", "des.js", + Util.load_scripts(["base64.js", "websock.js", "des.js", "keysym.js", "keysymdef.js", "keyboard.js", "input.js", "display.js", "jsunzip.js", "rfb.js", "playback.js", fname]); @@ -75,7 +75,6 @@ test_state = 'failed'; break; case 'loaded': - $D('startButton').disabled = false; break; } if (typeof msg !== 'undefined') { @@ -99,7 +98,8 @@ mode = 'realtime'; } - recv_message = rfb.testMode(send_array, VNC_frame_encoding); + //recv_message = rfb.testMode(send_array, VNC_frame_encoding); + next_iteration(); } @@ -130,9 +130,8 @@ } if (fname) { message("VNC_frame_data.length: " + VNC_frame_data.length); - rfb = new RFB({'target': $D('VNC_canvas'), - 'onUpdateState': updateState}); } + $D('startButton').disabled = false; } </script> </html> |