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

Merge pull request #5134 from oshogbo/master

Browse Source 
Respect settings while sending the input capabilities.
This commit is contained in:
Martin Fleisz 2018-12-11 14:40:58 +01:00 committed by GitHub
commit 4dac07667c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libfreerdp/core/capabilities.c
View File

@ -1309,8 +1309,7 @@ static BOOL rdp_write_input_capability_set(wStream* s, rdpSettings* settings)
return FALSE;
header = rdp_capability_set_start(s);
inputFlags = INPUT_FLAG_SCANCODES | INPUT_FLAG_MOUSEX | INPUT_FLAG_UNICODE |
TS_INPUT_FLAG_MOUSE_HWHEEL;
inputFlags = INPUT_FLAG_SCANCODES;
if (settings->FastPathInput)
{
@ -1318,6 +1317,15 @@ static BOOL rdp_write_input_capability_set(wStream* s, rdpSettings* settings)
inputFlags |= INPUT_FLAG_FASTPATH_INPUT2;
}
if (settings->HasHorizontalWheel)
inputFlags |= TS_INPUT_FLAG_MOUSE_HWHEEL;
if (settings->UnicodeInput)
inputFlags |= INPUT_FLAG_UNICODE;
if (settings->HasExtendedMouseEvent)
inputFlags |= INPUT_FLAG_MOUSEX;
Stream_Write_UINT16(s, inputFlags); /* inputFlags (2 bytes) */
Stream_Write_UINT16(s, 0); /* pad2OctetsA (2 bytes) */
Stream_Write_UINT32(s, settings->KeyboardLayout); /* keyboardLayout (4 bytes) */