From edccf44150867af63ead0a97c9f252c473f8a4ce Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Wed, 6 Jul 2016 11:09:06 +0900 Subject: [PATCH] efl: Rename "pointer" device class to "wand" Because I like magic. And to avoid confusion with mouse pointer. Suggested by @zmike in D3858 (Ecore_Device). --- src/lib/efl/interfaces/efl_input_device.eo | 2 +- src/lib/evas/Evas_Common.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/efl/interfaces/efl_input_device.eo b/src/lib/efl/interfaces/efl_input_device.eo index 6791a86260..1591f61376 100644 --- a/src/lib/efl/interfaces/efl_input_device.eo +++ b/src/lib/efl/interfaces/efl_input_device.eo @@ -12,7 +12,7 @@ enum Efl.Input.Device.Class mouse, [[A mouse, trackball or touchpad relative motion device.]] touch, [[A touchscreen with fingers or stylus.]] pen, [[A special pen device.]] - pointer, [[A laser pointer, wii-style or "minority report" pointing device.]] + wand, [[A laser pointer, wii-style or "minority report" pointing device.]] gamepad, [[A gamepad controller or joystick.]] } diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h index 46b9f56df9..b87f65b519 100644 --- a/src/lib/evas/Evas_Common.h +++ b/src/lib/evas/Evas_Common.h @@ -327,7 +327,8 @@ typedef Efl_Input_Device_Class Evas_Device_Class; #define EVAS_DEVICE_CLASS_MOUSE EFL_INPUT_DEVICE_CLASS_MOUSE /**< A mouse, trackball or touchpad relative motion device @since 1.8 */ #define EVAS_DEVICE_CLASS_TOUCH EFL_INPUT_DEVICE_CLASS_TOUCH /**< A touchscreen with fingers or stylus @since 1.8 */ #define EVAS_DEVICE_CLASS_PEN EFL_INPUT_DEVICE_CLASS_PEN /**< A special pen device @since 1.8 */ -#define EVAS_DEVICE_CLASS_POINTER EFL_INPUT_DEVICE_CLASS_POINTER /**< A laser pointer, wii-style or "minority report" pointing device @since 1.8 */ +#define EVAS_DEVICE_CLASS_POINTER EFL_INPUT_DEVICE_CLASS_WAND /**< A laser pointer, wii-style or "minority report" pointing device @since 1.8 */ +#define EVAS_DEVICE_CLASS_WAND EFL_INPUT_DEVICE_CLASS_WAND /**< A synonym for EVAS_DEVICE_CLASS_POINTER @since 1.18 */ #define EVAS_DEVICE_CLASS_GAMEPAD EFL_INPUT_DEVICE_CLASS_GAMEPAD /**< A gamepad controller or joystick @since 1.8 */ typedef Efl_Input_Device_Sub_Class Evas_Device_Subclass;