* 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
#include <guacamole/socket.h>
#include <guacamole/protocol.h>
#include <guacamole/client.h>
+#include <guacamole/error.h>
#include "client.h"
#include "guac_handlers.h"
bitmap->Decompress = guac_rdp_bitmap_decompress;
bitmap->SetSurface = guac_rdp_bitmap_setsurface;
graphics_register_bitmap(context->graphics, bitmap);
+ xfree(bitmap);
/* Set up glyph handling */
glyph = xnew(rdpGlyph);
glyph->BeginDraw = guac_rdp_glyph_begindraw;
glyph->EndDraw = guac_rdp_glyph_enddraw;
graphics_register_glyph(context->graphics, glyph);
+ xfree(glyph);
/* Set up pointer handling */
pointer = xnew(rdpPointer);
pointer->Free = guac_rdp_pointer_free;
pointer->Set = guac_rdp_pointer_set;
graphics_register_pointer(context->graphics, pointer);
+ xfree(pointer);
/* Set up GDI */
instance->update->Palette = guac_rdp_gdi_palette_update;
/* EMPTY */
}
+void __guac_rdp_client_load_keymap(guac_client* client,
+ const guac_rdp_keymap* keymap) {
+
+ rdp_guac_client_data* guac_client_data =
+ (rdp_guac_client_data*) client->data;
+ /* Get mapping */
+ const guac_rdp_keysym_desc* mapping = keymap->mapping;
+
+ /* If parent exists, load parent first */
+ if (keymap->parent != NULL)
+ __guac_rdp_client_load_keymap(client, keymap->parent);
+
+ /* Log load */
+ guac_client_log_info(client, "Loading keymap \"%s\"", keymap->name);
+
+ /* Load mapping into keymap */
+ while (mapping->keysym != 0) {
+
+ /* Copy mapping */
+ GUAC_RDP_KEYSYM_LOOKUP(guac_client_data->keymap, mapping->keysym) =
+ *mapping;
+
+ /* Next keysym */
+ mapping++;
+
+ }
+
+}
+
int guac_client_init(guac_client* client, int argc, char** argv) {
rdp_guac_client_data* guac_client_data;
boolean bitmap_cache;
if (argc < 8) {
- guac_protocol_send_error(client->socket, "Wrong argument count received.");
+
+ guac_protocol_send_error(client->socket,
+ "Wrong argument count received.");
guac_socket_flush(client->socket);
+
+ guac_error = GUAC_STATUS_BAD_ARGUMENT;
+ guac_error_message = "Wrong argument count received";
+
return 1;
}
/* Set hostname */
settings->hostname = strdup(hostname);
+ settings->port = port;
settings->window_title = strdup(hostname);
/* username */
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;
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;
guac_client_data->mouse_button_mask = 0;
guac_client_data->current_surface = GUAC_DEFAULT_LAYER;
- ((rdp_freerdp_context*) rdp_inst->context)->client = client;
+ /* Clear keysym state mapping and keymap */
+ memset(guac_client_data->keysym_state, 0,
+ sizeof(guac_rdp_keysym_state_map));
+
+ memset(guac_client_data->keymap, 0,
+ sizeof(guac_rdp_static_keymap));
+
client->data = guac_client_data;
+ ((rdp_freerdp_context*) rdp_inst->context)->client = client;
+
+ /* Load keymap into client */
+ __guac_rdp_client_load_keymap(client, &guac_rdp_keymap_en_us);
/* Connect to RDP server */
if (!freerdp_connect(rdp_inst)) {
- guac_protocol_send_error(client->socket, "Error connecting to RDP server");
+
+ guac_protocol_send_error(client->socket,
+ "Error connecting to RDP server");
guac_socket_flush(client->socket);
+
+ guac_error = GUAC_STATUS_BAD_STATE;
+ guac_error_message = "Error connecting to RDP server";
+
return 1;
}