Implemented lfill, lstroke.
[guacamole-common-js.git] / src / main / resources / guacamole.js
index aee7fae..7af0da3 100644 (file)
@@ -20,6 +20,7 @@
  * 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
@@ -67,6 +68,24 @@ Guacamole.Client = function(tunnel) {
     var displayWidth = 0;
     var displayHeight = 0;
 
+    /**
+     * 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 display
     var display = document.createElement("div");
     display.style.position = "relative";
@@ -245,73 +264,138 @@ Guacamole.Client = function(tunnel) {
 
     var instructionHandlers = {
 
-        "error": function(parameters) {
-            if (guac_client.onerror) guac_client.onerror(parameters[0]);
-            guac_client.disconnect();
+        "arc": function(parameters) {
+
+            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]);
+
+            layer.arc(x, y, radius, startAngle, endAngle);
+
         },
 
-        "name": function(parameters) {
-            if (guac_client.onname) guac_client.onname(parameters[0]);
+        "cfill": function(parameters) {
+
+            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]);
+
+            layer.setChannelMask(channelMask);
+
+            layer.fillColor(r, g, b, a);
+
+        },
+
+        "clip": function(parameters) {
+
+            var layer = getLayer(parseInt(parameters[0]));
+
+            layer.clip();
+
         },
 
         "clipboard": function(parameters) {
             if (guac_client.onclipboard) guac_client.onclipboard(parameters[0]);
         },
 
-        "size": function(parameters) {
+        "close": function(parameters) {
 
-            var layer_index = parseInt(parameters[0]);
-            var width = parseInt(parameters[1]);
-            var height = parseInt(parameters[2]);
+            var layer = getLayer(parseInt(parameters[0]));
 
-            // Only valid for layers (buffers auto-resize)
-            if (layer_index >= 0) {
+            layer.close();
 
-                // Resize layer
-                var layer_container = getLayerContainer(layer_index);
-                layer_container.resize(width, height);
+        },
 
-                // If layer is default, resize display
-                if (layer_index == 0) {
+        "copy": function(parameters) {
 
-                    displayWidth = width;
-                    displayHeight = height;
+            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]);
 
-                    // Update (set) display size
-                    display.style.width = displayWidth + "px";
-                    display.style.height = displayHeight + "px";
+            dstL.setChannelMask(channelMask);
 
-                }
+            dstL.copy(
+                srcL,
+                srcX,
+                srcY,
+                srcWidth, 
+                srcHeight, 
+                dstX,
+                dstY 
+            );
 
-            } // end if layer (not buffer)
+        },
+
+        "cstroke": function(parameters) {
+
+            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]);
+
+            layer.setChannelMask(channelMask);
+
+            layer.strokeColor(cap, join, thickness, r, g, b, a);
 
         },
 
-        "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]);
+        "cursor": function(parameters) {
 
-            // Only valid for non-default layers
-            if (layer_index > 0 && parent_index >= 0) {
+            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]);
 
-                // Get container element
-                var layer_container = getLayerContainer(layer_index).getElement();
-                var parent = getLayerContainer(parent_index).getElement();
+            // Reset cursor size
+            cursor.resize(srcWidth, srcHeight);
 
-                // Set parent if necessary
-                if (!(layer_container.parentNode === parent))
-                    parent.appendChild(layer_container);
+            // Draw cursor to cursor layer
+            cursor.getLayer().copy(
+                srcL,
+                srcX,
+                srcY,
+                srcWidth, 
+                srcHeight, 
+                0,
+                0 
+            );
 
-                // Move layer
-                layer_container.style.left   = x + "px";
-                layer_container.style.top    = y + "px";
-                layer_container.style.zIndex = z;
+            // Update cursor position (hotspot may have changed)
+            moveCursor(cursorX, cursorY);
 
-            }
+        },
+
+        "curve": function(parameters) {
+
+            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]);
+
+            layer.curveTo(cp1x, cp1y, cp2x, cp2y, x, y);
 
         },
 
@@ -341,102 +425,100 @@ Guacamole.Client = function(tunnel) {
 
         },
 
-        "png": function(parameters) {
+        "error": function(parameters) {
+            if (guac_client.onerror) guac_client.onerror(parameters[0]);
+            guac_client.disconnect();
+        },
+
+        "lfill": function(parameters) {
 
             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 srcLayer = getLayer(parseInt(parameters[2]));
 
             layer.setChannelMask(channelMask);
 
-            layer.draw(
-                x,
-                y,
-                "data:image/png;base64," + data
-            );
+            layer.fillLayer(srcLayer);
 
-            // If received first update, no longer waiting.
-            if (currentState == STATE_WAITING)
-                setState(STATE_CONNECTED);
+        },
+
+        "line": function(parameters) {
+
+            var layer = getLayer(parseInt(parameters[0]));
+            var x = parseInt(parameters[1]);
+            var y = parseInt(parameters[2]);
+
+            layer.lineTo(x, y);
 
         },
 
-        "copy": function(parameters) {
+        "lstroke": 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]);
+            var channelMask = parseInt(parameters[0]);
+            var layer = getLayer(parseInt(parameters[1]));
+            var srcLayer = getLayer(parseInt(parameters[2]));
 
-            dstL.setChannelMask(channelMask);
+            layer.setChannelMask(channelMask);
 
-            dstL.copyRect(
-                srcL,
-                srcX,
-                srcY,
-                srcWidth, 
-                srcHeight, 
-                dstX,
-                dstY 
-            );
+            layer.strokeLayer(srcLayer);
 
         },
 
-        "transfer": function(parameters) {
+        "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 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 transferFunction = Guacamole.Client.DefaultTransferFunction[parameters[5]];
-            var dstL = getLayer(parseInt(parameters[6]));
-            var dstX = parseInt(parameters[7]);
-            var dstY = parseInt(parameters[8]);
+            // Only valid for non-default layers
+            if (layer_index > 0 && parent_index >= 0) {
 
-            dstL.transfer(
-                srcL,
-                srcX,
-                srcY,
-                srcWidth, 
-                srcHeight, 
-                dstX,
-                dstY,
-                transferFunction
-            );
+                // Get container element
+                var layer_container = getLayerContainer(layer_index).getElement();
+                var parent = getLayerContainer(parent_index).getElement();
+
+                // Set parent if necessary
+                if (!(layer_container.parentNode === parent))
+                    parent.appendChild(layer_container);
+
+                // Move layer
+                layer_container.style.left   = x + "px";
+                layer_container.style.top    = y + "px";
+                layer_container.style.zIndex = z;
+
+            }
 
         },
 
-        "rect": function(parameters) {
+        "name": function(parameters) {
+            if (guac_client.onname) guac_client.onname(parameters[0]);
+        },
+
+        "png": function(parameters) {
 
             var channelMask = parseInt(parameters[0]);
             var layer = getLayer(parseInt(parameters[1]));
             var x = parseInt(parameters[2]);
             var y = parseInt(parameters[3]);
-            var w = parseInt(parameters[4]);
-            var h = parseInt(parameters[5]);
-            var r = parseInt(parameters[6]);
-            var g = parseInt(parameters[7]);
-            var b = parseInt(parameters[8]);
-            var a = parseInt(parameters[9]);
+            var data = parameters[4];
 
             layer.setChannelMask(channelMask);
 
-            layer.drawRect(
-                x, y, w, h,
-                r, g, b, a
+            layer.draw(
+                x,
+                y,
+                "data:image/png;base64," + data
             );
 
+            // If received first update, no longer waiting.
+            if (currentState == STATE_WAITING)
+                setState(STATE_CONNECTED);
+
         },
 
-        "clip": function(parameters) {
+        "rect": function(parameters) {
 
             var layer = getLayer(parseInt(parameters[0]));
             var x = parseInt(parameters[1]);
@@ -444,36 +526,49 @@ Guacamole.Client = function(tunnel) {
             var w = parseInt(parameters[3]);
             var h = parseInt(parameters[4]);
 
-            layer.clipRect(x, y, w, h);
+            layer.rect(x, y, w, h);
 
         },
+        
+        "reset": function(parameters) {
 
-        "cursor": function(parameters) {
+            var layer = getLayer(parseInt(parameters[0]));
 
-            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]);
+            layer.reset();
 
-            // Reset cursor size
-            cursor.resize(srcWidth, srcHeight);
+        },
+        "size": function(parameters) {
 
-            // Draw cursor to cursor layer
-            cursor.getLayer().copyRect(
-                srcL,
-                srcX,
-                srcY,
-                srcWidth, 
-                srcHeight, 
-                0,
-                0 
-            );
+            var layer_index = parseInt(parameters[0]);
+            var width = parseInt(parameters[1]);
+            var height = parseInt(parameters[2]);
 
-            // Update cursor position (hotspot may have changed)
-            moveCursor(cursorX, cursorY);
+            // 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
+                display.style.width = displayWidth + "px";
+                display.style.height = displayHeight + "px";
+
+            }
+
+        },
+        
+        "start": function(parameters) {
+
+            var layer = getLayer(parseInt(parameters[0]));
+            var x = parseInt(parameters[1]);
+            var y = parseInt(parameters[2]);
+
+            layer.moveTo(x, y);
 
         },
 
@@ -519,6 +614,31 @@ Guacamole.Client = function(tunnel) {
                 }
             }
 
+        },
+
+        "transfer": 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 transferFunction = Guacamole.Client.DefaultTransferFunction[parameters[5]];
+            var dstL = getLayer(parseInt(parameters[6]));
+            var dstX = parseInt(parameters[7]);
+            var dstY = parseInt(parameters[8]);
+
+            dstL.transfer(
+                srcL,
+                srcX,
+                srcY,
+                srcWidth, 
+                srcHeight, 
+                dstX,
+                dstY,
+                transferFunction
+            );
+
         }
       
     };