diff --git a/src/backends/native/meta-input-device-tool-native.c b/src/backends/native/meta-input-device-tool-native.c index e6ec0c758..224f78324 100644 --- a/src/backends/native/meta-input-device-tool-native.c +++ b/src/backends/native/meta-input-device-tool-native.c @@ -102,10 +102,10 @@ meta_input_device_tool_native_set_pressure_curve_in_impl (ClutterInputDeviceTool curve[3] >= 0 && curve[3] <= 1); evdev_tool = META_INPUT_DEVICE_TOOL_NATIVE (tool); - evdev_tool->pressure_curve[0] = curve[0]; - evdev_tool->pressure_curve[1] = curve[1]; - evdev_tool->pressure_curve[2] = curve[2]; - evdev_tool->pressure_curve[3] = curve[3]; + evdev_tool->pressure_curve[0].x = curve[0]; + evdev_tool->pressure_curve[0].y = curve[1]; + evdev_tool->pressure_curve[1].x = curve[2]; + evdev_tool->pressure_curve[1].y = curve[3]; } void @@ -162,10 +162,10 @@ meta_input_device_tool_native_translate_pressure_in_impl (ClutterInputDeviceTool evdev_tool = META_INPUT_DEVICE_TOOL_NATIVE (tool); return calculate_bezier_position (CLAMP (pressure, 0, 1), - evdev_tool->pressure_curve[0], - evdev_tool->pressure_curve[1], - evdev_tool->pressure_curve[2], - evdev_tool->pressure_curve[3]); + evdev_tool->pressure_curve[0].x, + evdev_tool->pressure_curve[0].y, + evdev_tool->pressure_curve[1].x, + evdev_tool->pressure_curve[1].y); } uint32_t diff --git a/src/backends/native/meta-input-device-tool-native.h b/src/backends/native/meta-input-device-tool-native.h index edcf5c10e..486b90305 100644 --- a/src/backends/native/meta-input-device-tool-native.h +++ b/src/backends/native/meta-input-device-tool-native.h @@ -23,6 +23,7 @@ #error "This header cannot be included directly. Use "backends/native/meta-input-thread.h"" #endif /* META_INPUT_THREAD_H_INSIDE */ +#include #include #include "clutter/clutter.h" @@ -59,7 +60,7 @@ struct _MetaInputDeviceToolNative ClutterInputDeviceTool parent_instance; struct libinput_tablet_tool *tool; GHashTable *button_map; - double pressure_curve[4]; + graphene_point_t pressure_curve[2]; }; struct _MetaInputDeviceToolNativeClass