mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xfreerdp: xfc->palette wasn't updated with /gdi:sw

Browse Source 
When using software gdi (/gdi:sw) the rdp update PDU callback
gdi_palette_update() is used which writes the new colors to
the rdpContext's gdi->palette buffer.
The X11 functions however access xfc->palette which gets only
updated by xf_gdi_palette_update() which is the callback if
/gdi:hw is used.

This commit changes xfc->palette to a pointer which points to
xfc's private buffer with /gdi:hw or to the gdi->palette if
software gdi is used.
This commit is contained in:
Norbert Federa 2015-06-11 18:40:41 +02:00
parent 20aa10e6ae
commit f04bb6c53d
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/X11/xf_client.c
View File

@ -1093,9 +1093,11 @@ BOOL xf_post_connect(freerdp* instance)
gdi = context->gdi;
xfc->primary_buffer = gdi->primary_buffer;
xfc->palette = gdi->palette;
}
else
{
xfc->palette = xfc->palette_hwgdi;
xfc->srcBpp = settings->ColorDepth;
xf_gdi_register_update_callbacks(update);
}

3
client/X11/xfreerdp.h
View File

@ -127,7 +127,8 @@ struct xf_context
HANDLE mutex;
BOOL UseXThreads;
BOOL cursorHidden;
BYTE palette[256 * 4];
BYTE* palette;
BYTE palette_hwgdi[256 * 4];
HGDI_DC hdc;
UINT32 bitmap_size;