geis.h   geis.h 
skipping to change at line 112 skipping to change at line 112
#define GEIS_FALSE 0 #define GEIS_FALSE 0
#define GEIS_TRUE 1 #define GEIS_TRUE 1
/* 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"
#define GEIS_GESTURE_TOUCH "Touch" #define GEIS_GESTURE_TOUCH "Touch"
/* Extra higher-level gestures. */
#define GEIS_GESTURE_FLICK "Flick"
/** /**
* @defgroup geis_v1_gesture_types Gesture Types * @defgroup geis_v1_gesture_types Gesture Types
* @ingroup geis_v1 * @ingroup geis_v1
* *
* The names of gesture types. These names can be passed to * The names of gesture types. These names can be passed to
* geis_subscribe() in a NULL-terminated list to specify only a subset of * geis_subscribe() in a NULL-terminated list to specify only a subset of
* available gestures. * available gestures.
*/ */
/** /**
skipping to change at line 159 skipping to change at line 162
* A parenthetical gesture event. Touch down (start) and up (finish). * A parenthetical gesture event. Touch down (start) and up (finish).
*/ */
#define GEIS_GESTURE_PRIMITIVE_DRAG 0 #define GEIS_GESTURE_PRIMITIVE_DRAG 0
#define GEIS_GESTURE_PRIMITIVE_PINCH 1 #define GEIS_GESTURE_PRIMITIVE_PINCH 1
#define GEIS_GESTURE_PRIMITIVE_ROTATE 2 #define GEIS_GESTURE_PRIMITIVE_ROTATE 2
#define GEIS_GESTURE_PRIMITIVE_TAP 15 #define GEIS_GESTURE_PRIMITIVE_TAP 15
#define GEIS_GESTURE_PRIMITIVE_TOUCH 32 #define GEIS_GESTURE_PRIMITIVE_TOUCH 32
/* @} */ /* @} */
#define GEIS_GESTURE_ID_FLICK 128
/** /**
* @defgroup geis_v1_standar_gesture_types Standard Gesture Types * @defgroup geis_v1_standar_gesture_types Standard Gesture Types
* @ingroup geis_v1_gesture_types * @ingroup geis_v1_gesture_types
* *
* These gesture types should be available on all GEIS implementations. * These gesture types should be available on all GEIS implementations.
* *
* @{ * @{
*/ */
/* Gesture names for the Simplified Interface */ /* Gesture names for the Simplified Interface */
skipping to change at line 211 skipping to change at line 216
* Vendor-specific extensions to the GEIS v1 API. * Vendor-specific extensions to the GEIS v1 API.
* *
* @{ * @{
*/ */
/** /**
* A special gesture type than enabled system-wide gesture priority. * A special gesture type than enabled system-wide gesture priority.
*/ */
#define GEIS_GESTURE_TYPE_SYSTEM "Sysflags" #define GEIS_GESTURE_TYPE_SYSTEM "Sysflags"
#define GEIS_GESTURE_TYPE_FLICK1 "Flick,touch=1"
#define GEIS_GESTURE_TYPE_FLICK2 "Flick,touch=2"
#define GEIS_GESTURE_TYPE_FLICK3 "Flick,touch=3"
#define GEIS_GESTURE_TYPE_FLICK4 "Flick,touch=4"
#define GEIS_GESTURE_TYPE_FLICK5 "Flick,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"
skipping to change at line 1046 skipping to change at line 1057
/* @} */ /* @} */
/** /**
* @name Device Attributes * @name Device Attributes
* @{ * @{
* *
* @def GEIS_DEVICE_ATTRIBUTE_NAME * @def GEIS_DEVICE_ATTRIBUTE_NAME
* The name of the input device. Not guaranteed unique. * The name of the input device. Not guaranteed unique.
* *
* The attribute value is of type GeisString.
*
* @def GEIS_DEVICE_ATTRIBUTE_ID * @def GEIS_DEVICE_ATTRIBUTE_ID
* The unique integer ID of the device. Guaranteed unique within a Geis * The unique integer ID of the device. Guaranteed unique within a Geis
* instance. * instance.
* *
* The attribute values is of type GeisInteger.
*
* @def GEIS_DEVICE_ATTRIBUTE_TOUCHES * @def GEIS_DEVICE_ATTRIBUTE_TOUCHES
* The maximum number of touches a device is capable of reporting. * The maximum number of touches a device is capable of reporting.
* This integer is the number if simultaneous touches the device claims to be * This integer is the number if simultaneous touches the device claims to be
* able to detect if it is a multi-touch device. A value of zero indicates the * able to detect if it is a multi-touch device. A value of zero indicates the
* maximum number of touches can not be determined. * maximum number of touches can not be determined.
* *
* The attribute value is of type GeisInteger.
*
* @def GEIS_DEVICE_ATTRIBUTE_DIRECT_TOUCH * @def GEIS_DEVICE_ATTRIBUTE_DIRECT_TOUCH
* Indicates the device is a direct touch device. * Indicates the device is a direct touch device.
* The present of this boolean attribute with a value of GEIS_TRUE indicate s the * The present of this boolean attribute with a value of GEIS_TRUE indicate s the
* device is a direct touch multi-touch device (for example, a touchscreen) , * device is a direct touch multi-touch device (for example, a touchscreen) ,
* otherwise it is an indirect touch device (such as a touchpad) or not a t ouch * otherwise it is an indirect touch device (such as a touchpad) or not a t ouch
* device at all. * device at all.
* *
* The attribute value is of type GeisBoolean.
*
* @def GEIS_DEVICE_ATTRIBUTE_INDEPENDENT_TOUCH * @def GEIS_DEVICE_ATTRIBUTE_INDEPENDENT_TOUCH
* Indicates the device is an independent touch device. * Indicates the device is an independent touch device.
* The presence of this boolean attribute with a value of GEIS_TRUE indicat es * The presence of this boolean attribute with a value of GEIS_TRUE indicat es
* the device is an independent touch device (for example, an Apple MagicMo use). * the device is an independent touch device (for example, an Apple MagicMo use).
* Other multi-touch devices should report GEIS_FALSE. * Other multi-touch devices should report GEIS_FALSE.
*
* The attribute value is of type GeisBoolean.
*
* @def GEIS_DEVICE_ATTRIBUTE_MIN_X
* The lower bound of the X-axis (nominally horizontal) coordinate values
* reported by the device.
*
* The attribute values is of type GeisFloat.
*
* @def GEIS_DEVICE_ATTRIBUTE_MAX_X
* The upper bound of the X-axis (nominally horizontal) coordinate values
* reported by the device.
*
* The attribute values is of type GeisFloat.
*
* @def GEIS_DEVICE_ATTRIBUTE_RES_X
* The resolution of the X-axis (nominally horizontal) coordinate values
* reported by the device.
*
* The attribute values is of type GeisFloat.
*
* @def GEIS_DEVICE_ATTRIBUTE_MIN_Y
* The lower bound of the Y-axis (nominally vertical) coordinate values
* reported by the device.
*
* The attribute values is of type GeisFloat.
*
* @def GEIS_DEVICE_ATTRIBUTE_MAX_Y
* The upper bound of the Y-axis (nominally vertical) coordinate values
* reported by the device.
*
* The attribute values is of type GeisFloat.
*
* @def GEIS_DEVICE_ATTRIBUTE_RES_Y
* The resolution of the Y-axis (nominally vertical) coordinate values
* reported by the device.
*
* The attribute values is of type GeisFloat.
*/ */
#define GEIS_DEVICE_ATTRIBUTE_NAME "device name" #define GEIS_DEVICE_ATTRIBUTE_NAME "device name"
#define GEIS_DEVICE_ATTRIBUTE_ID "device id" #define GEIS_DEVICE_ATTRIBUTE_ID "device id"
#define GEIS_DEVICE_ATTRIBUTE_TOUCHES "device touches" #define GEIS_DEVICE_ATTRIBUTE_TOUCHES "device touches"
#define GEIS_DEVICE_ATTRIBUTE_DIRECT_TOUCH "direct touch" #define GEIS_DEVICE_ATTRIBUTE_DIRECT_TOUCH "direct touch"
#define GEIS_DEVICE_ATTRIBUTE_INDEPENDENT_TOUCH "independent touch" #define GEIS_DEVICE_ATTRIBUTE_INDEPENDENT_TOUCH "independent touch"
#define GEIS_DEVICE_ATTRIBUTE_MIN_X "device X minimum"
#define GEIS_DEVICE_ATTRIBUTE_MAX_X "device X maximum"
#define GEIS_DEVICE_ATTRIBUTE_RES_X "device X resolution"
#define GEIS_DEVICE_ATTRIBUTE_MIN_Y "device Y minimum"
#define GEIS_DEVICE_ATTRIBUTE_MAX_Y "device Y maximum"
#define GEIS_DEVICE_ATTRIBUTE_RES_Y "device Y resolution"
/* @} */ /* @} */
/** /**
* @class GeisDevice * @class GeisDevice
* A gesture-capable input device. * A gesture-capable input device.
* *
* GeisDevice objects are created by the GEIS API and are reference counted . * GeisDevice objects are created by the GEIS API and are reference counted .
*/ */
/** @cond typedef */ /** @cond typedef */
skipping to change at line 1399 skipping to change at line 1462
typedef struct _GeisFilter *GeisFilter; typedef struct _GeisFilter *GeisFilter;
/** @endcond */ /** @endcond */
/** /**
* Indicates the type of filter. * Indicates the type of filter.
*/ */
typedef enum _GeisFilterFacility typedef enum _GeisFilterFacility
{ {
GEIS_FILTER_DEVICE = 1000, /**< Filters on device attributes. */ GEIS_FILTER_DEVICE = 1000, /**< Filters on device attributes. */
GEIS_FILTER_CLASS = 2000, /**< Filters on gesture attributes. */ GEIS_FILTER_CLASS = 2000, /**< Filters on gesture attributes. */
GEIS_FILTER_REGION = 3000 /**< Filters on region attributes. */ GEIS_FILTER_REGION = 3000, /**< Filters on region attributes. */
GEIS_FILTER_SPECIAL = 5000 /**< Filters on special attributes. */
} GeisFilterFacility; } GeisFilterFacility;
/** /**
* Indicates the type of filter operation. * Indicates the type of filter operation.
*/ */
typedef enum _GeisFilterOperation typedef enum _GeisFilterOperation
{ {
GEIS_FILTER_OP_EQ, /**< Compares for equality. */ GEIS_FILTER_OP_EQ, /**< Compares for equality. */
GEIS_FILTER_OP_NE, /**< Compares for inequality */ GEIS_FILTER_OP_NE, /**< Compares for inequality */
GEIS_FILTER_OP_GT, /**< Compares for greater-than. */ GEIS_FILTER_OP_GT, /**< Compares for greater-than. */
 End of changes. 10 change blocks. 
1 lines changed or deleted 65 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/