| geis.h | geis.h | |||
|---|---|---|---|---|
| skipping to change at line 33 | skipping to change at line 33 | |||
| #define GEIS_VERSION_1_0 1 | #define GEIS_VERSION_1_0 1 | |||
| #include <geis/geisimpl.h> | #include <geis/geisimpl.h> | |||
| /* Standard fundamental gestures */ | /* Standard fundamental gestures */ | |||
| #define GEIS_GESTURE_DRAG "Drag" | #define GEIS_GESTURE_DRAG "Drag" | |||
| #define GEIS_GESTURE_PINCH "Pinch" | #define GEIS_GESTURE_PINCH "Pinch" | |||
| #define GEIS_GESTURE_ROTATE "Rotate" | #define GEIS_GESTURE_ROTATE "Rotate" | |||
| #define GEIS_GESTURE_TAP "Tap" | #define GEIS_GESTURE_TAP "Tap" | |||
| /* Gesture names for the Simplified Interface */ | ||||
| #define GEIS_GESTURE_TYPE_DRAG1 "Drag,touch=1" | ||||
| #define GEIS_GESTURE_TYPE_DRAG2 "Drag,touch=2" | ||||
| #define GEIS_GESTURE_TYPE_DRAG3 "Drag,touch=3" | ||||
| #define GEIS_GESTURE_TYPE_DRAG4 "Drag,touch=4" | ||||
| #define GEIS_GESTURE_TYPE_DRAG5 "Drag,touch=5" | ||||
| #define GEIS_GESTURE_TYPE_PINCH1 "Pinch,touch=1" | ||||
| #define GEIS_GESTURE_TYPE_PINCH2 "Pinch,touch=2" | ||||
| #define GEIS_GESTURE_TYPE_PINCH3 "Pinch,touch=3" | ||||
| #define GEIS_GESTURE_TYPE_PINCH4 "Pinch,touch=4" | ||||
| #define GEIS_GESTURE_TYPE_PINCH5 "Pinch,touch=5" | ||||
| #define GEIS_GESTURE_TYPE_ROTATE1 "Rotate,touch=1" | ||||
| #define GEIS_GESTURE_TYPE_ROTATE2 "Rotate,touch=2" | ||||
| #define GEIS_GESTURE_TYPE_ROTATE3 "Rotate,touch=3" | ||||
| #define GEIS_GESTURE_TYPE_ROTATE4 "Rotate,touch=4" | ||||
| #define GEIS_GESTURE_TYPE_ROTATE5 "Rotate,touch=5" | ||||
| #define GEIS_GESTURE_TYPE_TAP1 "Tap,touch=1" | ||||
| #define GEIS_GESTURE_TYPE_TAP2 "Tap,touch=2" | ||||
| #define GEIS_GESTURE_TYPE_TAP3 "Tap,touch=3" | ||||
| #define GEIS_GESTURE_TYPE_TAP4 "Tap,touch=4" | ||||
| #define GEIS_GESTURE_TYPE_TAP5 "Tap,touch=5" | ||||
| /* Standard fundamental gesture attributes */ | /* Standard fundamental gesture attributes */ | |||
| #define GEIS_GESTURE_ATTRIBUTE_ANGLE "angle" | #define GEIS_GESTURE_ATTRIBUTE_ANGLE "angle" | |||
| #define GEIS_GESTURE_ATTRIBUTE_ANGLE_DELTA "angle delta" | #define GEIS_GESTURE_ATTRIBUTE_ANGLE_DELTA "angle delta" | |||
| #define GEIS_GESTURE_ATTRIBUTE_ANGULAR_VELOCITY "angular velocity" | #define GEIS_GESTURE_ATTRIBUTE_ANGULAR_VELOCITY "angular velocity" | |||
| #define GEIS_GESTURE_ATTRIBUTE_BOUNDINGBOX_X1 "boundingbox x1" | #define GEIS_GESTURE_ATTRIBUTE_BOUNDINGBOX_X1 "boundingbox x1" | |||
| #define GEIS_GESTURE_ATTRIBUTE_BOUNDINGBOX_Y1 "boundingbox y1" | #define GEIS_GESTURE_ATTRIBUTE_BOUNDINGBOX_Y1 "boundingbox y1" | |||
| #define GEIS_GESTURE_ATTRIBUTE_BOUNDINGBOX_X2 "boundingbox x2" | #define GEIS_GESTURE_ATTRIBUTE_BOUNDINGBOX_X2 "boundingbox x2" | |||
| #define GEIS_GESTURE_ATTRIBUTE_BOUNDINGBOX_Y2 "boundingbox y2" | #define GEIS_GESTURE_ATTRIBUTE_BOUNDINGBOX_Y2 "boundingbox y2" | |||
| #define GEIS_GESTURE_ATTRIBUTE_CHILD_WINDOW_ID "child window id" | #define GEIS_GESTURE_ATTRIBUTE_CHILD_WINDOW_ID "child window id" | |||
| #define GEIS_GESTURE_ATTRIBUTE_DELTA_X "delta x" | #define GEIS_GESTURE_ATTRIBUTE_DELTA_X "delta x" | |||
| #define GEIS_GESTURE_ATTRIBUTE_DELTA_Y "delta y" | #define GEIS_GESTURE_ATTRIBUTE_DELTA_Y "delta y" | |||
| #define GEIS_GESTURE_ATTRIBUTE_DEVICE_ID "device id" | #define GEIS_GESTURE_ATTRIBUTE_DEVICE_ID "device id" | |||
| #define GEIS_GESTURE_ATTRIBUTE_EVENT_WINDOW_ID "event window id" | #define GEIS_GESTURE_ATTRIBUTE_EVENT_WINDOW_ID "event window id" | |||
| #define GEIS_GESTURE_ATTRIBUTE_FINGERS "fingers" | ||||
| #define GEIS_GESTURE_ATTRIBUTE_FOCUS_X "focus x" | #define GEIS_GESTURE_ATTRIBUTE_FOCUS_X "focus x" | |||
| #define GEIS_GESTURE_ATTRIBUTE_FOCUS_Y "focus y" | #define GEIS_GESTURE_ATTRIBUTE_FOCUS_Y "focus y" | |||
| #define GEIS_GESTURE_ATTRIBUTE_GESTURE_NAME "gesture name" | #define GEIS_GESTURE_ATTRIBUTE_GESTURE_NAME "gesture name" | |||
| #define GEIS_GESTURE_ATTRIBUTE_POSITION_X "position x" | #define GEIS_GESTURE_ATTRIBUTE_POSITION_X "position x" | |||
| #define GEIS_GESTURE_ATTRIBUTE_POSITION_Y "position y" | #define GEIS_GESTURE_ATTRIBUTE_POSITION_Y "position y" | |||
| #define GEIS_GESTURE_ATTRIBUTE_RADIAL_VELOCITY "radial velocity" | #define GEIS_GESTURE_ATTRIBUTE_RADIAL_VELOCITY "radial velocity" | |||
| #define GEIS_GESTURE_ATTRIBUTE_RADIUS_DELTA "radius delta" | #define GEIS_GESTURE_ATTRIBUTE_RADIUS_DELTA "radius delta" | |||
| #define GEIS_GESTURE_ATTRIBUTE_RADIUS "radius" | #define GEIS_GESTURE_ATTRIBUTE_RADIUS "radius" | |||
| #define GEIS_GESTURE_ATTRIBUTE_ROOT_WINDOW_ID "root window id" | #define GEIS_GESTURE_ATTRIBUTE_ROOT_WINDOW_ID "root window id" | |||
| #define GEIS_GESTURE_ATTRIBUTE_TAP_TIME "tap time" | #define GEIS_GESTURE_ATTRIBUTE_TAP_TIME "tap time" | |||
| #define GEIS_GESTURE_ATTRIBUTE_TIMESTAMP "timestamp" | #define GEIS_GESTURE_ATTRIBUTE_TIMESTAMP "timestamp" | |||
| #define GEIS_GESTURE_ATTRIBUTE_TOUCHES "touches" | ||||
| #define GEIS_GESTURE_ATTRIBUTE_VELOCITY_X "velocity x" | #define GEIS_GESTURE_ATTRIBUTE_VELOCITY_X "velocity x" | |||
| #define GEIS_GESTURE_ATTRIBUTE_VELOCITY_Y "velocity y" | #define GEIS_GESTURE_ATTRIBUTE_VELOCITY_Y "velocity y" | |||
| #define GEIS_GESTURE_ATTRIBUTE_TOUCH_0_ID "touch 0 id" | #define GEIS_GESTURE_ATTRIBUTE_TOUCH_0_ID "touch 0 id" | |||
| #define GEIS_GESTURE_ATTRIBUTE_TOUCH_0_X "touch 0 x" | #define GEIS_GESTURE_ATTRIBUTE_TOUCH_0_X "touch 0 x" | |||
| #define GEIS_GESTURE_ATTRIBUTE_TOUCH_0_Y "touch 0 y" | #define GEIS_GESTURE_ATTRIBUTE_TOUCH_0_Y "touch 0 y" | |||
| #define GEIS_GESTURE_ATTRIBUTE_TOUCH_1_ID "touch 1 id" | #define GEIS_GESTURE_ATTRIBUTE_TOUCH_1_ID "touch 1 id" | |||
| #define GEIS_GESTURE_ATTRIBUTE_TOUCH_1_X "touch 1 x" | #define GEIS_GESTURE_ATTRIBUTE_TOUCH_1_X "touch 1 x" | |||
| #define GEIS_GESTURE_ATTRIBUTE_TOUCH_1_Y "touch 1 y" | #define GEIS_GESTURE_ATTRIBUTE_TOUCH_1_Y "touch 1 y" | |||
| #define GEIS_GESTURE_ATTRIBUTE_TOUCH_2_ID "touch 2 id" | #define GEIS_GESTURE_ATTRIBUTE_TOUCH_2_ID "touch 2 id" | |||
| #define GEIS_GESTURE_ATTRIBUTE_TOUCH_2_X "touch 2 x" | #define GEIS_GESTURE_ATTRIBUTE_TOUCH_2_X "touch 2 x" | |||
| skipping to change at line 273 | skipping to change at line 295 | |||
| * | * | |||
| * The callback is called for each gesture-capable input device available f or | * The callback is called for each gesture-capable input device available f or | |||
| * the display region associated with the geis subscription instance. Over | * the display region associated with the geis subscription instance. Over | |||
| * time, as gesture-capable input devices appear and disappear or change th eir | * time, as gesture-capable input devices appear and disappear or change th eir | |||
| * abilities or configuration, the callback may be called again. | * abilities or configuration, the callback may be called again. | |||
| * | * | |||
| * @retval GEIS_BAD_ARGUMENT an invalid argument value was passed | * @retval GEIS_BAD_ARGUMENT an invalid argument value was passed | |||
| * @retval GEIS_STATUS_SUCCESS normal successful completion | * @retval GEIS_STATUS_SUCCESS normal successful completion | |||
| */ | */ | |||
| GEIS_API GeisStatus geis_input_devices(GeisInstance geis_instance, | GEIS_API GeisStatus geis_input_devices(GeisInstance geis_instance, | |||
| GeisInputFuncs func, | GeisInputFuncs *func, | |||
| void *cookie); | void *cookie); | |||
| /* @} */ | /* @} */ | |||
| /** | /** | |||
| * @defgroup geis_subscription Gesture Subscription | * @defgroup geis_subscription Gesture Subscription | |||
| * @{ | * @{ | |||
| */ | */ | |||
| typedef unsigned int GeisGestureType; | typedef unsigned int GeisGestureType; | |||
| typedef unsigned int GeisGestureId; | typedef unsigned int GeisGestureId; | |||
| End of changes. 4 change blocks. | ||||
| 2 lines changed or deleted | 24 lines changed or added | |||