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

Changed semantics of stream, more IO limiting code.

Browse Source
This commit is contained in:
Michael Jumper
2010-09-11 01:02:15 -07:00
parent a1124923f2
commit e05a2e5f79
3 changed files with 35 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
guacamole/client/src/net/sourceforge/guacamole/GuacamoleClient.java
View File

@@ -133,7 +133,7 @@ public class GuacamoleClient extends Client {
try {
// While we're blocking, or input is available
do {
for (;;) {
// If past threshold, resize buffer before reading
if (usedLength > buffer.length/2) {
@@ -176,14 +176,13 @@ public class GuacamoleClient extends Client {
}
} while (input.ready()); // End read loop
} // End read loop
}
catch (IOException e) {
throw new GuacamoleException(e);
}
return null;
}
}

39
guacamole/client/web/javascript/guacamole.js
View File

@@ -57,7 +57,6 @@ function VNCClient(display) {
var cursorHotspotX = 0;
var cursorHotspotY = 0;
// FIXME: Make object. Clean up.
var cursorRectX = 0;
var cursorRectY = 0;
@@ -282,6 +281,7 @@ function VNCClient(display) {
}
var clipboardHandler = null;
var requests = 0;
this.setClipboardHandler = function(handler) {
clipboardHandler = handler;
@@ -290,28 +290,20 @@ function VNCClient(display) {
function handleResponse(xmlhttprequest) {
var startOffset = null;
var nextRequest = null;
function startNextRequest() {
nextRequest = makeRequest();
}
// Start next request in 2 seconds.
setTimeout(startNextRequest, 2000);
var instructionStart = 0;
var startIndex = 0;
// Make request for next before it's too late
var nextRequest = null;
if (xmlhttprequest.readyState >= 2)
nextRequest = makeRequest();
function parseResponse() {
// Make request the moment we receive headers
// If the event handler isn't set by the time headers are available, we will
// already have made this request.
if (xmlhttprequest.readyState == 2) {
if (nextRequest == null)
nextRequest = makeRequest();
startOffset = 0;
}
// Parse stream when data is received and when complete.
if (xmlhttprequest.readyState == 3 ||
xmlhttprequest.readyState == 4) {
@@ -357,7 +349,8 @@ function VNCClient(display) {
if (isConnected()) {
delete xmlhttprequest;
handleResponse(nextRequest);
if (nextRequest)
handleResponse(nextRequest);
}
break;
@@ -375,21 +368,21 @@ function VNCClient(display) {
}
};
}
xmlhttprequest.onreadystatechange = parseResponse;
// Handle what we have so far.
parseResponse();
}
function makeRequest() {
// Download self
var xmlhttprequest = new XMLHttpRequest();
xmlhttprequest.open("GET", "instructions");
xmlhttprequest.send(null);
xmlhttprequest.send(null);
return xmlhttprequest;
}
@@ -555,7 +548,7 @@ function VNCClient(display) {
var message = new GuacamoleMessage(connect_xmlhttprequest.responseXML);
if (!message.hasErrors()) {
setState(STATE_WAITING);
handleResponse(makeRequest()); // Start stream if connection successful
handleResponse(makeRequest());
}
else
handleErrors(message);