Initial I-bar cursor.

protocols/ssh/Makefile.am

@@ -41,12 +41,14 @@ ACLOCAL_AMFLAGS = -I m4
 lib_LTLIBRARIES = libguac-client-ssh.la
 
 libguac_client_ssh_la_SOURCES = \
+    src/ibar.c                  \
     src/ssh_client.c            \
     src/ssh_handlers.c          \
     src/terminal.c              \
     src/terminal_handlers.c
 
 noinst_HEADERS =                \
+    include/ibar.h              \
     include/ssh_client.h        \
     include/ssh_handlers.h      \
     include/terminal.h          \

protocols/ssh/include/ibar.h

@@ -0,0 +1,76 @@
+
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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/
+ *
+ * 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.
+ *
+ * The Original Code is libguac-client-ssh.
+ *
+ * The Initial Developer of the Original Code is
+ * Michael Jumper.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * 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 ***** */
+
+#ifndef _GUAC_SSH_IBAR_H
+#define _GUAC_SSH_IBAR_H
+
+#include <cairo/cairo.h>
+#include <guacamole/client.h>
+
+/**
+ * Width of the embedded mouse cursor graphic.
+ */
+extern const int guac_ssh_ibar_width;
+
+/**
+ * Height of the embedded mouse cursor graphic.
+ */
+extern const int guac_ssh_ibar_height;
+
+/**
+ * Number of bytes in each row of the embedded mouse cursor graphic.
+ */
+extern const int guac_ssh_ibar_stride;
+
+/**
+ * The Cairo grapic format of the mouse cursor graphic.
+ */
+extern const cairo_format_t guac_ssh_ibar_format;
+
+/**
+ * Embedded mouse cursor graphic.
+ */
+extern unsigned char guac_ssh_ibar[];
+
+/**
+ * Set the cursor of the remote display to the embedded cursor graphic.
+ *
+ * @param client The guac_client to send the cursor to.
+ */
+void guac_ssh_set_ibar(guac_client* client);
+
+#endif

protocols/ssh/src/ibar.c

@@ -0,0 +1,109 @@
+
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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/
+ *
+ * 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.
+ *
+ * The Original Code is libguac-client-ssh.
+ *
+ * The Initial Developer of the Original Code is
+ * Michael Jumper.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * 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 ***** */
+
+#include <cairo/cairo.h>
+#include <guacamole/client.h>
+#include <guacamole/protocol.h>
+#include <guacamole/socket.h>
+
+/* Macros for prettying up the embedded image. */
+#define X 0x00,0x00,0x00,0xFF
+#define O 0xFF,0xFF,0xFF,0xFF
+#define _ 0x00,0x00,0x00,0x00
+
+/* Dimensions */
+const int guac_ssh_ibar_width  = 11;
+const int guac_ssh_ibar_height = 16;
+
+/* Format */
+const cairo_format_t guac_ssh_ibar_format = CAIRO_FORMAT_ARGB32;
+const int guac_ssh_ibar_stride = 44;
+
+/* Embedded pointer graphic */
+unsigned char guac_ssh_ibar[] = {
+
+        X,X,X,X,X,_,X,X,X,X,X,
+        X,O,O,O,O,X,O,O,O,O,X,
+        X,X,X,X,O,O,O,X,X,X,X,
+        _,_,_,_,X,O,X,_,_,_,_,
+        _,_,_,_,X,O,X,_,_,_,_,
+        _,_,_,_,X,O,X,_,_,_,_,
+        _,_,_,_,X,O,X,_,_,_,_,
+        _,_,_,_,X,O,X,_,_,_,_,
+        _,_,_,_,X,O,X,_,_,_,_,
+        _,_,_,_,X,O,X,_,_,_,_,
+        _,_,_,_,X,O,X,_,_,_,_,
+        _,_,_,_,X,O,X,_,_,_,_,
+        _,_,_,_,X,O,X,_,_,_,_,
+        X,X,X,X,O,O,O,X,X,X,X,
+        X,O,O,O,O,X,O,O,O,O,X,
+        X,X,X,X,X,_,X,X,X,X,X
+
+};
+
+
+void guac_ssh_set_ibar(guac_client* client) {
+
+    guac_socket* socket = client->socket;
+
+    /* Draw to buffer */
+    guac_layer* cursor = guac_client_alloc_buffer(client);
+
+    cairo_surface_t* graphic = cairo_image_surface_create_for_data(
+            guac_ssh_ibar,
+            guac_ssh_ibar_format,
+            guac_ssh_ibar_width,
+            guac_ssh_ibar_height,
+            guac_ssh_ibar_stride);
+
+    guac_protocol_send_png(socket, GUAC_COMP_SRC, cursor, 0, 0, graphic);
+    cairo_surface_destroy(graphic);
+
+    /* Set cursor */
+    guac_protocol_send_cursor(socket,
+            guac_ssh_ibar_width / 2,
+            guac_ssh_ibar_height / 2,
+            cursor,
+            0, 0,
+            guac_ssh_ibar_width,
+            guac_ssh_ibar_height);
+
+    /* Free buffer */
+    guac_client_free_buffer(client, cursor);
+
+}
+

protocols/ssh/src/ssh_client.c

@@ -48,6 +48,7 @@
 #include "ssh_client.h"
 #include "ssh_handlers.h"
 #include "terminal.h"
+#include "ibar.h"
 
 /* Client plugin arguments */
 const char* GUAC_CLIENT_ARGS[] = {
@@ -122,6 +123,9 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
             term->char_width  * term->term_width,
             term->char_height * term->term_height);
 
+    /* Send I-bar pointer */
+    guac_ssh_set_ibar(client);
+
     guac_socket_flush(socket);
 
     /* Open SSH session */