Add per-client keysym state mapping.

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

diff --git a/src/client.c b/src/client.c
index 8f3c51c..365bfa4 100644 (file)
--- a/src/client.c
+++ b/src/client.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
@@ -69,9 +70,26 @@
 const char* GUAC_CLIENT_ARGS[] = {
     "hostname",
     "port",
+    "username",
+    "password",
+    "width",
+    "height",
+    "initial_program",
+    "color_depth",
     NULL
 };
 
+enum ARGS_IDX {
+    IDX_HOSTNAME,
+    IDX_PORT,
+    IDX_USERNAME,
+    IDX_PASSWORD,
+    IDX_WIDTH,
+    IDX_HEIGHT,
+    IDX_INITIAL_PROGRAM,
+    IDX_COLOR_DEPTH
+};
+
 boolean rdp_freerdp_pre_connect(freerdp* instance) {
 
     rdpContext* context = instance->context;
@@ -171,7 +189,7 @@ boolean rdp_freerdp_post_connect(freerdp* instance) {
     client->key_handler = rdp_guac_client_key_handler;
 
     /* Send size */
-    guac_protocol_send_size(client->socket,
+    guac_protocol_send_size(client->socket, GUAC_DEFAULT_LAYER,
             instance->settings->width, instance->settings->height);
 
     return true;
@@ -191,23 +209,23 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
     rdp_guac_client_data* guac_client_data;
 
     freerdp* rdp_inst;
-       rdpSettings* settings;
+    rdpSettings* settings;
 
     char* hostname;
     int port = RDP_DEFAULT_PORT;
     boolean bitmap_cache;
 
-    if (argc < 2) {
+    if (argc < 8) {
         guac_protocol_send_error(client->socket, "Wrong argument count received.");
         guac_socket_flush(client->socket);
         return 1;
     }
 
     /* If port specified, use it */
-    if (argv[1][0] != '\0')
-        port = atoi(argv[1]);
+    if (argv[IDX_PORT][0] != '\0')
+        port = atoi(argv[IDX_PORT]);
 
-    hostname = argv[0];
+    hostname = argv[IDX_HOSTNAME];
 
     /* Allocate client data */
     guac_client_data = malloc(sizeof(rdp_guac_client_data));
@@ -238,21 +256,46 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
     settings->encryption_method = ENCRYPTION_METHOD_40BIT | ENCRYPTION_METHOD_128BIT | ENCRYPTION_METHOD_FIPS;
     settings->encryption_level = ENCRYPTION_LEVEL_CLIENT_COMPATIBLE;
 
-    /* Default size */
-       settings->width = 1024;
-       settings->height = 768;
+    /* session width */
+    settings->width = 1024;
+    if (argv[IDX_WIDTH][0] != '\0')
+        settings->width = atoi(argv[IDX_WIDTH]);
+    if (settings->width == 0)
+        settings->width = 1024;
+
+    /* session height */
+    settings->height = 768;
+    if (argv[IDX_HEIGHT][0] != '\0')
+        settings->height = atoi(argv[IDX_HEIGHT]);
+    if (settings->height == 0)
+        settings->height = 768;
 
     /* Set hostname */
     settings->hostname = strdup(hostname);
-       settings->window_title = strdup(hostname);
-       settings->username = "guest";
+    settings->port = port;
+    settings->window_title = strdup(hostname);
+
+    /* username */
+    settings->username = "guest";
+    if (argv[IDX_USERNAME][0] != '\0')
+        settings->username = strdup (argv[IDX_USERNAME]);
+
+    /* password */
+    if (argv[IDX_PASSWORD][0] != '\0') {
+        settings->password = strdup (argv[IDX_PASSWORD]);
+        settings->autologon = 1;
+    }
+
+    /* initial program */
+    if (argv[IDX_INITIAL_PROGRAM][0] != '\0')
+        settings->shell = strdup (argv[IDX_INITIAL_PROGRAM]);
 
     /* Order support */
     bitmap_cache = settings->bitmap_cache;
     settings->os_major_type = OSMAJORTYPE_UNSPECIFIED;
     settings->os_minor_type = OSMINORTYPE_UNSPECIFIED;
     settings->order_support[NEG_DSTBLT_INDEX] = true;
-    settings->order_support[NEG_PATBLT_INDEX] = true;
+    settings->order_support[NEG_PATBLT_INDEX] = false; /* PATBLT not yet supported */
     settings->order_support[NEG_SCRBLT_INDEX] = true;
     settings->order_support[NEG_OPAQUE_RECT_INDEX] = true;
     settings->order_support[NEG_DRAWNINEGRID_INDEX] = false;
@@ -268,9 +311,9 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
     settings->order_support[NEG_MEMBLT_V2_INDEX] = bitmap_cache;
     settings->order_support[NEG_MEM3BLT_V2_INDEX] = false;
     settings->order_support[NEG_SAVEBITMAP_INDEX] = false;
-    settings->order_support[NEG_GLYPH_INDEX_INDEX] = false;
-    settings->order_support[NEG_FAST_INDEX_INDEX] = false;
-    settings->order_support[NEG_FAST_GLYPH_INDEX] = false;
+    settings->order_support[NEG_GLYPH_INDEX_INDEX] = true;
+    settings->order_support[NEG_FAST_INDEX_INDEX] = true;
+    settings->order_support[NEG_FAST_GLYPH_INDEX] = true;
     settings->order_support[NEG_POLYGON_SC_INDEX] = false;
     settings->order_support[NEG_POLYGON_CB_INDEX] = false;
     settings->order_support[NEG_ELLIPSE_SC_INDEX] = false;
@@ -280,6 +323,10 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
     guac_client_data->rdp_inst = rdp_inst;
     guac_client_data->mouse_button_mask = 0;
     guac_client_data->current_surface = GUAC_DEFAULT_LAYER;
+    guac_client_data->keysym_scancodes = &guac_rdp_keysym_scancode_en_us;
+
+    /* Clear keysym state mapping */
+    memset(guac_client_data->keysym_state, 0, sizeof(guac_rdp_keysym_state_map));
 
     ((rdp_freerdp_context*) rdp_inst->context)->client = client;
     client->data = guac_client_data;