safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed pause to yield

Browse Source
This commit is contained in:
Michael Jumper
2010-09-23 17:58:05 +00:00
parent 8f3e6a7340
commit ac87662c33
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
guacamole/client/javascript/guacamole.js
View File

@@ -273,7 +273,7 @@ function VNCClient(display) {
// Start next request as soon as possible // Start next request as soon as possible
if (xmlhttprequest.readyState >= 2 && nextRequest == null && uuid) if (xmlhttprequest.readyState >= 2 && nextRequest == null && uuid)
nextRequest = makeRequest(); nextRequest = makeRequest("resume:" + uuid + ";yield;");
// Parse stream when data is received and when complete. // Parse stream when data is received and when complete.
if (xmlhttprequest.readyState == 3 || if (xmlhttprequest.readyState == 3 ||
@@ -347,21 +347,18 @@ function VNCClient(display) {
} }
function makeRequest() { function makeRequest(message) {
if (uuid) if (message == null)
outputMessageBuffer = "resume:" + uuid + ";" + outputMessageBuffer; message = "";
outputMessageBuffer += "pause;";
// Download self // Download self
var xmlhttprequest = new XMLHttpRequest(); var xmlhttprequest = new XMLHttpRequest();
xmlhttprequest.open("POST", "tunnel.php"); xmlhttprequest.open("POST", "tunnel.php");
xmlhttprequest.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); xmlhttprequest.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
xmlhttprequest.setRequestHeader("Content-length", outputMessageBuffer.length); xmlhttprequest.setRequestHeader("Content-length", message.length);
xmlhttprequest.send(outputMessageBuffer); xmlhttprequest.send(message);
outputMessageBuffer = "";
return xmlhttprequest; return xmlhttprequest;
@@ -546,11 +543,10 @@ function VNCClient(display) {
this.connect = function() { this.connect = function() {
setState(STATE_CONNECTING); setState(STATE_CONNECTING);
sendMessage("connect;");
// Start reading data // Start reading data
setState(STATE_WAITING); setState(STATE_WAITING);
handleResponse(makeRequest()); handleResponse(makeRequest("connect;yield;"));
}; };

2
guacamole/libguac/src/client.c
View File

@@ -271,7 +271,7 @@ void guac_start_client(guac_client* client) {
} }
} }
else if (strcmp(instruction.opcode, "pause") == 0) { else if (strcmp(instruction.opcode, "yield") == 0) {
/* Allow other connection to take over I/O */ /* Allow other connection to take over I/O */
__guac_release_client_io(client); __guac_release_client_io(client);