Add keysym string to $ for testing.

diff --git a/Makefile.am b/Makefile.am
index 3debd4f..f8406d9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,6 +42,7 @@ AM_CFLAGS = -Werror -Wall -pedantic -Iinclude
 lib_LTLIBRARIES = libguac-client-rdp.la
 
 libguac_client_rdp_la_SOURCES = src/client.c src/rdp_bitmap.c src/rdp_glyph.c src/rdp_pointer.c src/rdp_gdi.c src/guac_handlers.c \
 lib_LTLIBRARIES = libguac-client-rdp.la
 
 libguac_client_rdp_la_SOURCES = src/client.c src/rdp_bitmap.c src/rdp_glyph.c src/rdp_pointer.c src/rdp_gdi.c src/guac_handlers.c \

+                                src/rdp_keymap.c \

                                 src/rdp_keymap_en_us.c \
                                 src/rdp_keymap_alt.c
 
                                 src/rdp_keymap_en_us.c \
                                 src/rdp_keymap_alt.c
 

diff --git a/include/rdp_keymap.h b/include/rdp_keymap.h
index c7a7b89..1970889 100644 (file)
--- a/include/rdp_keymap.h
+++ b/include/rdp_keymap.h
@@ -58,13 +58,13 @@ typedef struct guac_rdp_scancode_map {
      * Null-terminated list of keysyms which must be down for this keysym
      * to be properly typed.
      */
      * Null-terminated list of keysyms which must be down for this keysym
      * to be properly typed.
      */

-    int* set_keysyms;
+    const int* set_keysyms;

 
     /**
      * Null-terminated list of keysyms which must be up for this keysym
      * to be properly typed.
      */
 
     /**
      * Null-terminated list of keysyms which must be up for this keysym
      * to be properly typed.
      */

-    int* clear_keysyms;
+    const int* clear_keysyms;

 
 } guac_rdp_scancode_map;
 
 
 } guac_rdp_scancode_map;
 

@@ -108,5 +108,10 @@ extern const guac_rdp_keysym_altcode_map guac_rdp_keysym_altcode;
  */
 #define GUAC_RDP_KEYSYM_LOOKUP(keysym_mapping, keysym) (&((keysym_mapping)[((keysym) & 0xFF00) >> 8][(keysym) & 0xFF]))
 
  */
 #define GUAC_RDP_KEYSYM_LOOKUP(keysym_mapping, keysym) (&((keysym_mapping)[((keysym) & 0xFF00) >> 8][(keysym) & 0xFF]))
 

+/**
+ * Keysym string containing only the left "shift" key.
+ */
+extern const int GUAC_KEYSYMS_SHIFT[];
+

 #endif
 
 #endif
 

diff --git a/src/guac_handlers.c b/src/guac_handlers.c
index 1c08118..8a7f334 100644 (file)
--- a/src/guac_handlers.c
+++ b/src/guac_handlers.c
@@ -254,7 +254,7 @@ void __guac_rdp_send_altcode(guac_client* client, const char* altcode) {
 
 }
 
 
 }
 

-void __rdp_guac_client_send_keysym_string(guac_client* client, int* keysym_string, int pressed) {
+void __rdp_guac_client_send_keysym_string(guac_client* client, const int* keysym_string, int pressed) {

 
     /* Send all keysyms in string, NULL terminated */
     while (*keysym_string != 0)
 
     /* Send all keysyms in string, NULL terminated */
     while (*keysym_string != 0)

diff --git a/src/rdp_keymap.c b/src/rdp_keymap.c
new file mode 100644 (file)
index 0000000..e50c808
--- /dev/null
+++ b/src/rdp_keymap.c
@@ -0,0 +1,41 @@
+
+/* ***** 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-rdp.
+ *
+ * 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 "rdp_keymap.h"
+
+const int GUAC_KEYSYMS_SHIFT[] = {0xFFE1, 0};
+

diff --git a/src/rdp_keymap_en_us.c b/src/rdp_keymap_en_us.c
index 78de904..10d86de 100644 (file)
--- a/src/rdp_keymap_en_us.c
+++ b/src/rdp_keymap_en_us.c
@@ -78,7 +78,8 @@ const guac_rdp_keysym_scancode_map guac_rdp_keysym_scancode_en_us = {
         { .scancode = 0x02, .flags = 0x00 }, /* 0x0021 (exclam) */
         { .scancode = 0x28, .flags = 0x00 }, /* 0x0022 (quotedbl) */
         { .scancode = 0x04, .flags = 0x00 }, /* 0x0023 (numbersign) */
         { .scancode = 0x02, .flags = 0x00 }, /* 0x0021 (exclam) */
         { .scancode = 0x28, .flags = 0x00 }, /* 0x0022 (quotedbl) */
         { .scancode = 0x04, .flags = 0x00 }, /* 0x0023 (numbersign) */

-        { .scancode = 0x05, .flags = 0x00 }, /* 0x0024 (dollar) */
+        { .scancode = 0x05, .flags = 0x00,
+            .set_keysyms = GUAC_KEYSYMS_SHIFT }, /* 0x0024 (dollar) */

         { .scancode = 0x06, .flags = 0x00 }, /* 0x0025 (percent) */
         { .scancode = 0x08, .flags = 0x00 }, /* 0x0026 (ampersand) */
         { .scancode = 0x28, .flags = 0x00 }, /* 0x0027 (quoteright) */
         { .scancode = 0x06, .flags = 0x00 }, /* 0x0025 (percent) */
         { .scancode = 0x08, .flags = 0x00 }, /* 0x0026 (ampersand) */
         { .scancode = 0x28, .flags = 0x00 }, /* 0x0027 (quoteright) */