From 0f65acc1651aa05c99d59a7b9c88d793a790df35 Mon Sep 17 00:00:00 2001 From: Malcolm Still Date: Fri, 6 Jan 2017 15:13:37 +0000 Subject: [PATCH] libinput v0.8 removed libinput_event_pointer_get_axis and replace with libinput_event_pointer_has_axis and libinput_event_pointer_get_axis_value now takes a specified PointerAxis --- src/OpenTK/Platform/Linux/Bindings/LibInput.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/OpenTK/Platform/Linux/Bindings/LibInput.cs b/src/OpenTK/Platform/Linux/Bindings/LibInput.cs index 7991125..5338193 100644 --- a/src/OpenTK/Platform/Linux/Bindings/LibInput.cs +++ b/src/OpenTK/Platform/Linux/Bindings/LibInput.cs @@ -278,8 +278,8 @@ namespace OpenTK.Platform.Linux public EvdevButton Button { get { return (EvdevButton)GetButton(@event); } } public uint ButtonCount { get { return GetButtonCount(@event); } } public ButtonState ButtonState { get { return GetButtonState(@event); } } - public PointerAxis Axis { get { return GetAxis(@event); } } - public Fixed24 AxisValue { get { return GetAxisValue(@event); } } + public bool HasAxis(PointerAxis axis) { return HasAxis(@event, axis) != 0; } + public double AxisValue(PointerAxis axis) { return GetAxisValue(@event, axis); } public Fixed24 DeltaX { get { return GetDX(@event); } } public Fixed24 DeltaY { get { return GetDY(@event); } } public Fixed24 X { get { return GetAbsX(@event); } } @@ -305,11 +305,11 @@ namespace OpenTK.Platform.Linux [DllImport(LibInput.lib, EntryPoint = "libinput_event_pointer_get_button_state", CallingConvention = CallingConvention.Cdecl)] static extern ButtonState GetButtonState(IntPtr @event); - [DllImport(LibInput.lib, EntryPoint = "libinput_event_pointer_get_axis", CallingConvention = CallingConvention.Cdecl)] - static extern PointerAxis GetAxis(IntPtr @event); + [DllImport(LibInput.lib, EntryPoint = "libinput_event_pointer_has_axis", CallingConvention = CallingConvention.Cdecl)] + static extern int HasAxis(IntPtr @event, PointerAxis axis); [DllImport(LibInput.lib, EntryPoint = "libinput_event_pointer_get_axis_value", CallingConvention = CallingConvention.Cdecl)] - static extern Fixed24 GetAxisValue(IntPtr @event); + static extern double GetAxisValue(IntPtr @event, PointerAxis axis); [DllImport(LibInput.lib, EntryPoint = "libinput_event_pointer_get_dx", CallingConvention = CallingConvention.Cdecl)] static extern Fixed24 GetDX(IntPtr @event); -- 2.7.4