Revert "Added busy handlers for layer, implemented ready instruction handling in...

This reverts commit 7c3ceb1245a5e2a838811c10599b47b1578a5cf9.

diff --git a/src/main/resources/guacamole.js b/src/main/resources/guacamole.js
index cf8e00f..6afc252 100644 (file)
--- a/src/main/resources/guacamole.js
+++ b/src/main/resources/guacamole.js
@@ -143,42 +143,6 @@ function GuacamoleClient(display, tunnel) {
         clipboardHandler = handler;
     };
 
-    var readyCallback = null;
-    var busyLayers = 0;
-
-    function layerBusy()  { busyLayers++; }
-    function layerReady() {
-        busyLayers--;
-        if (readyCallback != null)
-            readyCallback();
-    }
-
-    function sendReady() {
-
-       // If ready, send ready message
-       if (busyLayers == 0) {
-           tunnel.sendMessage("ready;");
-       }
-
-       // If not ready, queue message for when ready
-       else if (readyCallback == null) {
-           readyCallback = function() {
-               tunnel.sendMessage("ready;");
-               readyCallback = null;
-           }
-       }
-
-    }
-
-    function getTrackedLayer(w, h) {
-        var layer = new Layer(w, h);
-
-        layer.setBusyHandler(layerBusy);
-        layer.setReadyHandler(layerReady);
-
-        return layer;
-    }
-
     // Layers
     var displayWidth = 0;
     var displayHeight = 0;
@@ -201,7 +165,7 @@ function GuacamoleClient(display, tunnel) {
 
             // Create buffer if necessary
             if (buffer == null) {
-                buffer = new Layer(0, 0); // Untracked
+                buffer = new Layer(0, 0);
                 buffer.setAutosize(1);
                 buffers[index] = buffer;
             }
@@ -216,7 +180,7 @@ function GuacamoleClient(display, tunnel) {
             if (layer == null) {
 
                 // Add new layer
-                layer = getTrackedLayer(displayWidth, displayHeight);
+                layer = new Layer(displayWidth, displayHeight);
                 layers[index] = layer;
 
                 // (Re)-add existing layers in order
@@ -256,10 +220,6 @@ function GuacamoleClient(display, tunnel) {
             if (errorHandler) errorHandler(tunnel.unescapeGuacamoleString(parameters[0]));
         },
 
-        "ready": function(parameters) {
-            sendReady();
-        },
-
         "name": function(parameters) {
             if (nameHandler) nameHandler(tunnel.unescapeGuacamoleString(parameters[0]));
         },
@@ -332,7 +292,7 @@ function GuacamoleClient(display, tunnel) {
             var data = parameters[2];
 
             if (cursor == null) {
-                cursor = getTrackedLayer(displayWidth, displayHeight);
+                cursor = new Layer(displayWidth, displayHeight);
                 display.appendChild(cursor);
             }
 

diff --git a/src/main/resources/layer.js b/src/main/resources/layer.js
index b670e96..8ace452 100644 (file)
--- a/src/main/resources/layer.js
+++ b/src/main/resources/layer.js
@@ -68,9 +68,7 @@ function Layer(width, height) {
 
     resize(width, height);
 
-    var busyHandler = null;
     var readyHandler = null;
-
     var updates = new Array();
     var autosize = 0;
 
@@ -133,10 +131,6 @@ function Layer(width, height) {
         readyHandler = handler;
     };
 
-    display.setBusyHandler = function(handler) {
-        busyHandler = handler;
-    };
-
 
     display.drawImage = function(x, y, image) {
         reserveJob(function() {
@@ -147,11 +141,6 @@ function Layer(width, height) {
 
 
     display.draw = function(x, y, url) {
-
-        // If about to become busy, call busy handler
-        if (display.isReady() && busyHandler != null)
-            busyHandler();
-
         var update = reserveJob(null);
 
         var image = new Image();