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

Fix checks for input flags:

Browse Source 
The settings have double meaning:
* Setting the default in client preconnect callback can disable
  announcement of a flag to the server regardless of support
* If set it is overridden with the value the server supports
This commit is contained in:
Armin Novak 2022-01-12 14:20:28 +01:00 committed by akallabeth
parent 70a689787d
commit 33f87e3349
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libfreerdp/core/capabilities.c
View File

@ -1294,23 +1294,16 @@ static BOOL rdp_read_input_capability_set(wStream* s, rdpSettings* settings)
settings->FastPathInput = FALSE;
}
/* Note: These settings have split functionality:
* 1. If disabled in client pre_connect, it can disable announcing the feature
* 2. If enabled in client pre_connect, override it with the server announced support flag.
*/
if (settings->HasHorizontalWheel)
{
if (inputFlags & TS_INPUT_FLAG_MOUSE_HWHEEL)
settings->HasHorizontalWheel = TRUE;
}
settings->HasHorizontalWheel = (inputFlags & TS_INPUT_FLAG_MOUSE_HWHEEL) ? TRUE : FALSE;
if (settings->UnicodeInput)
{
if (inputFlags & INPUT_FLAG_UNICODE)
settings->UnicodeInput = TRUE;
}
settings->UnicodeInput = (inputFlags & INPUT_FLAG_UNICODE) ? TRUE : FALSE;
if (settings->HasExtendedMouseEvent)
{
if (inputFlags & INPUT_FLAG_MOUSEX)
settings->HasExtendedMouseEvent = TRUE;
}
settings->HasExtendedMouseEvent = (inputFlags & INPUT_FLAG_MOUSEX) ? TRUE : FALSE;
}
return TRUE;