geis.h   geis.h 
skipping to change at line 37 skipping to change at line 37
/* 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"
/* 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_H "boundingbox h" #define GEIS_GESTURE_ATTRIBUTE_BOUNDINGBOX_X1 "boundingbox x1"
#define GEIS_GESTURE_ATTRIBUTE_BOUNDINGBOX_W "boundingbox w" #define GEIS_GESTURE_ATTRIBUTE_BOUNDINGBOX_Y1 "boundingbox y1"
#define GEIS_GESTURE_ATTRIBUTE_BOUNDINGBOX_X "boundingbox x" #define GEIS_GESTURE_ATTRIBUTE_BOUNDINGBOX_X2 "boundingbox x2"
#define GEIS_GESTURE_ATTRIBUTE_BOUNDINGBOX_Y "boundingbox y" #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_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_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_X "touch 0 x"
#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_X "touch 1 x"
#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_X "touch 2 x"
#define GEIS_GESTURE_ATTRIBUTE_TOUCH_2_Y "touch 2 y"
#define GEIS_GESTURE_ATTRIBUTE_TOUCH_3_ID "touch 3 id"
#define GEIS_GESTURE_ATTRIBUTE_TOUCH_3_X "touch 3 x"
#define GEIS_GESTURE_ATTRIBUTE_TOUCH_3_Y "touch 3 y"
#define GEIS_GESTURE_ATTRIBUTE_TOUCH_4_ID "touch 4 id"
#define GEIS_GESTURE_ATTRIBUTE_TOUCH_4_X "touch 4 x"
#define GEIS_GESTURE_ATTRIBUTE_TOUCH_4_Y "touch 4 y"
/** /**
* @defgroup geis_status Status and Errors * @defgroup geis_status Status and Errors
* *
* Most GEIS API calls return a status code indicating success or, in the e vent * Most GEIS API calls return a status code indicating success or, in the e vent
* of a lack of success, the reson for failure. * of a lack of success, the reson for failure.
* *
* @{ * @{
*/ */
skipping to change at line 113 skipping to change at line 128
* An opaque type representing a geis gesture subscription instance. * An opaque type representing a geis gesture subscription instance.
*/ */
typedef struct _GeisInstance *GeisInstance; typedef struct _GeisInstance *GeisInstance;
/** /**
* @struct GeisWinInfo * @struct GeisWinInfo
* Generic display region description block * Generic display region description block
*/ */
typedef struct GeisWinInfo typedef struct GeisWinInfo
{ {
int win_type; uint32_t win_type;
void *win_info; void *win_info;
} GeisWinInfo; } GeisWinInfo;
/** /**
* Initializes a geis subscription instance for a display region. * Initializes a geis subscription instance for a display region.
* *
* @param[in] win_info a display region description block * @param[in] win_info a display region description block
* -- see geis implementtaion documentation * -- see geis implementtaion documentation
* @param[out] geis_instance an opaque pointer to a geis gesture subscri ption * @param[out] geis_instance an opaque pointer to a geis gesture subscri ption
* instance * instance
* *
 End of changes. 3 change blocks. 
6 lines changed or deleted 21 lines changed or added


 geisimpl.h   geisimpl.h 
skipping to change at line 24 skipping to change at line 24
* details. * details.
* *
* You should have received a copy of the GNU Lesser General Public License * You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation, Inc., * along with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef LIBGEIS_XCB_GEISIMPL_H_ #ifndef LIBGEIS_XCB_GEISIMPL_H_
#define LIBGEIS_XCB_GEISIMPL_H_ #define LIBGEIS_XCB_GEISIMPL_H_
#include <stdint.h> #include <stdint.h>
#include <stdlib.h>
#if defined _WIN32 || defined __CYGWIN__ #if defined _WIN32 || defined __CYGWIN__
#define GEIS_HELPER_DSO_IMPORT __declspec(dllimport) #define GEIS_HELPER_DSO_IMPORT __declspec(dllimport)
#define GEIS_HELPER_DSO_EXPORT __declspec(dllexport) #define GEIS_HELPER_DSO_EXPORT __declspec(dllexport)
#define GEIS_HELPER_DSO_LOCAL #define GEIS_HELPER_DSO_LOCAL
#else #else
#if __GNUC__ >= 4 #if __GNUC__ >= 4
#define GEIS_HELPER_DSO_IMPORT __attribute__ ((visibility("default"))) #define GEIS_HELPER_DSO_IMPORT __attribute__ ((visibility("default")))
#define GEIS_HELPER_DSO_EXPORT __attribute__ ((visibility("default"))) #define GEIS_HELPER_DSO_EXPORT __attribute__ ((visibility("default")))
#define GEIS_HELPER_DSO_LOCAL __attribute__ ((visibility("hidden"))) #define GEIS_HELPER_DSO_LOCAL __attribute__ ((visibility("hidden")))
skipping to change at line 56 skipping to change at line 57
#endif /* GEIS_DSO_EXPORTS */ #endif /* GEIS_DSO_EXPORTS */
#define GEIS_LOCAL GEIS_HELPER_DSO_LOCAL #define GEIS_LOCAL GEIS_HELPER_DSO_LOCAL
#else #else
#define GEIS_API #define GEIS_API
#define GEIS_LOCAL #define GEIS_LOCAL
#endif /* GEIS_BUILDING_DSO */ #endif /* GEIS_BUILDING_DSO */
/** /**
* Portability types * Portability types
*/ */
typedef unsigned long GeisSize; typedef size_t GeisSize;
typedef int GeisBoolean; typedef uint32_t GeisBoolean;
typedef long GeisInteger; typedef int32_t GeisInteger;
typedef float GeisFloat; typedef float GeisFloat;
typedef const char *GeisString; typedef const char *GeisString;
/** /**
* @brief Magic for constructing geis win_type values. * @brief Magic for constructing geis win_type values.
*/ */
static inline uint32_t _geis_win_type_str(const char tag[5]) static inline uint32_t _geis_win_type_str(const char tag[5])
{ return (((((tag[3] << 8 ) | tag[2]) << 8) | tag[1]) << 8) | tag[0]; } { return (((((tag[3] << 8 ) | tag[2]) << 8) | tag[1]) << 8) | tag[0]; }
#define geis_win_type_str(tag) _geis_win_type_str(#tag) #define geis_win_type_str(tag) _geis_win_type_str(#tag)
 End of changes. 2 change blocks. 
3 lines changed or deleted 4 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/