Do not use addressof in lookup macro. Update keysym state in event handler.

[libguac-client-rdp.git] / src / guac_handlers.c

diff --git a/src/guac_handlers.c b/src/guac_handlers.c
index 2d1bc20..488af41 100644 (file)
--- a/src/guac_handlers.c
+++ b/src/guac_handlers.c
@@ -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
@@ -53,6 +54,10 @@
 #include "rdp_keymap.h"
 #include "guac_handlers.h"
 
+void __guac_rdp_send_keysym_string(guac_client* client, const int* keysym_string, int pressed);
+int __guac_rdp_send_keysym(guac_client* client, int keysym, int pressed);
+void __guac_rdp_send_altcode(guac_client* client, const char* altcode);
+
 int rdp_guac_client_free_handler(guac_client* client) {
 
     /* STUB */
@@ -75,9 +80,13 @@ int rdp_guac_client_handle_messages(guac_client* client) {
     void* write_fds[32];
     int read_count = 0;
     int write_count = 0;
-
     fd_set rfds, wfds;
 
+    struct timeval timeout = {
+        .tv_sec = 0,
+        .tv_usec = 250000
+    };
+
     /* get rdp fds */
     if (!freerdp_get_fds(rdp_inst, read_fds, &read_count, write_fds, &write_count)) {
         guac_client_log_error(client, "Unable to read RDP file descriptors.");
@@ -116,7 +125,7 @@ int rdp_guac_client_handle_messages(guac_client* client) {
     }
 
     /* Otherwise, wait for file descriptors given */
-    if (select(max_fd + 1, &rfds, &wfds, NULL, NULL) == -1) {
+    if (select(max_fd + 1, &rfds, &wfds, NULL, &timeout) == -1) {
         /* these are not really errors */
         if (!((errno == EAGAIN) ||
             (errno == EWOULDBLOCK) ||
@@ -218,30 +227,108 @@ int rdp_guac_client_mouse_handler(guac_client* client, int x, int y, int mask) {
     return 0;
 }
 
-int rdp_guac_client_key_handler(guac_client* client, int keysym, int pressed) {
+void __guac_rdp_send_altcode(guac_client* client, const char* altcode) {
 
     rdp_guac_client_data* guac_client_data = (rdp_guac_client_data*) client->data;
     freerdp* rdp_inst = guac_client_data->rdp_inst;
+    const guac_rdp_keysym_scancode_map* keysym_scancodes = guac_client_data->keysym_scancodes;
+
+    /* Lookup scancode for Alt */
+    int alt = GUAC_RDP_KEYSYM_LOOKUP(*keysym_scancodes, 0xFFE9 /* Alt_L */).scancode;
+
+    /* Press Alt */
+    rdp_inst->input->KeyboardEvent(rdp_inst->input, KBD_FLAGS_DOWN, alt);
+
+    /* For each character in Alt-code ... */
+    while (*altcode != '\0') {
+
+        /* Get scancode of keypad digit */
+        int scancode = GUAC_RDP_KEYSYM_LOOKUP(*keysym_scancodes, 0xFFB0 + (*altcode) - '0').scancode;
+
+        /* Press and release digit */
+        rdp_inst->input->KeyboardEvent(rdp_inst->input, KBD_FLAGS_DOWN, scancode);
+        rdp_inst->input->KeyboardEvent(rdp_inst->input, KBD_FLAGS_RELEASE, scancode);
+
+        /* Next character */
+        altcode++;
+    }
+
+    /* Release Alt */
+    rdp_inst->input->KeyboardEvent(rdp_inst->input, KBD_FLAGS_RELEASE, alt);
+
+}
+
+int __guac_rdp_send_keysym(guac_client* client, int keysym, int pressed) {
+
+    rdp_guac_client_data* guac_client_data = (rdp_guac_client_data*) client->data;
+    freerdp* rdp_inst = guac_client_data->rdp_inst;
+    const guac_rdp_keysym_scancode_map* keysym_scancodes = guac_client_data->keysym_scancodes;
 
     /* If keysym can be in lookup table */
     if (keysym <= 0xFFFF) {
 
-        /* Look up scancode */
-        const guac_rdp_keymap* keymap = 
-            &guac_rdp_keysym_scancode[(keysym & 0xFF00) >> 8][keysym & 0xFF];
+        /* Look up scancode mapping */
+        const guac_rdp_scancode_map* scancode_map = &GUAC_RDP_KEYSYM_LOOKUP(*keysym_scancodes, keysym);
 
         /* If defined, send event */
-        if (keymap->scancode != 0)
+        if (scancode_map->scancode != 0) {
+
+            /* If defined, send any prerequesite keys */
+            if (scancode_map->set_keysyms != NULL)
+                __guac_rdp_send_keysym_string(client, scancode_map->set_keysyms, 1);
+
+            /* Send actual key */
             rdp_inst->input->KeyboardEvent(
                     rdp_inst->input,
-                    keymap->flags
+                    scancode_map->flags
                         | (pressed ? KBD_FLAGS_DOWN : KBD_FLAGS_RELEASE),
-                    keymap->scancode);
-        else
-            guac_client_log_info(client, "unmapped keysym: 0x%x", keysym);
+                    scancode_map->scancode);
+
+            /* If defined, release any prerequesite keys */
+            if (scancode_map->set_keysyms != NULL)
+                __guac_rdp_send_keysym_string(client, scancode_map->set_keysyms, 0);
+
+        }
+
+        /* If undefined, try to type using Alt-code */
+        else {
+
+            const guac_rdp_altcode_map* altcode_map = &GUAC_RDP_KEYSYM_LOOKUP(guac_rdp_keysym_altcode, keysym);
+            if (altcode_map->altcode != NULL) {
+
+                /* Only send Alt-code on press */
+                if (pressed)
+                    __guac_rdp_send_altcode(client, altcode_map->altcode);
+
+            }
+
+            /* If no defined Alt-code, log warning */
+            else
+                guac_client_log_info(client, "unmapped keysym: 0x%x", keysym);
+
+        }
 
     }
 
     return 0;
 }
 
+void __guac_rdp_send_keysym_string(guac_client* client, const int* keysym_string, int pressed) {
+
+    /* Send all keysyms in string, NULL terminated */
+    while (*keysym_string != 0)
+        __guac_rdp_send_keysym(client, *(keysym_string++), pressed);
+
+}
+
+int rdp_guac_client_key_handler(guac_client* client, int keysym, int pressed) {
+
+    rdp_guac_client_data* guac_client_data = (rdp_guac_client_data*) client->data;
+
+    /* Update keysym state */
+    GUAC_RDP_KEYSYM_LOOKUP(guac_client_data->keysym_state, keysym) = pressed;
+
+    return __guac_rdp_send_keysym(client, keysym, pressed);
+
+}
+