From 6eebe61a0ba7f458db6d042156a56173657ee86d Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 3 Jan 2012 13:39:59 -0800 Subject: [PATCH] Added prototypes and init for glyphs and pointers. --- include/rdp_bitmap.h | 1 + include/rdp_glyph.h | 63 +++++++++++++++++++++++++++++++++++++++++++++++++ include/rdp_pointer.h | 60 ++++++++++++++++++++++++++++++++++++++++++++++ src/client.c | 22 ++++++++++++++++- src/rdp_bitmap.c | 5 ++++ 5 files changed, 150 insertions(+), 1 deletion(-) create mode 100644 include/rdp_glyph.h create mode 100644 include/rdp_pointer.h diff --git a/include/rdp_bitmap.h b/include/rdp_bitmap.h index 857f64d..0968cb3 100644 --- a/include/rdp_bitmap.h +++ b/include/rdp_bitmap.h @@ -59,5 +59,6 @@ typedef struct guac_rdp_bitmap { void guac_rdp_bitmap_new(rdpContext* context, rdpBitmap* bitmap); void guac_rdp_bitmap_paint(rdpContext* context, rdpBitmap* bitmap); void guac_rdp_bitmap_free(rdpContext* context, rdpBitmap* bitmap); +void guac_rdp_bitmap_setsurface(rdpContext* context, rdpBitmap* bitmap, boolean primary); #endif diff --git a/include/rdp_glyph.h b/include/rdp_glyph.h new file mode 100644 index 0000000..41ceb42 --- /dev/null +++ b/include/rdp_glyph.h @@ -0,0 +1,63 @@ + +/* ***** 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 ***** */ + +#ifndef _GUAC_RDP_RDP_GLYPH_H +#define _GUAC_RDP_RDP_GLYPH_H + +#include + +#include + +typedef struct guac_rdp_glyph { + + /** + * FreeRDP glyph data - MUST GO FIRST. + */ + rdpGlyph glyph; + + /** + * Guacamole layer containing cached image data. + */ + guac_layer* layer; + +} guac_rdp_glyph; + +void guac_rdp_glyph_new(rdpContext* context, rdpGlyph* glyph); +void guac_rdp_glyph_draw(rdpContext* context, rdpGlyph* glyph, int x, int y); +void guac_rdp_glyph_free(rdpContext* context, rdpGlyph* glyph); + +#endif diff --git a/include/rdp_pointer.h b/include/rdp_pointer.h new file mode 100644 index 0000000..869c9f1 --- /dev/null +++ b/include/rdp_pointer.h @@ -0,0 +1,60 @@ + +/* ***** 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 ***** */ + +#ifndef _GUAC_RDP_RDP_POINTER_H +#define _GUAC_RDP_RDP_POINTER_H + +#include + +#include + +typedef struct guac_rdp_pointer { + + /** + * FreeRDP pointer data - MUST GO FIRST. + */ + rdpPointer pointer; + + /* TODO: STUB */ + +} guac_rdp_pointer; + +void guac_rdp_pointer_new(rdpContext* context, rdpPointer* pointer); +void guac_rdp_pointer_set(rdpContext* context, rdpPointer* pointer); +void guac_rdp_pointer_free(rdpContext* context, rdpPointer* pointer); + +#endif diff --git a/src/client.c b/src/client.c index 4e5c6b9..b00f572 100644 --- a/src/client.c +++ b/src/client.c @@ -55,6 +55,8 @@ #include "guac_handlers.h" #include "rdp_keymap.h" #include "rdp_bitmap.h" +#include "rdp_glyph.h" +#include "rdp_pointer.h" /* Client plugin arguments */ const char* GUAC_CLIENT_ARGS[] = { @@ -69,6 +71,8 @@ boolean rdp_freerdp_pre_connect(freerdp* instance) { guac_client* client = ((rdp_freerdp_context*) context)->client; rdpChannels* channels = context->channels; rdpBitmap* bitmap; + rdpGlyph* glyph; + rdpPointer* pointer; /* Set up bitmap handling */ bitmap = xnew(rdpBitmap); @@ -77,9 +81,25 @@ boolean rdp_freerdp_pre_connect(freerdp* instance) { bitmap->Free = guac_rdp_bitmap_free; bitmap->Paint = guac_rdp_bitmap_paint; /* bitmap->Decompress = guac_rdp_bitmap_decompress; */ - /* bitmap->SetSurface = guac_rdp_bitmap_setsurface; */ + bitmap->SetSurface = guac_rdp_bitmap_setsurface; graphics_register_bitmap(context->graphics, bitmap); + /* Set up glyph handling */ + glyph = xnew(rdpGlyph); + glyph->size = sizeof(guac_rdp_glyph); + glyph->New = guac_rdp_glyph_new; + glyph->Free = guac_rdp_glyph_free; + glyph->Draw = guac_rdp_glyph_draw; + graphics_register_glyph(context->graphics, glyph); + + /* Set up pointer handling */ + pointer = xnew(rdpPointer); + pointer->size = sizeof(guac_rdp_pointer); + pointer->New = guac_rdp_pointer_new; + pointer->Free = guac_rdp_pointer_free; + pointer->Set = guac_rdp_pointer_set; + graphics_register_pointer(context->graphics, pointer); + /* Init channels (pre-connect) */ if (freerdp_channels_pre_connect(channels, instance)) { guac_protocol_send_error(client->socket, "Error initializing RDP client channel manager"); diff --git a/src/rdp_bitmap.c b/src/rdp_bitmap.c index 8be3b98..5aede7b 100644 --- a/src/rdp_bitmap.c +++ b/src/rdp_bitmap.c @@ -121,3 +121,8 @@ void guac_rdp_bitmap_free(rdpContext* context, rdpBitmap* bitmap) { } +void guac_rdp_bitmap_setsurface(rdpContext* context, rdpBitmap* bitmap, boolean primary) { + guac_client* client = ((rdp_freerdp_context*) context)->client; + guac_client_log_info(client, "guac_rdp_bitmap_setsurface()"); +} + -- 1.7.10.4