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

libfreerdp-core/fastpath: add --fastpath argument and trivial naming cleanup.

Browse Source
This commit is contained in:
Vic Lee 2011-08-13 13:35:58 +08:00
parent b64bcecb75
commit aa35cb4ae3
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/freerdp/settings.h
View File

@ -232,7 +232,8 @@ struct rdp_settings
boolean color_pointer;
boolean sound_beeps;
boolean fast_path_input;
boolean fastpath_input;
boolean fastpath_output;
boolean offscreen_bitmap_cache;
uint16 offscreen_bitmap_cache_size;

9
libfreerdp-core/capabilities.c
View File

@ -136,7 +136,7 @@ void rdp_write_general_capability_set(STREAM* s, rdpSettings* settings)
if (settings->auto_reconnection)
extraFlags |= AUTORECONNECT_SUPPORTED;
if (settings->fast_path_input)
if (settings->fastpath_output)
extraFlags |= FASTPATH_OUTPUT_SUPPORTED;
stream_write_uint16(s, 0); /* osMajorType (2 bytes) */
@ -613,10 +613,9 @@ void rdp_read_input_capability_set(STREAM* s, rdpSettings* settings)
stream_read_uint32(s, settings->kbd_fn_keys); /* keyboardFunctionKeys (4 bytes) */
stream_seek(s, 64); /* imeFileName (64 bytes) */
if ((inputFlags & INPUT_FLAG_FASTPATH_INPUT) || (inputFlags & INPUT_FLAG_FASTPATH_INPUT2))
if ((inputFlags & INPUT_FLAG_FASTPATH_INPUT) == 0 && (inputFlags & INPUT_FLAG_FASTPATH_INPUT2) == 0)
{
if (settings->fast_path_input != False)
settings->fast_path_input = True;
settings->fastpath_input = False;
}
}
@ -636,7 +635,7 @@ void rdp_write_input_capability_set(STREAM* s, rdpSettings* settings)
inputFlags = INPUT_FLAG_SCANCODES | INPUT_FLAG_MOUSEX | INPUT_FLAG_UNICODE;
if (settings->fast_path_input)
if (settings->fastpath_input)
{
inputFlags |= INPUT_FLAG_FASTPATH_INPUT;
inputFlags |= INPUT_FLAG_FASTPATH_INPUT2;

7
libfreerdp-utils/args.c
View File

@ -173,10 +173,15 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
{
settings->offscreen_bitmap_cache = 0;
}
else if (strcmp("-fastpath", argv[index]) == 0)
{
settings->fastpath_input = True;
settings->fastpath_output = True;
}
else if (strcmp("--rfx", argv[index]) == 0)
{
settings->rfx_decode = True;
settings->fast_path_input = True;
settings->fastpath_output = True;
settings->color_depth = 32;
settings->frame_acknowledge = False;
settings->performance_flags = PERF_FLAG_NONE;