diff options
Diffstat (limited to 'libfreerdp-gdi/decode.c')
-rw-r--r-- | libfreerdp-gdi/decode.c | 51 |
1 files changed, 42 insertions, 9 deletions
diff --git a/libfreerdp-gdi/decode.c b/libfreerdp-gdi/decode.c index 1c1ad75..9f3f4c0 100644 --- a/libfreerdp-gdi/decode.c +++ b/libfreerdp-gdi/decode.c @@ -32,7 +32,8 @@ int gdi_decode_bitmap_data_ex(GDI *gdi, uint16 x, uint16 y, uint8 * data, int size) { - int i, tx, ty; + int i, j; + int tx, ty; uint8* bitmapData; uint32 bitmapDataLength; RFX_MESSAGE * message; @@ -50,17 +51,49 @@ int gdi_decode_bitmap_data_ex(GDI *gdi, uint16 x, uint16 y, uint8 * data, int si /* decode bitmap data */ message = rfx_process_message((RFX_CONTEXT *) gdi->rfx_context, bitmapData, bitmapDataLength); - /* blit each tile */ - for (i = 0; i < message->num_tiles; i++) + if (message->num_rects > 1) /* RDVH */ { - tx = message->tiles[i]->x + x; - ty = message->tiles[i]->y + y; - data = message->tiles[i]->data; + /* blit each tile */ + for (i = 0; i < message->num_tiles; i++) + { + tx = message->tiles[i]->x + x; + ty = message->tiles[i]->y + y; + data = message->tiles[i]->data; + + gdi_image_convert(data, gdi->tile->bitmap->data, 64, 64, 32, 32, gdi->clrconv); - gdi_image_convert(data, gdi->tile->bitmap->data, 64, 64, 32, 32, gdi->clrconv); - gdi_BitBlt(gdi->primary->hdc, tx, ty, 64, 64, gdi->tile->hdc, 0, 0, GDI_SRCCOPY); + for (j = 0; j < message->num_rects; j++) + { + gdi_SetClipRgn(gdi->primary->hdc, + message->rects[j].x, message->rects[j].y, + message->rects[j].width, message->rects[j].height); + + gdi_BitBlt(gdi->primary->hdc, tx, ty, 64, 64, gdi->tile->hdc, 0, 0, GDI_SRCCOPY); + } + } - gdi_InvalidateRegion(gdi->primary->hdc, tx, ty, 64, 64); + for (i = 0; i < message->num_rects; i++) + { + gdi_InvalidateRegion(gdi->primary->hdc, + message->rects[i].x, message->rects[i].y, + message->rects[i].width, message->rects[i].height); + } + } + else /* RDSH */ + { + /* blit each tile */ + for (i = 0; i < message->num_tiles; i++) + { + tx = message->tiles[i]->x + x; + ty = message->tiles[i]->y + y; + data = message->tiles[i]->data; + + gdi_image_convert(data, gdi->tile->bitmap->data, 64, 64, 32, 32, gdi->clrconv); + + gdi_BitBlt(gdi->primary->hdc, tx, ty, 64, 64, gdi->tile->hdc, 0, 0, GDI_SRCCOPY); + + gdi_InvalidateRegion(gdi->primary->hdc, tx, ty, 64, 64); + } } rfx_message_free(gdi->rfx_context, message); |