freerdp: add /multitouch option

This commit is contained in:
Marc-André Moreau 2013-05-08 22:14:16 -04:00
parent 91a55ae741
commit 99c821357d
3 changed files with 22 additions and 1 deletions

View File

@ -89,6 +89,7 @@ COMMAND_LINE_ARGUMENT_A args[] =
{ "smartcard", COMMAND_LINE_VALUE_REQUIRED, NULL, NULL, NULL, -1, NULL, "Redirect smartcard device" }, { "smartcard", COMMAND_LINE_VALUE_REQUIRED, NULL, NULL, NULL, -1, NULL, "Redirect smartcard device" },
{ "printer", COMMAND_LINE_VALUE_REQUIRED, NULL, NULL, NULL, -1, NULL, "Redirect printer device" }, { "printer", COMMAND_LINE_VALUE_REQUIRED, NULL, NULL, NULL, -1, NULL, "Redirect printer device" },
{ "usb", COMMAND_LINE_VALUE_REQUIRED, NULL, NULL, NULL, -1, NULL, "Redirect USB device" }, { "usb", COMMAND_LINE_VALUE_REQUIRED, NULL, NULL, NULL, -1, NULL, "Redirect USB device" },
{ "multitouch", COMMAND_LINE_VALUE_BOOL, NULL, BoolValueFalse, NULL, -1, NULL, "Redirect multitouch input" },
{ "echo", COMMAND_LINE_VALUE_FLAG, NULL, NULL, NULL, -1, "echo", "Echo channel" }, { "echo", COMMAND_LINE_VALUE_FLAG, NULL, NULL, NULL, -1, "echo", "Echo channel" },
{ "fonts", COMMAND_LINE_VALUE_BOOL, NULL, BoolValueFalse, NULL, -1, NULL, "Smooth fonts (ClearType)" }, { "fonts", COMMAND_LINE_VALUE_BOOL, NULL, BoolValueFalse, NULL, -1, NULL, "Smooth fonts (ClearType)" },
{ "aero", COMMAND_LINE_VALUE_BOOL, NULL, NULL, BoolValueFalse, -1, NULL, "Desktop composition" }, { "aero", COMMAND_LINE_VALUE_BOOL, NULL, NULL, BoolValueFalse, -1, NULL, "Desktop composition" },
@ -568,6 +569,16 @@ int freerdp_client_command_line_post_filter(void* context, COMMAND_LINE_ARGUMENT
free(p); free(p);
} }
CommandLineSwitchCase(arg, "multitouch")
{
char* p[1];
int count = 1;
settings->MultiTouchInput = TRUE;
p[0] = "rdpei";
freerdp_client_add_dynamic_channel(settings, count, p);
}
CommandLineSwitchCase(arg, "echo") CommandLineSwitchCase(arg, "echo")
{ {
char* p[1]; char* p[1];

View File

@ -675,6 +675,7 @@ typedef struct _RDPDR_PARALLEL RDPDR_PARALLEL;
#define FreeRDP_ImeFileName 2628 #define FreeRDP_ImeFileName 2628
#define FreeRDP_UnicodeInput 2629 #define FreeRDP_UnicodeInput 2629
#define FreeRDP_FastPathInput 2630 #define FreeRDP_FastPathInput 2630
#define FreeRDP_MultiTouchInput 2631
#define FreeRDP_BrushSupportLevel 2688 #define FreeRDP_BrushSupportLevel 2688
#define FreeRDP_GlyphSupportLevel 2752 #define FreeRDP_GlyphSupportLevel 2752
#define FreeRDP_GlyphCache 2753 #define FreeRDP_GlyphCache 2753
@ -1097,7 +1098,8 @@ struct rdp_settings
ALIGN64 char* ImeFileName; /* 2628 */ ALIGN64 char* ImeFileName; /* 2628 */
ALIGN64 BOOL UnicodeInput; /* 2629 */ ALIGN64 BOOL UnicodeInput; /* 2629 */
ALIGN64 BOOL FastPathInput; /* 2630 */ ALIGN64 BOOL FastPathInput; /* 2630 */
UINT64 padding2688[2688 - 2631]; /* 2631 */ ALIGN64 BOOL MultiTouchInput; /* 2631 */
UINT64 padding2688[2688 - 2632]; /* 2632 */
/* Brush Capabilities */ /* Brush Capabilities */
ALIGN64 UINT32 BrushSupportLevel; /* 2688 */ ALIGN64 UINT32 BrushSupportLevel; /* 2688 */

View File

@ -645,6 +645,10 @@ BOOL freerdp_get_param_bool(rdpSettings* settings, int id)
return settings->FastPathInput; return settings->FastPathInput;
break; break;
case FreeRDP_MultiTouchInput:
return settings->MultiTouchInput;
break;
case FreeRDP_SoundBeepsEnabled: case FreeRDP_SoundBeepsEnabled:
return settings->SoundBeepsEnabled; return settings->SoundBeepsEnabled;
break; break;
@ -1081,6 +1085,10 @@ int freerdp_set_param_bool(rdpSettings* settings, int id, BOOL param)
settings->FastPathInput = param; settings->FastPathInput = param;
break; break;
case FreeRDP_MultiTouchInput:
settings->MultiTouchInput = param;
break;
case FreeRDP_SoundBeepsEnabled: case FreeRDP_SoundBeepsEnabled:
settings->SoundBeepsEnabled = param; settings->SoundBeepsEnabled = param;
break; break;