Fixed stub, added rudimentary mouse support, support for clip, coloring of text.

diff --git a/include/rdp_client.h b/include/rdp_client.h
index dae6065..10e6a78 100644 (file)
--- a/include/rdp_client.h
+++ b/include/rdp_client.h
@@ -46,16 +46,28 @@
 
 #define RDP_DEFAULT_PORT 3389
 
+typedef struct guac_rdp_color {
+    int red;
+    int green;
+    int blue;
+} guac_rdp_color;
+
 typedef struct rdp_guac_client_data {
 
     rdpInst* rdp_inst;
     rdpChanMan* chanman;
        rdpSet* settings;
 
+    int mouse_button_mask;
+
+    guac_rdp_color foreground;
+    guac_rdp_color background;
+
 } rdp_guac_client_data;
 
 int rdp_guac_client_free_handler(guac_client* client);
 int rdp_guac_client_handle_messages(guac_client* client);
+int rdp_guac_client_mouse_handler(guac_client* client, int x, int y, int mask);
 
 #endif
 

diff --git a/src/rdp_client.c b/src/rdp_client.c
index a0b1d8b..6861c94 100644 (file)
--- a/src/rdp_client.c
+++ b/src/rdp_client.c
@@ -43,6 +43,7 @@
 
 #include <freerdp/freerdp.h>
 #include <freerdp/chanman.h>
+#include <freerdp/constants_ui.h>
 
 #include <guacamole/log.h>
 #include <guacamole/guacio.h>
@@ -228,6 +229,7 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
         return 1;
     }
     guac_client_data->rdp_inst = rdp_inst;
+    guac_client_data->mouse_button_mask = 0;
 
     /* Store client data */
     rdp_inst->param1 = client;
@@ -302,9 +304,34 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
     /* Client handlers */
     client->free_handler = rdp_guac_client_free_handler;
     client->handle_messages = rdp_guac_client_handle_messages;
+    client->mouse_handler = rdp_guac_client_mouse_handler;
 
     /* Success */
     return 0;
 
 }
 
+int rdp_guac_client_mouse_handler(guac_client* client, int x, int y, int mask) {
+
+    rdp_guac_client_data* guac_client_data = (rdp_guac_client_data*) client->data;
+    rdpInst* rdp_inst = guac_client_data->rdp_inst;
+
+    /* If no buttons pressed */
+    if (mask == 0) {
+
+        /* Send mouse move event if no buttons pressed before */
+        if (guac_client_data->mouse_button_mask == 0)
+            rdp_inst->rdp_send_input(rdp_inst, RDP_INPUT_MOUSE, PTRFLAGS_MOVE, x, y);
+
+        /* Otherwise, send mouse up event, releasing any old buttons */
+        else
+            rdp_inst->rdp_send_input(rdp_inst, RDP_INPUT_MOUSE, PTRFLAGS_BUTTON1, x, y);
+    }
+
+    /* Otherwise, send mouse down event */
+    else
+        rdp_inst->rdp_send_input(rdp_inst, RDP_INPUT_MOUSE, PTRFLAGS_DOWN | PTRFLAGS_BUTTON1, x, y);
+
+    guac_client_data->mouse_button_mask = mask;
+    return 0;
+}

diff --git a/src/rdp_handlers.c b/src/rdp_handlers.c
index 01e5ace..9e5e767 100644 (file)
--- a/src/rdp_handlers.c
+++ b/src/rdp_handlers.c
@@ -48,6 +48,32 @@
 #include <freerdp/freerdp.h>
 
 #include "rdp_handlers.h"
+#include "rdp_client.h"
+
+
+void guac_rdp_convert_color(int depth, int color, guac_rdp_color* comp) {
+
+    switch (depth) {
+
+        case 24:
+            comp->red   = (color >> 16) & 0xFF;
+            comp->green = (color >>  8) & 0xFF;
+            comp->blue  = (color      ) & 0xFF;
+            break;
+
+        case 16:
+            comp->red   = ((color >> 8) & 0xF8) | ((color >> 13) & 0x07);
+            comp->green = ((color >> 3) & 0xFC) | ((color >>  9) & 0x03);
+            comp->blue  = ((color << 3) & 0xF8) | ((color >>  2) & 0x07);
+            break;
+
+        default: /* The Magenta of Failure */
+            comp->red   = 0xFF;
+            comp->green = 0x00;
+            comp->blue  = 0xFF;
+    }
+
+}
 
 void guac_rdp_ui_error(rdpInst* inst, const char* text) {
 
@@ -221,28 +247,51 @@ void guac_rdp_ui_ellipse(rdpInst* inst, uint8 opcode, uint8 fillmode, int x, int
 }
 
 void guac_rdp_ui_start_draw_glyphs(rdpInst* inst, int bgcolor, int fgcolor) {
-    /* UNUSED ... for now */
+
+    guac_client* client = (guac_client*) inst->param1;
+    rdp_guac_client_data* guac_client_data = (rdp_guac_client_data*) client->data;
+
+    guac_rdp_convert_color(
+            inst->settings->server_depth,
+            bgcolor,
+            &(guac_client_data->background));
+
+    guac_rdp_convert_color(
+            inst->settings->server_depth,
+            fgcolor,
+            &(guac_client_data->foreground));
+
 }
 
 void guac_rdp_ui_draw_glyph(rdpInst* inst, int x, int y, int width, int height, RD_HGLYPH glyph) {
 
     guac_client* client = (guac_client*) inst->param1;
+    rdp_guac_client_data* guac_client_data = (rdp_guac_client_data*) client->data;
     GUACIO* io = client->io;
 
+    /* NOTE: Originally: Stencil=SRC, FG=ATOP, BG=RATOP */
+    /* Temporarily removed BG drawing... */
+
     /* Stencil */
     guac_send_copy(io,
             (guac_layer*) glyph, 0, 0, width, height,
-            GUAC_COMP_SRC, GUAC_DEFAULT_LAYER, x, y);
+            GUAC_COMP_ROUT, GUAC_DEFAULT_LAYER, x, y);
 
     /* Foreground */
-    guac_send_rect(io, GUAC_COMP_ATOP, GUAC_DEFAULT_LAYER,
+    guac_send_rect(io, GUAC_COMP_RATOP, GUAC_DEFAULT_LAYER,
             x, y, width, height,
-            0, 255, 0, 255);
+            guac_client_data->foreground.red,
+            guac_client_data->foreground.green,
+            guac_client_data->foreground.blue,
+            255);
 
     /* Background */
-    guac_send_rect(io, GUAC_COMP_RATOP, GUAC_DEFAULT_LAYER,
+    /*guac_send_rect(io, GUAC_COMP_RATOP, GUAC_DEFAULT_LAYER,
             x, y, width, height,
-            255, 0, 0, 255);
+            guac_client_data->background.red,
+            guac_client_data->background.green,
+            guac_client_data->background.blue,
+            255);*/
 
 }
 
@@ -276,8 +325,9 @@ void guac_rdp_ui_memblt(rdpInst* inst, uint8 opcode, int x, int y, int width, in
     guac_client* client = (guac_client*) inst->param1;
     GUACIO* io = client->io;
 
-    guac_log_info("guac_rdp_ui_memblt: opcode=%i, index=%i\n", opcode,
-            ((guac_layer*) src)->index);
+    if (opcode != 204)
+        guac_log_info("guac_rdp_ui_memblt: opcode=%i, index=%i\n", opcode,
+                ((guac_layer*) src)->index);
 
     guac_send_copy(io,
             (guac_layer*) src, srcx, srcy, width, height,
@@ -364,11 +414,21 @@ int guac_rdp_ui_select(rdpInst* inst, int rdp_socket) {
 }
 
 void guac_rdp_ui_set_clip(rdpInst* inst, int x, int y, int cx, int cy) {
-    guac_log_info("guac_rdp_ui_set_clip: STUB\n");
+
+    guac_client* client = (guac_client*) inst->param1;
+    GUACIO* io = client->io;
+
+    guac_send_clip(io, GUAC_DEFAULT_LAYER, x, y, cx, cy);
+
 }
 
 void guac_rdp_ui_reset_clip(rdpInst* inst) {
-    guac_log_info("guac_rdp_ui_reset_clip: STUB\n");
+
+    guac_client* client = (guac_client*) inst->param1;
+    GUACIO* io = client->io;
+
+    guac_send_clip(io, GUAC_DEFAULT_LAYER, 0, 0, inst->settings->width, inst->settings->height);
+
 }
 
 void guac_rdp_ui_resize_window(rdpInst* inst) {
@@ -384,8 +444,11 @@ void guac_rdp_ui_destroy_cursor(rdpInst* inst, RD_HCURSOR cursor) {
 }
 
 RD_HCURSOR guac_rdp_ui_create_cursor(rdpInst* inst, unsigned int x, unsigned int y, int width, int height, uint8* andmask, uint8* xormask, int bpp) {
+    
+    guac_client* client = (guac_client*) inst->param1;
     guac_log_info("guac_rdp_ui_create_cursor: STUB\n");
-    return NULL;
+    return guac_client_alloc_buffer(client);
+
 }
 
 void guac_rdp_ui_set_null_cursor(rdpInst* inst) {