ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-02-02 07:40:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

[X11] Check before using motion/scroll valuators

Browse source 
These valuators are not available on all systems. We now check
explicitly for support, instead of returning invalid results.

Additionally, unknown valuator names are now printed to the
debug log.
This commit is contained in:
thefiddler 2014-08-09 21:47:09 +02:00
parent 073ddf1bef
commit a3e47a2431
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Source/OpenTK/Platform/X11/XI2MouseKeyboard.cs
View file

@ -402,6 +402,13 @@ namespace OpenTK.Platform.X11
Debug.WriteLine("\tRelative Y movement");
d.MotionY = *valuator;
}
else
{
IntPtr label = Functions.XGetAtomName(window.Display, valuator->label);
Debug.Print("\tUnknown valuator {0}",
Marshal.PtrToStringAnsi(label));
Functions.XFree(label);
}
}
break;
}
@ -555,10 +562,18 @@ namespace OpenTK.Platform.X11
{
// Note: we use the raw values here, without pointer
// ballistics and any other modification.
double x = ReadRawValue(ref raw, d.MotionX.number);
double y = ReadRawValue(ref raw, d.MotionY.number);
double h = ReadRawValue(ref raw, d.ScrollX.number) / d.ScrollX.increment;
double v = ReadRawValue(ref raw, d.ScrollY.number) / d.ScrollY.increment;
double x = 0;
double y = 0;
double h = 0;
double v = 0;
if (d.MotionX.number != -1)
x = ReadRawValue(ref raw, d.MotionX.number);
if (d.MotionY.number != -1)
y = ReadRawValue(ref raw, d.MotionY.number);
if (d.ScrollX.number != -1)
h = ReadRawValue(ref raw, d.ScrollX.number) / d.ScrollX.increment;
if (d.ScrollY.number != -1)
v = ReadRawValue(ref raw, d.ScrollY.number) / d.ScrollY.increment;
d.State.X += (int)Math.Round(x);
d.State.Y += (int)Math.Round(y);