From 6f059097cdb5e38fc1b3873437abccbc3e6d513f Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sun, 8 Jan 2012 19:23:37 -0800 Subject: [PATCH] Added BeginDraw and EndDraw stubs of glyph rendering. --- protocols/rdp/include/rdp_glyph.h | 4 ++++ protocols/rdp/src/client.c | 2 ++ protocols/rdp/src/rdp_glyph.c | 12 ++++++++++++ 3 files changed, 18 insertions(+) diff --git a/protocols/rdp/include/rdp_glyph.h b/protocols/rdp/include/rdp_glyph.h index 41ceb422..2ba6af42 100644 --- a/protocols/rdp/include/rdp_glyph.h +++ b/protocols/rdp/include/rdp_glyph.h @@ -59,5 +59,9 @@ typedef struct 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); +void guac_rdp_glyph_begindraw(rdpContext* context, + int x, int y, int width, int height, uint32 bgcolor, uint32 fgcolor); +void guac_rdp_glyph_enddraw(rdpContext* context, + int x, int y, int width, int height, uint32 bgcolor, uint32 fgcolor); #endif diff --git a/protocols/rdp/src/client.c b/protocols/rdp/src/client.c index b3574032..c9e23a36 100644 --- a/protocols/rdp/src/client.c +++ b/protocols/rdp/src/client.c @@ -108,6 +108,8 @@ boolean rdp_freerdp_pre_connect(freerdp* instance) { 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); /* Set up pointer handling */ diff --git a/protocols/rdp/src/rdp_glyph.c b/protocols/rdp/src/rdp_glyph.c index 07d01f52..bfb311ad 100644 --- a/protocols/rdp/src/rdp_glyph.c +++ b/protocols/rdp/src/rdp_glyph.c @@ -57,3 +57,15 @@ void guac_rdp_glyph_free(rdpContext* context, rdpGlyph* glyph) { guac_client_log_info(client, "guac_rdp_glyph_free()"); } +void guac_rdp_glyph_begindraw(rdpContext* context, + int x, int y, int width, int height, uint32 bgcolor, uint32 fgcolor) { + guac_client* client = ((rdp_freerdp_context*) context)->client; + guac_client_log_info(client, "guac_rdp_glyph_begindraw()"); +} + +void guac_rdp_glyph_enddraw(rdpContext* context, + int x, int y, int width, int height, uint32 bgcolor, uint32 fgcolor) { + guac_client* client = ((rdp_freerdp_context*) context)->client; + guac_client_log_info(client, "guac_rdp_glyph_enddraw()"); +} +