libfreerdp-core: fix offscreen cache capabilities, add --composition option

This commit is contained in:
Marc-André Moreau 2011-12-12 19:20:52 -05:00
parent f8a4b21979
commit 243090323d
3 changed files with 9 additions and 3 deletions

View File

@ -399,8 +399,6 @@ static boolean bitmap_decompress4(uint8* srcData, uint8* dstData, int width, int
*/
boolean bitmap_decompress(uint8* srcData, uint8* dstData, int width, int height, int size, int srcBpp, int dstBpp)
{
uint8* data;
if (srcBpp == 16 && dstBpp == 16)
{
RleDecompress16to16(srcData, size, dstData, width * 2, width, height);

View File

@ -874,7 +874,7 @@ void rdp_write_offscreen_bitmap_cache_capability_set(STREAM* s, rdpSettings* set
if (settings->offscreen_bitmap_cache)
offscreenSupportLevel = true;
stream_read_uint32(s, offscreenSupportLevel); /* offscreenSupportLevel (4 bytes) */
stream_write_uint32(s, offscreenSupportLevel); /* offscreenSupportLevel (4 bytes) */
stream_write_uint16(s, settings->offscreen_bitmap_cache_size); /* offscreenCacheSize (2 bytes) */
stream_write_uint16(s, settings->offscreen_bitmap_cache_entries); /* offscreenCacheEntries (2 bytes) */

View File

@ -89,6 +89,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
" --rfx: enable RemoteFX\n"
" --rfx-mode: RemoteFX operational flags (v[ideo], i[mage]), default is video\n"
" --nsc: enable NSCodec (experimental)\n"
" --composition: enable desktop composition\n"
" --no-rdp: disable Standard RDP encryption\n"
" --no-tls: disable TLS encryption\n"
" --no-nla: disable network level authentication\n"
@ -387,6 +388,10 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
{
settings->smooth_fonts = true;
}
else if (strcmp("--composition", argv[index]) == 0)
{
settings->desktop_composition = true;
}
else if (strcmp("--no-motion", argv[index]) == 0)
{
settings->mouse_motion = false;
@ -606,6 +611,9 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
if (settings->smooth_fonts)
settings->performance_flags |= PERF_ENABLE_FONT_SMOOTHING;
if (settings->desktop_composition)
settings->performance_flags |= PERF_ENABLE_DESKTOP_COMPOSITION;
return index;
}
else