Add scale function, use bounding div for main display element, such that the display...
[guacamole-common-js.git] / src / main / resources / guacamole.js
index 7cfec84..43bd165 100644 (file)
@@ -1,27 +1,57 @@
 
-/*
- *  Guacamole - Clientless Remote Desktop
- *  Copyright (C) 2010  Michael Jumper
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
  *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+ * The Original Code is guacamole-common-js.
+ *
+ * The Initial Developer of the Original Code is
+ * Michael Jumper.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Matt Hortman
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
 
-function GuacamoleClient(display, tunnelURL) {
+// Guacamole namespace
+var Guacamole = Guacamole || {};
 
-    var TUNNEL_CONNECT = tunnelURL + "?connect";
-    var TUNNEL_READ    = tunnelURL + "?read";
-    var TUNNEL_WRITE   = tunnelURL + "?write";
+
+/**
+ * Guacamole protocol client. Given a display element and {@link Guacamole.Tunnel},
+ * automatically handles incoming and outgoing Guacamole instructions via the
+ * provided tunnel, updating the display using one or more canvas elements.
+ * 
+ * @constructor
+ * @param {Guacamole.Tunnel} tunnel The tunnel to use to send and receive
+ *                                  Guacamole instructions.
+ */
+Guacamole.Client = function(tunnel) {
+
+    var guac_client = this;
 
     var STATE_IDLE          = 0;
     var STATE_CONNECTING    = 1;
@@ -31,629 +61,1042 @@ function GuacamoleClient(display, tunnelURL) {
     var STATE_DISCONNECTED  = 5;
 
     var currentState = STATE_IDLE;
-    var stateChangeHandler = null;
+    
+    var currentTimestamp = 0;
+    var pingInterval = null;
+
+    var displayWidth = 0;
+    var displayHeight = 0;
+    var displayScale = 1;
+
+    /**
+     * Translation from Guacamole protocol line caps to Layer line caps.
+     */
+    var lineCap = {
+        0: "butt",
+        1: "round",
+        2: "square"
+    };
+
+    /**
+     * Translation from Guacamole protocol line caps to Layer line caps.
+     */
+    var lineJoin = {
+        0: "bevel",
+        1: "miter",
+        2: "round"
+    };
+
+    // Create bounding div 
+    var bounds = document.createElement("div");
+    bounds.style.position = "relative";
+    bounds.style.width = (displayWidth*displayScale) + "px";
+    bounds.style.height = (displayHeight*displayScale) + "px";
+
+    // Create display
+    var display = document.createElement("div");
+    display.style.position = "relative";
+    display.style.width = displayWidth + "px";
+    display.style.height = displayHeight + "px";
+
+    // Ensure transformations on display originate at 0,0
+    display.style.transformOrigin =
+    display.style.webkitTransformOrigin =
+    display.style.MozTransformOrigin =
+    display.style.OTransformOrigin =
+    display.style.msTransformOrigin =
+        "0 0";
+
+    // Create default layer
+    var default_layer_container = new Guacamole.Client.LayerContainer(displayWidth, displayHeight);
+
+    // Position default layer
+    var default_layer_container_element = default_layer_container.getElement();
+    default_layer_container_element.style.position = "absolute";
+    default_layer_container_element.style.left = "0px";
+    default_layer_container_element.style.top  = "0px";
+    default_layer_container_element.style.overflow = "hidden";
+
+    // Create cursor layer
+    var cursor = new Guacamole.Client.LayerContainer(0, 0);
+    cursor.getLayer().setChannelMask(Guacamole.Layer.SRC);
+
+    // Position cursor layer
+    var cursor_element = cursor.getElement();
+    cursor_element.style.position = "absolute";
+    cursor_element.style.left = "0px";
+    cursor_element.style.top  = "0px";
+
+    // Add default layer and cursor to display
+    display.appendChild(default_layer_container.getElement());
+    display.appendChild(cursor.getElement());
+
+    // Add display to bounds
+    bounds.appendChild(display);
+
+    // Initially, only default layer exists
+    var layers =  [default_layer_container];
+
+    // No initial buffers
+    var buffers = [];
+
+    tunnel.onerror = function(message) {
+        if (guac_client.onerror)
+            guac_client.onerror(message);
+    };
 
     function setState(state) {
         if (state != currentState) {
             currentState = state;
-            if (stateChangeHandler)
-                stateChangeHandler(currentState);
+            if (guac_client.onstatechange)
+                guac_client.onstatechange(currentState);
         }
     }
 
-    this.setOnStateChangeHandler = function(handler) {
-        stateChangeHandler = handler;
-    }
-
     function isConnected() {
         return currentState == STATE_CONNECTED
             || currentState == STATE_WAITING;
     }
 
-    var cursorImage = null;
     var cursorHotspotX = 0;
     var cursorHotspotY = 0;
 
-    // FIXME: Make object. Clean up.
-    var cursorRectX = 0;
-    var cursorRectY = 0;
-    var cursorRectW = 0;
-    var cursorRectH = 0;
-
-    var cursorHidden = 0;
+    var cursorX = 0;
+    var cursorY = 0;
 
-    function redrawCursor() {
+    function moveCursor(x, y) {
 
-        // Hide hardware cursor
-        if (cursorHidden == 0) {
-            display.className += " guac-hide-cursor";
-            cursorHidden = 1;
-        }
+        // Move cursor layer
+        cursor.translate(x - cursorHotspotX, y - cursorHotspotY);
 
-        // Erase old cursor
-        cursor.clearRect(cursorRectX, cursorRectY, cursorRectW, cursorRectH);
+        // Update stored position
+        cursorX = x;
+        cursorY = y;
 
-        // Update rect
-        cursorRectX = mouse.getX() - cursorHotspotX;
-        cursorRectY = mouse.getY() - cursorHotspotY;
-        cursorRectW = cursorImage.width;
-        cursorRectH = cursorImage.height;
-
-        // Draw new cursor
-        cursor.drawImage(cursorRectX, cursorRectY, cursorImage);
     }
 
+    guac_client.getDisplay = function() {
+        return bounds;
+    };
 
+    guac_client.sendKeyEvent = function(pressed, keysym) {
+        // Do not send requests if not connected
+        if (!isConnected())
+            return;
 
+        tunnel.sendMessage("key", keysym, pressed);
+    };
 
-       /*****************************************/
-       /*** Keyboard                          ***/
-       /*****************************************/
-
-    var keyboard = new GuacamoleKeyboard(document);
+    guac_client.sendMouseState = function(mouseState) {
 
-    this.disableKeyboard = function() {
-        keyboard.setKeyPressedHandler(null);
-        keyboard.setKeyReleasedHandler(null);
-    };
+        // Do not send requests if not connected
+        if (!isConnected())
+            return;
 
-    this.enableKeyboard = function() {
-        keyboard.setKeyPressedHandler(
-            function (keysym) {
-                sendKeyEvent(1, keysym);
-            }
+        // Update client-side cursor
+        moveCursor(
+            mouseState.x,
+            mouseState.y
         );
 
-        keyboard.setKeyReleasedHandler(
-            function (keysym) {
-                sendKeyEvent(0, keysym);
-            }
-        );
+        // Build mask
+        var buttonMask = 0;
+        if (mouseState.left)   buttonMask |= 1;
+        if (mouseState.middle) buttonMask |= 2;
+        if (mouseState.right)  buttonMask |= 4;
+        if (mouseState.up)     buttonMask |= 8;
+        if (mouseState.down)   buttonMask |= 16;
+
+        // Send message
+        tunnel.sendMessage("mouse", mouseState.x, mouseState.y, buttonMask);
     };
 
-    // Enable keyboard by default
-    this.enableKeyboard();
+    guac_client.setClipboard = function(data) {
 
-    function sendKeyEvent(pressed, keysym) {
         // Do not send requests if not connected
         if (!isConnected())
             return;
 
-        sendMessage("key:" +  keysym + "," + pressed + ";");
-    }
-
-    this.pressKey = function(keysym) {
-        sendKeyEvent(1, keysym);
+        tunnel.sendMessage("clipboard", data);
     };
 
-    this.releaseKey = function(keysym) {
-        sendKeyEvent(0, keysym);
-    };
+    // Handlers
+    guac_client.onstatechange = null;
+    guac_client.onname = null;
+    guac_client.onerror = null;
+    guac_client.onclipboard = null;
 
+    // Layers
+    function getBufferLayer(index) {
 
-       /*****************************************/
-       /*** Mouse                             ***/
-       /*****************************************/
+        index = -1 - index;
+        var buffer = buffers[index];
 
-    var mouse = new GuacamoleMouse(display);
-    mouse.setButtonPressedHandler(
-        function(mouseState) {
-            sendMouseState(mouseState);
+        // Create buffer if necessary
+        if (buffer == null) {
+            buffer = new Guacamole.Layer(0, 0);
+            buffer.autosize = 1;
+            buffers[index] = buffer;
         }
-    );
 
-    mouse.setButtonReleasedHandler(
-        function(mouseState) {
-            sendMouseState(mouseState);
-        }
-    );
+        return buffer;
 
-    mouse.setMovementHandler(
-        function(mouseState) {
+    }
 
-            // Draw client-side cursor
-            if (cursorImage != null) {
-                redrawCursor();
-            }
+    function getLayerContainer(index) {
+
+        var layer = layers[index];
+        if (layer == null) {
+
+            // Add new layer
+            layer = new Guacamole.Client.LayerContainer(displayWidth, displayHeight);
+            layers[index] = layer;
+
+            // Get and position layer
+            var layer_element = layer.getElement();
+            layer_element.style.position = "absolute";
+            layer_element.style.left = "0px";
+            layer_element.style.top = "0px";
+            layer_element.style.overflow = "hidden";
+
+            // Add to default layer container
+            default_layer_container.getElement().appendChild(layer_element);
 
-            sendMouseState(mouseState);
         }
-    );
 
+        return layer;
 
-    function sendMouseState(mouseState) {
+    }
 
-        // Do not send requests if not connected
-        if (!isConnected())
-            return;
+    function getLayer(index) {
+       
+        // If buffer, just get layer
+        if (index < 0)
+            return getBufferLayer(index);
 
-        // Build mask
-        var buttonMask = 0;
-        if (mouseState.getLeft())   buttonMask |= 1;
-        if (mouseState.getMiddle()) buttonMask |= 2;
-        if (mouseState.getRight())  buttonMask |= 4;
-        if (mouseState.getUp())     buttonMask |= 8;
-        if (mouseState.getDown())   buttonMask |= 16;
+        // Otherwise, retrieve layer from layer container
+        return getLayerContainer(index).getLayer();
 
-        // Send message
-        sendMessage("mouse:" + mouseState.getX() + "," + mouseState.getY() + "," + buttonMask + ";");
     }
 
-    var sendingMessages = 0;
-    var outputMessageBuffer = "";
+    /**
+     * Handlers for all defined layer properties.
+     */
+    var layerPropertyHandlers = {
 
-    function sendMessage(message) {
+        "miter-limit": function(layer, value) {
+            layer.setMiterLimit(parseFloat(value));
+        }
 
-        // Add event to queue, restart send loop if finished.
-        outputMessageBuffer += message;
-        if (sendingMessages == 0)
-            sendPendingMessages();
+    };
+    
+    /**
+     * Handlers for all instruction opcodes receivable by a Guacamole protocol
+     * client.
+     */
+    var instructionHandlers = {
 
-    }
+        "arc": function(parameters) {
 
-    function sendPendingMessages() {
+            var layer = getLayer(parseInt(parameters[0]));
+            var x = parseInt(parameters[1]);
+            var y = parseInt(parameters[2]);
+            var radius = parseInt(parameters[3]);
+            var startAngle = parseFloat(parameters[4]);
+            var endAngle = parseFloat(parameters[5]);
+            var negative = parseInt(parameters[6]);
 
-        if (outputMessageBuffer.length > 0) {
+            layer.arc(x, y, radius, startAngle, endAngle, negative != 0);
 
-            sendingMessages = 1;
+        },
 
-            var message_xmlhttprequest = new XMLHttpRequest();
-            message_xmlhttprequest.open("POST", TUNNEL_WRITE);
-            message_xmlhttprequest.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-            message_xmlhttprequest.setRequestHeader("Content-length", outputMessageBuffer.length);
+        "cfill": function(parameters) {
 
-            // Once response received, send next queued event.
-            message_xmlhttprequest.onreadystatechange = function() {
-                if (message_xmlhttprequest.readyState == 4)
-                    sendPendingMessages();
-            }
+            var channelMask = parseInt(parameters[0]);
+            var layer = getLayer(parseInt(parameters[1]));
+            var r = parseInt(parameters[2]);
+            var g = parseInt(parameters[3]);
+            var b = parseInt(parameters[4]);
+            var a = parseInt(parameters[5]);
 
-            message_xmlhttprequest.send(outputMessageBuffer);
-            outputMessageBuffer = ""; // Clear buffer
+            layer.setChannelMask(channelMask);
 
-        }
-        else
-            sendingMessages = 0;
+            layer.fillColor(r, g, b, a);
 
-    }
+        },
 
+        "clip": function(parameters) {
 
-       /*****************************************/
-       /*** Clipboard                         ***/
-       /*****************************************/
+            var layer = getLayer(parseInt(parameters[0]));
 
-    this.setClipboard = function(data) {
+            layer.clip();
 
-        // Do not send requests if not connected
-        if (!isConnected())
-            return;
+        },
 
-        sendMessage("clipboard:" + escapeGuacamoleString(data) + ";");
-    }
+        "clipboard": function(parameters) {
+            if (guac_client.onclipboard) guac_client.onclipboard(parameters[0]);
+        },
 
+        "close": function(parameters) {
 
-    function desaturateFilter(data, width, height) {
+            var layer = getLayer(parseInt(parameters[0]));
 
-        for (var i=0; i<data.length; i+=4) {
+            layer.close();
 
-            // Get RGB values
-            var r = data[i];
-            var g = data[i+1];
-            var b = data[i+2];
+        },
 
-            // Desaturate
-            var v = Math.max(r, g, b) / 2;
-            data[i]   = v;
-            data[i+1] = v;
-            data[i+2] = v;
+        "copy": function(parameters) {
 
-        }
+            var srcL = getLayer(parseInt(parameters[0]));
+            var srcX = parseInt(parameters[1]);
+            var srcY = parseInt(parameters[2]);
+            var srcWidth = parseInt(parameters[3]);
+            var srcHeight = parseInt(parameters[4]);
+            var channelMask = parseInt(parameters[5]);
+            var dstL = getLayer(parseInt(parameters[6]));
+            var dstX = parseInt(parameters[7]);
+            var dstY = parseInt(parameters[8]);
 
-    }
+            dstL.setChannelMask(channelMask);
 
-    var nameHandler = null;
-    this.setNameHandler = function(handler) {
-        nameHandler = handler;
-    }
+            dstL.copy(
+                srcL,
+                srcX,
+                srcY,
+                srcWidth, 
+                srcHeight, 
+                dstX,
+                dstY 
+            );
 
-    var errorHandler = null;
-    this.setErrorHandler = function(handler) {
-        errorHandler = handler;
-    };
+        },
 
-    var errorEncountered = 0;
-    function showError(error) {
-        // Only display first error (avoid infinite error loops)
-        if (errorEncountered == 0) {
-            errorEncountered = 1;
+        "cstroke": function(parameters) {
 
-            disconnect();
+            var channelMask = parseInt(parameters[0]);
+            var layer = getLayer(parseInt(parameters[1]));
+            var cap = lineCap[parseInt(parameters[2])];
+            var join = lineJoin[parseInt(parameters[3])];
+            var thickness = parseInt(parameters[4]);
+            var r = parseInt(parameters[5]);
+            var g = parseInt(parameters[6]);
+            var b = parseInt(parameters[7]);
+            var a = parseInt(parameters[8]);
 
-            // Show error by desaturating display
-            for (var i=0; i<layers.length; i++) {
-                layers[i].filter(desaturateFilter);
-            }
+            layer.setChannelMask(channelMask);
 
-            if (errorHandler)
-                errorHandler(error);
-        }
-    }
+            layer.strokeColor(cap, join, thickness, r, g, b, a);
 
-    function handleErrors(message) {
-        var errors = message.getErrors();
-        for (var errorIndex=0; errorIndex<errors.length; errorIndex++)
-            showError(errors[errorIndex].getMessage());
-    }
+        },
 
-    var clipboardHandler = null;
-    var requests = 0;
+        "cursor": function(parameters) {
 
-    this.setClipboardHandler = function(handler) {
-        clipboardHandler = handler;
-    };
+            cursorHotspotX = parseInt(parameters[0]);
+            cursorHotspotY = parseInt(parameters[1]);
+            var srcL = getLayer(parseInt(parameters[2]));
+            var srcX = parseInt(parameters[3]);
+            var srcY = parseInt(parameters[4]);
+            var srcWidth = parseInt(parameters[5]);
+            var srcHeight = parseInt(parameters[6]);
 
+            // Reset cursor size
+            cursor.resize(srcWidth, srcHeight);
 
-    function handleResponse(xmlhttprequest) {
+            // Draw cursor to cursor layer
+            cursor.getLayer().copy(
+                srcL,
+                srcX,
+                srcY,
+                srcWidth, 
+                srcHeight, 
+                0,
+                0 
+            );
 
-        var nextRequest = null;
+            // Update cursor position (hotspot may have changed)
+            moveCursor(cursorX, cursorY);
 
-        var instructionStart = 0;
-        var startIndex = 0;
+        },
 
-        function parseResponse() {
+        "curve": function(parameters) {
 
-            // Start next request as soon as possible
-            if (xmlhttprequest.readyState >= 2 && nextRequest == null)
-                nextRequest = makeRequest();
+            var layer = getLayer(parseInt(parameters[0]));
+            var cp1x = parseInt(parameters[1]);
+            var cp1y = parseInt(parameters[2]);
+            var cp2x = parseInt(parameters[3]);
+            var cp2y = parseInt(parameters[4]);
+            var x = parseInt(parameters[5]);
+            var y = parseInt(parameters[6]);
 
-            // Parse stream when data is received and when complete.
-            if (xmlhttprequest.readyState == 3 ||
-                xmlhttprequest.readyState == 4) {
+            layer.curveTo(cp1x, cp1y, cp2x, cp2y, x, y);
 
-                // Halt on error during request
-                if (xmlhttprequest.status == 0) {
-                    showError("Request canceled by browser.");
-                    return;
-                }
-                else if (xmlhttprequest.status != 200) {
-                    showError("Error during request (HTTP " + xmlhttprequest.status + "): " + xmlhttprequest.statusText);
-                    return;
-                }
+        },
 
-                var current = xmlhttprequest.responseText;
-                var instructionEnd;
-                
-                while ((instructionEnd = current.indexOf(";", startIndex)) != -1) {
+        "dispose": function(parameters) {
+            
+            var layer_index = parseInt(parameters[0]);
 
-                    // Start next search at next instruction
-                    startIndex = instructionEnd+1;
+            // If visible layer, remove from parent
+            if (layer_index > 0) {
 
-                    var instruction = current.substr(instructionStart,
-                            instructionEnd - instructionStart);
+                // Get container element
+                var layer_container = getLayerContainer(layer_index).getElement();
 
-                    instructionStart = startIndex;
+                // Remove from parent
+                layer_container.parentNode.removeChild(layer_container);
 
-                    var opcodeEnd = instruction.indexOf(":");
+                // Delete reference
+                delete layers[layer_index];
 
-                    var opcode;
-                    var parameters;
-                    if (opcodeEnd == -1) {
-                        opcode = instruction;
-                        parameters = new Array();
-                    }
-                    else {
-                        opcode = instruction.substr(0, opcodeEnd);
-                        parameters = instruction.substr(opcodeEnd+1).split(",");
-                    }
+            }
 
-                    // If we're done parsing, handle the next response.
-                    if (opcode.length == 0) {
+            // If buffer, just delete reference
+            else if (layer_index < 0)
+                delete buffers[-1 - layer_index];
 
-                        if (isConnected()) {
-                            delete xmlhttprequest;
-                            if (nextRequest)
-                                handleResponse(nextRequest);
-                        }
+            // Attempting to dispose the root layer currently has no effect.
 
-                        break;
-                    }
+        },
 
-                    // Call instruction handler.
-                    doInstruction(opcode, parameters);
-                }
+        "distort": function(parameters) {
 
-                // Start search at end of string.
-                startIndex = current.length;
+            var layer_index = parseInt(parameters[0]);
+            var a = parseFloat(parameters[1]);
+            var b = parseFloat(parameters[2]);
+            var c = parseFloat(parameters[3]);
+            var d = parseFloat(parameters[4]);
+            var e = parseFloat(parameters[5]);
+            var f = parseFloat(parameters[6]);
 
-                delete instruction;
-                delete parameters;
+            // Only valid for visible layers (not buffers)
+            if (layer_index >= 0) {
 
-            }
+                // Get container element
+                var layer_container = getLayerContainer(layer_index).getElement();
 
-        }
+                // Set layer transform 
+                layer_container.transform(a, b, c, d, e, f);
 
-        xmlhttprequest.onreadystatechange = parseResponse;
-        parseResponse();
+             }
 
-    }
+        },
+        "error": function(parameters) {
+            if (guac_client.onerror) guac_client.onerror(parameters[0]);
+            guac_client.disconnect();
+        },
 
+        "identity": function(parameters) {
 
-    function makeRequest() {
+            var layer = getLayer(parseInt(parameters[0]));
 
-        // Download self
-        var xmlhttprequest = new XMLHttpRequest();
-        xmlhttprequest.open("POST", TUNNEL_READ);
-        xmlhttprequest.send(null); 
+            layer.setTransform(1, 0, 0, 1, 0, 0);
 
-        return xmlhttprequest;
+        },
 
-    }
+        "lfill": function(parameters) {
 
-    function escapeGuacamoleString(str) {
+            var channelMask = parseInt(parameters[0]);
+            var layer = getLayer(parseInt(parameters[1]));
+            var srcLayer = getLayer(parseInt(parameters[2]));
 
-        var escapedString = "";
+            layer.setChannelMask(channelMask);
 
-        for (var i=0; i<str.length; i++) {
+            layer.fillLayer(srcLayer);
 
-            var c = str.charAt(i);
-            if (c == ",")
-                escapedString += "\\c";
-            else if (c == ";")
-                escapedString += "\\s";
-            else if (c == "\\")
-                escapedString += "\\\\";
-            else
-                escapedString += c;
+        },
 
-        }
+        "line": function(parameters) {
 
-        return escapedString;
+            var layer = getLayer(parseInt(parameters[0]));
+            var x = parseInt(parameters[1]);
+            var y = parseInt(parameters[2]);
 
-    }
+            layer.lineTo(x, y);
+
+        },
 
-    function unescapeGuacamoleString(str) {
+        "lstroke": function(parameters) {
 
-        var unescapedString = "";
+            var channelMask = parseInt(parameters[0]);
+            var layer = getLayer(parseInt(parameters[1]));
+            var srcLayer = getLayer(parseInt(parameters[2]));
+
+            layer.setChannelMask(channelMask);
+
+            layer.strokeLayer(srcLayer);
+
+        },
 
-        for (var i=0; i<str.length; i++) {
+        "move": function(parameters) {
+            
+            var layer_index = parseInt(parameters[0]);
+            var parent_index = parseInt(parameters[1]);
+            var x = parseInt(parameters[2]);
+            var y = parseInt(parameters[3]);
+            var z = parseInt(parameters[4]);
 
-            var c = str.charAt(i);
-            if (c == "\\" && i<str.length-1) {
+            // Only valid for non-default layers
+            if (layer_index > 0 && parent_index >= 0) {
 
-                var escapeChar = str.charAt(++i);
-                if (escapeChar == "c")
-                    unescapedString += ",";
-                else if (escapeChar == "s")
-                    unescapedString += ";";
-                else if (escapeChar == "\\")
-                    unescapedString += "\\";
-                else
-                    unescapedString += "\\" + escapeChar;
+                // Get container element
+                var layer_container = getLayerContainer(layer_index);
+                var layer_container_element = layer_container.getElement();
+                var parent = getLayerContainer(parent_index).getElement();
+
+                // Set parent if necessary
+                if (!(layer_container_element.parentNode === parent))
+                    parent.appendChild(layer_container_element);
+
+                // Move layer
+                layer_container.translate(x, y);
+                layer_container_element.style.zIndex = z;
 
             }
-            else
-                unescapedString += c;
 
-        }
+        },
 
-        return unescapedString;
+        "name": function(parameters) {
+            if (guac_client.onname) guac_client.onname(parameters[0]);
+        },
 
-    }
+        "png": function(parameters) {
 
-    // Layers
-    var displayWidth = 0;
-    var displayHeight = 0;
+            var channelMask = parseInt(parameters[0]);
+            var layer = getLayer(parseInt(parameters[1]));
+            var x = parseInt(parameters[2]);
+            var y = parseInt(parameters[3]);
+            var data = parameters[4];
 
-    var layers = new Array();
-    var buffers = new Array();
-    var cursor = null;
+            layer.setChannelMask(channelMask);
 
-    function getLayer(index) {
+            layer.draw(
+                x,
+                y,
+                "data:image/png;base64," + data
+            );
 
-        // If negative index, use buffer
-        if (index < 0) {
+            // If received first update, no longer waiting.
+            if (currentState == STATE_WAITING)
+                setState(STATE_CONNECTED);
 
-            index = -1 - index;
-            var buffer = buffers[index];
+        },
 
-            // Create buffer if necessary
-            if (buffer == null) {
-                buffer = new Layer(0, 0);
-                buffer.setAutosize(1);
-                buffers[index] = buffer;
-            }
+        "pop": function(parameters) {
 
-            return buffer;
-        }
+            var layer = getLayer(parseInt(parameters[0]));
 
-        // If non-negative, use visible layer
-        else {
+            layer.pop();
 
-            var layer = layers[index];
-            if (layer == null) {
+        },
 
-                // Add new layer
-                layer = new Layer(displayWidth, displayHeight);
-                layers[index] = layer;
+        "push": function(parameters) {
 
-                // (Re)-add existing layers in order
-                for (var i=0; i<layers.length; i++) {
-                    if (layers[i]) {
+            var layer = getLayer(parseInt(parameters[0]));
 
-                        // If already present, remove
-                        if (layers[i].parentNode === display)
-                            display.removeChild(layers[i]);
+            layer.push();
 
-                        // Add to end
-                        display.appendChild(layers[i]);
-                    }
-                }
+        },
+        "rect": function(parameters) {
 
-                // Add cursor layer last
-                if (cursor != null) {
-                    if (cursor.parentNode === display)
-                        display.removeChild(cursor);
-                    display.appendChild(cursor);
-                }
+            var layer = getLayer(parseInt(parameters[0]));
+            var x = parseInt(parameters[1]);
+            var y = parseInt(parameters[2]);
+            var w = parseInt(parameters[3]);
+            var h = parseInt(parameters[4]);
 
-            }
-            else {
-                // Reset size
-                layer.resize(displayWidth, displayHeight);
-            }
+            layer.rect(x, y, w, h);
 
-            return layer;
-        }
+        },
+        
+        "reset": function(parameters) {
 
-    }
+            var layer = getLayer(parseInt(parameters[0]));
 
-    var instructionHandlers = {
+            layer.reset();
 
-        "error": function(parameters) {
-            showError(unescapeGuacamoleString(parameters[0]));
         },
+        
+        "set": function(parameters) {
+
+            var layer = getLayer(parseInt(parameters[0]));
+            var name = parameters[1];
+            var value = parameters[2];
+
+            // Call property handler if defined
+            var handler = layerPropertyHandlers[name];
+            if (handler)
+                handler(layer, value);
 
-        "name": function(parameters) {
-            nameHandler(unescapeGuacamoleString(parameters[0]));
         },
 
-        "clipboard": function(parameters) {
-            clipboardHandler(unescapeGuacamoleString(parameters[0]));
+        "shade": function(parameters) {
+            
+            var layer_index = parseInt(parameters[0]);
+            var a = parseInt(parameters[1]);
+
+            // Only valid for visible layers (not buffers)
+            if (layer_index >= 0) {
+
+                // Get container element
+                var layer_container = getLayerContainer(layer_index).getElement();
+
+                // Set layer opacity
+                layer_container.style.opacity = a/255.0;
+
+            }
+
         },
 
         "size": function(parameters) {
 
-            displayWidth = parseInt(parameters[0]);
-            displayHeight = parseInt(parameters[1]);
+            var layer_index = parseInt(parameters[0]);
+            var width = parseInt(parameters[1]);
+            var height = parseInt(parameters[2]);
+
+            // Resize layer
+            var layer_container = getLayerContainer(layer_index);
+            layer_container.resize(width, height);
+
+            // If layer is default, resize display
+            if (layer_index == 0) {
+
+                displayWidth = width;
+                displayHeight = height;
 
-            // Update (set) display size
-            if (display) {
+                // Update (set) display size
                 display.style.width = displayWidth + "px";
                 display.style.height = displayHeight + "px";
-            }
 
-            // Set cursor layer width/height
-            if (cursor != null)
-                cursor.resize(displayWidth, displayHeight);
+                // Update bounds size
+                bounds.style.width = (displayWidth*displayScale) + "px";
+                bounds.style.height = (displayHeight*displayScale) + "px";
 
-        },
+            }
 
-        "png": function(parameters) {
+        },
+        
+        "start": function(parameters) {
 
-            var layer = parseInt(parameters[0]);
+            var layer = getLayer(parseInt(parameters[0]));
             var x = parseInt(parameters[1]);
             var y = parseInt(parameters[2]);
-            var data = parameters[3];
 
-            getLayer(layer).draw(
-                x,
-                y,
-                "data:image/png;base64," + data
-            );
+            layer.moveTo(x, y);
 
-            // If received first update, no longer waiting.
-            if (currentState == STATE_WAITING)
-                setState(STATE_CONNECTED);
+        },
+
+        "sync": function(parameters) {
+
+            var timestamp = parameters[0];
+
+            // When all layers have finished rendering all instructions
+            // UP TO THIS POINT IN TIME, send sync response.
+
+            var layersToSync = 0;
+            function syncLayer() {
+
+                layersToSync--;
+
+                // Send sync response when layers are finished
+                if (layersToSync == 0) {
+                    if (timestamp != currentTimestamp) {
+                        tunnel.sendMessage("sync", timestamp);
+                        currentTimestamp = timestamp;
+                    }
+                }
+
+            }
+
+            // Count active, not-ready layers and install sync tracking hooks
+            for (var i=0; i<layers.length; i++) {
+
+                var layer = layers[i].getLayer();
+                if (layer && !layer.isReady()) {
+                    layersToSync++;
+                    layer.sync(syncLayer);
+                }
+
+            }
+
+            // If all layers are ready, then we didn't install any hooks.
+            // Send sync message now,
+            if (layersToSync == 0) {
+                if (timestamp != currentTimestamp) {
+                    tunnel.sendMessage("sync", timestamp);
+                    currentTimestamp = timestamp;
+                }
+            }
 
         },
 
-        "copy": function(parameters) {
+        "transfer": function(parameters) {
 
-            var srcL = parseInt(parameters[0]);
+            var srcL = getLayer(parseInt(parameters[0]));
             var srcX = parseInt(parameters[1]);
             var srcY = parseInt(parameters[2]);
             var srcWidth = parseInt(parameters[3]);
             var srcHeight = parseInt(parameters[4]);
-            var dstL = parseInt(parameters[5]);
-            var dstX = parseInt(parameters[6]);
-            var dstY = parseInt(parameters[7]);
+            var transferFunction = Guacamole.Client.DefaultTransferFunction[parameters[5]];
+            var dstL = getLayer(parseInt(parameters[6]));
+            var dstX = parseInt(parameters[7]);
+            var dstY = parseInt(parameters[8]);
 
-            getLayer(dstL).copyRect(
-                getLayer(srcL),
+            dstL.transfer(
+                srcL,
                 srcX,
                 srcY,
                 srcWidth, 
                 srcHeight, 
                 dstX,
-                dstY 
+                dstY,
+                transferFunction
             );
 
         },
 
-        "cursor": function(parameters) {
+        "transform": function(parameters) {
 
-            var x = parseInt(parameters[0]);
-            var y = parseInt(parameters[1]);
-            var data = parameters[2];
+            var layer = getLayer(parseInt(parameters[0]));
+            var a = parseFloat(parameters[1]);
+            var b = parseFloat(parameters[2]);
+            var c = parseFloat(parameters[3]);
+            var d = parseFloat(parameters[4]);
+            var e = parseFloat(parameters[5]);
+            var f = parseFloat(parameters[6]);
 
-            if (cursor == null) {
-                cursor = new Layer(displayWidth, displayHeight);
-                display.appendChild(cursor);
-            }
-
-            // Start cursor image load
-            var image = new Image();
-            image.onload = function() {
-                cursorImage = image;
-                cursorHotspotX = x;
-                cursorHotspotY = y;
-                redrawCursor();
-            };
-            image.src = "data:image/png;base64," + data
+            layer.transform(a, b, c, d, e, f);
 
         }
       
     };
 
 
-    function doInstruction(opcode, parameters) {
+    tunnel.oninstruction = function(opcode, parameters) {
 
         var handler = instructionHandlers[opcode];
         if (handler)
             handler(parameters);
 
-    }
-        
+    };
+
+
+    guac_client.disconnect = function() {
+
+        // Only attempt disconnection not disconnected.
+        if (currentState != STATE_DISCONNECTED
+                && currentState != STATE_DISCONNECTING) {
+
+            setState(STATE_DISCONNECTING);
+
+            // Stop ping
+            if (pingInterval)
+                window.clearInterval(pingInterval);
+
+            // Send disconnect message and disconnect
+            tunnel.sendMessage("disconnect");
+            tunnel.disconnect();
+            setState(STATE_DISCONNECTED);
+
+        }
 
-    this.connect = function() {
+    };
+    
+    guac_client.connect = function(data) {
 
         setState(STATE_CONNECTING);
 
-        // Start tunnel and connect synchronously
-        var connect_xmlhttprequest = new XMLHttpRequest();
-        connect_xmlhttprequest.open("POST", TUNNEL_CONNECT, false);
-        connect_xmlhttprequest.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-        connect_xmlhttprequest.setRequestHeader("Content-length", 0);
-        connect_xmlhttprequest.send(null);
+        try {
+            tunnel.connect(data);
+        }
+        catch (e) {
+            setState(STATE_IDLE);
+            throw e;
+        }
+
+        // Ping every 5 seconds (ensure connection alive)
+        pingInterval = window.setInterval(function() {
+            tunnel.sendMessage("sync", currentTimestamp);
+        }, 5000);
 
-        // Start reading data
         setState(STATE_WAITING);
-        handleResponse(makeRequest());
+    };
+
+    guac_client.scale = function(scale) {
+
+        display.style.transform =
+        display.style.WebkitTransform =
+        display.style.MozTransform =
+        display.style.OTransform =
+        display.style.msTransform =
+
+            "scale(" + scale + "," + scale + ")";
+
+        displayScale = scale;
+
+        // Update bounds size
+        bounds.style.width = (displayWidth*displayScale) + "px";
+        bounds.style.height = (displayHeight*displayScale) + "px";
+
+    };
+
+};
+
+
+/**
+ * Simple container for Guacamole.Layer, allowing layers to be easily
+ * repositioned and nested. This allows certain operations to be accelerated
+ * through DOM manipulation, rather than raster operations.
+ * 
+ * @constructor
+ * 
+ * @param {Number} width The width of the Layer, in pixels. The canvas element
+ *                       backing this Layer will be given this width.
+ *                       
+ * @param {Number} height The height of the Layer, in pixels. The canvas element
+ *                        backing this Layer will be given this height.
+ */
+Guacamole.Client.LayerContainer = function(width, height) {
+
+    /**
+     * Reference to this LayerContainer.
+     * @private
+     */
+    var layer_container = this;
+
+    // Create layer with given size
+    var layer = new Guacamole.Layer(width, height);
+
+    // Set layer position
+    var canvas = layer.getCanvas();
+    canvas.style.position = "absolute";
+    canvas.style.left = "0px";
+    canvas.style.top = "0px";
+
+    // Create div with given size
+    var div = document.createElement("div");
+    div.appendChild(canvas);
+    div.style.width = width + "px";
+    div.style.height = height + "px";
+
+    /**
+     * Changes the size of this LayerContainer and the contained Layer to the
+     * given width and height.
+     * 
+     * @param {Number} width The new width to assign to this Layer.
+     * @param {Number} height The new height to assign to this Layer.
+     */
+    layer_container.resize = function(width, height) {
+
+        // Resize layer
+        layer.resize(width, height);
+
+        // Resize containing div
+        div.style.width = width + "px";
+        div.style.height = height + "px";
 
     };
+  
+    /**
+     * Returns the Layer contained within this LayerContainer.
+     * @returns {Guacamole.Layer} The Layer contained within this LayerContainer.
+     */
+    layer_container.getLayer = function() {
+        return layer;
+    };
+
+    /**
+     * Returns the element containing the Layer within this LayerContainer.
+     * @returns {Element} The element containing the Layer within this LayerContainer.
+     */
+    layer_container.getElement = function() {
+        return div;
+    };
+
+    /**
+     * The translation component of this LayerContainer's transform.
+     */
+    var translate = "translate(0px, 0px)"; // (0, 0)
+
+    /**
+     * The arbitrary matrix component of this LayerContainer's transform.
+     */
+    var matrix = "matrix(1, 0, 0, 1, 0, 0)"; // Identity
+
+    /**
+     * Moves the upper-left corner of this LayerContainer to the given X and Y
+     * coordinate.
+     * 
+     * @param {Number} x The X coordinate to move to.
+     * @param {Number} y The Y coordinate to move to.
+     */
+    layer_container.translate = function(x, y) {
+
+        // Generate translation
+        translate = "translate("
+                        + x + "px,"
+                        + y + "px)";
+
+        // Set layer transform 
+        div.style.transform =
+        div.style.WebkitTransform =
+        div.style.MozTransform =
+        div.style.OTransform =
+        div.style.msTransform =
+
+            translate + " " + matrix;
 
+    };
+
+    /**
+     * Applies the given affine transform (defined with six values from the
+     * transform's matrix).
+     * 
+     * @param {Number} a The first value in the affine transform's matrix.
+     * @param {Number} b The second value in the affine transform's matrix.
+     * @param {Number} c The third value in the affine transform's matrix.
+     * @param {Number} d The fourth value in the affine transform's matrix.
+     * @param {Number} e The fifth value in the affine transform's matrix.
+     * @param {Number} f The sixth value in the affine transform's matrix.
+     */
+    layer_container.transform = function(a, b, c, d, e, f) {
+
+        // Generate matrix transformation
+        matrix =
+
+            /* a c e
+             * b d f
+             * 0 0 1
+             */
     
-    function disconnect() {
+            "matrix(" + a + "," + b + "," + c + "," + d + "," + e + "," + f + ")";
 
-        // Only attempt disconnection not disconnected.
-        if (currentState != STATE_DISCONNECTED
-                && currentState != STATE_DISCONNECTING) {
+        // Set layer transform 
+        div.style.transform =
+        div.style.WebkitTransform =
+        div.style.MozTransform =
+        div.style.OTransform =
+        div.style.msTransform =
 
-            var message = "disconnect;";
-            setState(STATE_DISCONNECTING);
+            translate + " " + matrix;
 
-            // Send disconnect message (synchronously... as necessary until handoff is implemented)
-            var disconnect_xmlhttprequest = new XMLHttpRequest();
-            disconnect_xmlhttprequest.open("POST", TUNNEL_WRITE, false);
-            disconnect_xmlhttprequest.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-            disconnect_xmlhttprequest.setRequestHeader("Content-length", message.length);
-            disconnect_xmlhttprequest.send(message);
+    };
 
-            setState(STATE_DISCONNECTED);
-        }
+};
 
+/**
+ * Map of all Guacamole binary raster operations to transfer functions.
+ * @private
+ */
+Guacamole.Client.DefaultTransferFunction = {
+
+    /* BLACK */
+    0x0: function (src, dst) {
+        dst.red = dst.green = dst.blue = 0x00;
+    },
+
+    /* WHITE */
+    0xF: function (src, dst) {
+        dst.red = dst.green = dst.blue = 0xFF;
+    },
+
+    /* SRC */
+    0x3: function (src, dst) {
+        dst.red   = src.red;
+        dst.green = src.green;
+        dst.blue  = src.blue;
+        dst.alpha = src.alpha;
+    },
+
+    /* DEST (no-op) */
+    0x5: function (src, dst) {
+        // Do nothing
+    },
+
+    /* Invert SRC */
+    0xC: function (src, dst) {
+        dst.red   = 0xFF & ~src.red;
+        dst.green = 0xFF & ~src.green;
+        dst.blue  = 0xFF & ~src.blue;
+        dst.alpha =  src.alpha;
+    },
+    
+    /* Invert DEST */
+    0xA: function (src, dst) {
+        dst.red   = 0xFF & ~dst.red;
+        dst.green = 0xFF & ~dst.green;
+        dst.blue  = 0xFF & ~dst.blue;
+    },
+
+    /* AND */
+    0x1: function (src, dst) {
+        dst.red   =  ( src.red   &  dst.red);
+        dst.green =  ( src.green &  dst.green);
+        dst.blue  =  ( src.blue  &  dst.blue);
+    },
+
+    /* NAND */
+    0xE: function (src, dst) {
+        dst.red   = 0xFF & ~( src.red   &  dst.red);
+        dst.green = 0xFF & ~( src.green &  dst.green);
+        dst.blue  = 0xFF & ~( src.blue  &  dst.blue);
+    },
+
+    /* OR */
+    0x7: function (src, dst) {
+        dst.red   =  ( src.red   |  dst.red);
+        dst.green =  ( src.green |  dst.green);
+        dst.blue  =  ( src.blue  |  dst.blue);
+    },
+
+    /* NOR */
+    0x8: function (src, dst) {
+        dst.red   = 0xFF & ~( src.red   |  dst.red);
+        dst.green = 0xFF & ~( src.green |  dst.green);
+        dst.blue  = 0xFF & ~( src.blue  |  dst.blue);
+    },
+
+    /* XOR */
+    0x6: function (src, dst) {
+        dst.red   =  ( src.red   ^  dst.red);
+        dst.green =  ( src.green ^  dst.green);
+        dst.blue  =  ( src.blue  ^  dst.blue);
+    },
+
+    /* XNOR */
+    0x9: function (src, dst) {
+        dst.red   = 0xFF & ~( src.red   ^  dst.red);
+        dst.green = 0xFF & ~( src.green ^  dst.green);
+        dst.blue  = 0xFF & ~( src.blue  ^  dst.blue);
+    },
+
+    /* AND inverted source */
+    0x4: function (src, dst) {
+        dst.red   =  0xFF & (~src.red   &  dst.red);
+        dst.green =  0xFF & (~src.green &  dst.green);
+        dst.blue  =  0xFF & (~src.blue  &  dst.blue);
+    },
+
+    /* OR inverted source */
+    0xD: function (src, dst) {
+        dst.red   =  0xFF & (~src.red   |  dst.red);
+        dst.green =  0xFF & (~src.green |  dst.green);
+        dst.blue  =  0xFF & (~src.blue  |  dst.blue);
+    },
+
+    /* AND inverted destination */
+    0x2: function (src, dst) {
+        dst.red   =  0xFF & ( src.red   & ~dst.red);
+        dst.green =  0xFF & ( src.green & ~dst.green);
+        dst.blue  =  0xFF & ( src.blue  & ~dst.blue);
+    },
+
+    /* OR inverted destination */
+    0xB: function (src, dst) {
+        dst.red   =  0xFF & ( src.red   | ~dst.red);
+        dst.green =  0xFF & ( src.green | ~dst.green);
+        dst.blue  =  0xFF & ( src.blue  | ~dst.blue);
     }
 
-    this.disconnect = disconnect;
-
-}
+};