Add blank cursor.

protocols/ssh/Makefile.am

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

protocols/ssh/include/blank.h

@@ -0,0 +1,52 @@
+
+/* ***** 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_BLANK_H
+#define _GUAC_SSH_BLANK_H
+
+#include <cairo/cairo.h>
+#include <guacamole/client.h>
+
+/**
+ * Creates a new blank cursor, returning the corresponding cursor object.
+ *
+ * @param client The guac_client to send the cursor to.
+ * @return A new cursor which must be free'd via guac_ssh_cursor_free()/
+ */
+guac_ssh_cursor* guac_ssh_create_blank(guac_client* client);
+
+#endif

protocols/ssh/include/ssh_client.h

@@ -68,6 +68,11 @@ typedef struct ssh_guac_client_data {
      */
     guac_ssh_cursor* ibar_cursor;
 
+    /**
+     * The cached invisible (blank) cursor.
+     */
+    guac_ssh_cursor* blank_cursor;
+
     /**
      * The current cursor, used to avoid re-setting the cursor.
      */

protocols/ssh/src/blank.c

@@ -0,0 +1,64 @@
+
+/* ***** 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>
+
+#include "cursor.h"
+
+guac_ssh_cursor* guac_ssh_create_blank(guac_client* client) {
+
+    guac_socket* socket = client->socket;
+    guac_ssh_cursor* cursor = guac_ssh_cursor_alloc(client);
+
+    /* Set buffer to a single 1x1 transparent rectangle */
+    guac_protocol_send_rect(socket, cursor->buffer, 0, 0, 1, 1);
+    guac_protocol_send_cfill(socket, GUAC_COMP_SRC, cursor->buffer,
+            0x00, 0x00, 0x00, 0x00);
+
+    /* Initialize cursor properties */
+    cursor->width  = 1;
+    cursor->height = 1;
+    cursor->hotspot_x = 0;
+    cursor->hotspot_y = 0;
+
+    return cursor;
+
+}
+

protocols/ssh/src/ssh_client.c

@@ -48,6 +48,7 @@
 #include "ssh_client.h"
 #include "ssh_handlers.h"
 #include "terminal.h"
+#include "blank.h"
 #include "ibar.h"
 
 /* Client plugin arguments */
@@ -116,10 +117,13 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
     client_data->mod_ctrl = 0;
     client_data->clipboard_data = NULL;
 
-    /* Setup I-bar pointer */
+    /* Set up I-bar pointer */
     client_data->current_cursor =
     client_data->ibar_cursor    = guac_ssh_create_ibar(client);
 
+    /* Set up blank pointer */
+    client_data->blank_cursor = guac_ssh_create_blank(client);
+
     /* Send name and dimensions */
     guac_protocol_send_name(socket, "SSH TEST");
     guac_protocol_send_size(socket,

protocols/ssh/src/ssh_handlers.c

@@ -256,6 +256,7 @@ int ssh_guac_client_free_handler(guac_client* client) {
 
     /* Free cursors */
     guac_ssh_cursor_free(client, guac_client_data->ibar_cursor);
+    guac_ssh_cursor_free(client, guac_client_data->blank_cursor);
 
     /* Free generic data struct */
     free(client->data);