Added missing brace...

[libguac-client-rdp.git] / src / rdp_gdi.c

diff --git a/src/rdp_gdi.c b/src/rdp_gdi.c
index 0b1300e..bedfc80 100644 (file)
--- a/src/rdp_gdi.c
+++ b/src/rdp_gdi.c
@@ -20,6 +20,7 @@
  * 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
@@ -48,21 +49,47 @@ guac_transfer_function guac_rdp_rop3_transfer_function(guac_client* client,
     /* Translate supported ROP3 opcodes into composite modes */
     switch (rop3) {
 
+        /* "DSon" !(src | dest) */
+        case 0x11: return GUAC_TRANSFER_BINARY_NOR;
+
+        /* "DSna" !src & dest */
+        case 0x22: return GUAC_TRANSFER_BINARY_NSRC_AND;
+
+        /* "Sn" !src */
+        case 0x33: return GUAC_TRANSFER_BINARY_NSRC;
+
+        /* "SDna" (src & !dest) */
+        case 0x44: return GUAC_TRANSFER_BINARY_NDEST_AND;
+
+        /* "Dn" !dest */
+        case 0x55: return GUAC_TRANSFER_BINARY_NDEST;
+
         /* "SRCINVERT" (src ^ dest) */
-        case 0x66: return GUAC_TRANSFER_BINARY_SRC;
+        case 0x66: return GUAC_TRANSFER_BINARY_XOR;
+
+        /* "DSan" !(src & dest) */
+        case 0x77: return GUAC_TRANSFER_BINARY_NAND;
 
         /* "SRCAND" (src & dest) */
         case 0x88: return GUAC_TRANSFER_BINARY_AND;
 
-        /* "MERGEPAINT" !(src | dest)*/
-        case 0xBB: return GUAC_TRANSFER_BINARY_NOR;
+        /* "DSxn" !(src ^ dest) */
+        case 0x99: return GUAC_TRANSFER_BINARY_XNOR;
+
+        /* "MERGEPAINT" (!src | dest)*/
+        case 0xBB: return GUAC_TRANSFER_BINARY_NSRC_OR;
 
-        /* "SRCCOPY" (src) */
-        case 0xCC: return GUAC_TRANSFER_BINARY_SRC;
+        /* "SDno" (src | !dest) */
+        case 0xDD: return GUAC_TRANSFER_BINARY_NDEST_OR;
 
         /* "SRCPAINT" (src | dest) */
         case 0xEE: return GUAC_TRANSFER_BINARY_OR;
 
+        /* 0x00 = "BLACKNESS" (0) */
+        /* 0xAA = "NOP" (dest) */
+        /* 0xCC = "SRCCOPY" (src) */
+        /* 0xFF = "WHITENESS" (1) */
+
     }
 
     /* Log warning if ROP3 opcode not supported */
@@ -131,17 +158,42 @@ void guac_rdp_gdi_memblt(rdpContext* context, MEMBLT_ORDER* memblt) {
 
     if (bitmap->layer != NULL) {
 
+        switch (memblt->bRop) {
+
+        /* If blackness, send black rectangle */
+        case 0x00:
+            guac_protocol_send_rect(client->socket,
+                    GUAC_COMP_OVER, current_layer,
+                    memblt->nLeftRect, memblt->nTopRect,
+                    memblt->nWidth, memblt->nHeight,
+                    0x00, 0x00, 0x00, 0xFF);
+            break;
+
+        /* If NOP, do nothing */
+        case 0xAA:
+            break;
+
         /* If operation is just SRC, simply copy */
-        if (memblt->bRop == 0xCC)
+        case 0xCC: 
             guac_protocol_send_copy(socket,
                     bitmap->layer,
                     memblt->nXSrc, memblt->nYSrc,
                     memblt->nWidth, memblt->nHeight,
                     GUAC_COMP_OVER,
                     current_layer, memblt->nLeftRect, memblt->nTopRect);
+            break;
+
+        /* If whiteness, send white rectangle */
+        case 0xFF:
+            guac_protocol_send_rect(client->socket,
+                    GUAC_COMP_OVER, current_layer,
+                    memblt->nLeftRect, memblt->nTopRect,
+                    memblt->nWidth, memblt->nHeight,
+                    0xFF, 0xFF, 0xFF, 0xFF);
+            break;
 
         /* Otherwise, use transfer */
-        else
+        default:
             guac_protocol_send_transfer(socket,
                     bitmap->layer,
                     memblt->nXSrc, memblt->nYSrc,
@@ -149,7 +201,9 @@ void guac_rdp_gdi_memblt(rdpContext* context, MEMBLT_ORDER* memblt) {
                     guac_rdp_rop3_transfer_function(client, memblt->bRop),
                     current_layer, memblt->nLeftRect, memblt->nTopRect);
 
-    }
+        }
+
+    } /* end if layer not NULL */
 
 }