* 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 <freerdp/freerdp.h>
#include <freerdp/utils/memory.h>
#include <freerdp/cache/bitmap.h>
+#include <freerdp/cache/brush.h>
+#include <freerdp/cache/glyph.h>
+#include <freerdp/cache/palette.h>
+#include <freerdp/cache/pointer.h>
+#include <freerdp/cache/offscreen.h>
#include <freerdp/channels/channels.h>
#include <freerdp/input.h>
#include <freerdp/constants.h>
#include <guacamole/socket.h>
#include <guacamole/protocol.h>
#include <guacamole/client.h>
+#include <guacamole/error.h>
#include "client.h"
#include "guac_handlers.h"
#include "rdp_bitmap.h"
#include "rdp_glyph.h"
#include "rdp_pointer.h"
+#include "rdp_gdi.h"
/* Client plugin arguments */
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;
rdpBitmap* bitmap;
rdpGlyph* glyph;
rdpPointer* pointer;
+ rdpPrimaryUpdate* primary;
+ CLRCONV* clrconv;
+
+ /* Init color conversion structure */
+ clrconv = xnew(CLRCONV);
+ clrconv->alpha = 1;
+ clrconv->invert = 0;
+ clrconv->rgb555 = 0;
+ clrconv->palette = xnew(rdpPalette);
+ ((rdp_freerdp_context*) context)->clrconv = clrconv;
+
+ /* Init FreeRDP cache */
+ instance->context->cache = cache_new(instance->settings);
/* Set up bitmap handling */
bitmap = xnew(rdpBitmap);
bitmap->New = guac_rdp_bitmap_new;
bitmap->Free = guac_rdp_bitmap_free;
bitmap->Paint = guac_rdp_bitmap_paint;
- /* bitmap->Decompress = guac_rdp_bitmap_decompress; */
+ 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->New = guac_rdp_glyph_new;
glyph->Free = guac_rdp_glyph_free;
glyph->Draw = guac_rdp_glyph_draw;
+ 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;
+ instance->update->SetBounds = guac_rdp_gdi_set_bounds;
+
+ primary = instance->update->primary;
+ primary->DstBlt = guac_rdp_gdi_dstblt;
+ primary->PatBlt = guac_rdp_gdi_patblt;
+ primary->ScrBlt = guac_rdp_gdi_scrblt;
+ primary->MemBlt = guac_rdp_gdi_memblt;
+ primary->OpaqueRect = guac_rdp_gdi_opaquerect;
+
+ pointer_cache_register_callbacks(instance->update);
+ glyph_cache_register_callbacks(instance->update);
+ brush_cache_register_callbacks(instance->update);
+ bitmap_cache_register_callbacks(instance->update);
+ offscreen_cache_register_callbacks(instance->update);
+ palette_cache_register_callbacks(instance->update);
/* Init channels (pre-connect) */
if (freerdp_channels_pre_connect(channels, instance)) {
client->mouse_handler = rdp_guac_client_mouse_handler;
client->key_handler = rdp_guac_client_key_handler;
+ /* Send size */
+ guac_protocol_send_size(client->socket, GUAC_DEFAULT_LAYER,
+ instance->settings->width, instance->settings->height);
+
return true;
}
/* 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;
freerdp* rdp_inst;
- rdpSettings* settings;
+ rdpSettings* settings;
char* hostname;
int port = RDP_DEFAULT_PORT;
boolean bitmap_cache;
- if (argc < 2) {
- guac_protocol_send_error(client->socket, "Wrong argument count received.");
+ if (argc < 8) {
+
+ 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;
}
/* 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));
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;
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;
}
projects / libguac-client-rdp.git / blobdiff