Fix horizontal scrolling direction and capability detection

This commit is contained in:
Binyamin Sagal 2015-12-14 21:48:31 +02:00
parent a5db7117c8
commit 23fea1615f
2 changed files with 5 additions and 4 deletions

View File

@ -349,13 +349,13 @@ BOOL xf_generic_ButtonPress(xfContext* xfc, int x, int y, int button, Window win
case 6: /* wheel left */
wheel = TRUE;
if (xfc->settings->HasHorizontalWheel)
flags = PTR_FLAGS_HWHEEL | 0x0078;
flags = PTR_FLAGS_HWHEEL | PTR_FLAGS_WHEEL_NEGATIVE | 0x0078;
break;
case 7: /* wheel right */
wheel = TRUE;
if (xfc->settings->HasHorizontalWheel)
flags = PTR_FLAGS_HWHEEL | PTR_FLAGS_WHEEL_NEGATIVE | 0x0078;
flags = PTR_FLAGS_HWHEEL | 0x0078;
break;
default:

View File

@ -1236,13 +1236,14 @@ BOOL rdp_read_input_capability_set(wStream* s, UINT16 length, rdpSettings* setti
{
/* advertised by RDP 5.2, 6.0, 6.1 and 7.0 servers */
}
else if (inputFlags & TS_INPUT_FLAG_MOUSE_HWHEEL)
settings->HasHorizontalWheel = TRUE;
else
{
/* server does not support fastpath input */
settings->FastPathInput = FALSE;
}
if (inputFlags & TS_INPUT_FLAG_MOUSE_HWHEEL) {
settings->HasHorizontalWheel = TRUE;
}
}
return TRUE;
}