clutter 3.0.7-x86-mingw32 → 3.0.8-x86-mingw32

data/vendor/local/include/clutter-1.0/clutter/clutter-event.h

@@ -21,13 +21,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CLUTTER_EVENT_H__
+#define __CLUTTER_EVENT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_EVENT_H__
-#define __CLUTTER_EVENT_H__
-
 #include <clutter/clutter-types.h>
 #include <clutter/clutter-input-device.h>
 
@@ -115,6 +115,8 @@ typedef struct _ClutterScrollEvent      ClutterScrollEvent;
 typedef struct _ClutterStageStateEvent  ClutterStageStateEvent;
 typedef struct _ClutterCrossingEvent    ClutterCrossingEvent;
 typedef struct _ClutterTouchEvent       ClutterTouchEvent;
+typedef struct _ClutterTouchpadPinchEvent ClutterTouchpadPinchEvent;
+typedef struct _ClutterTouchpadSwipeEvent ClutterTouchpadSwipeEvent;
 
 /**
  * ClutterAnyEvent:
@@ -289,6 +291,8 @@ struct _ClutterMotionEvent
  * @axes: reserved for future use
  * @device: the device that originated the event. If you want the physical
  * device the event originated from, use clutter_event_get_source_device()
+ * @scroll_source: the source of scroll events. This field is available since 1.26
+ * @finish_flags: the axes that were stopped in this event. This field is available since 1.26
  *
  * Scroll wheel (or similar device) event
  *
@@ -308,6 +312,8 @@ struct _ClutterScrollEvent
   ClutterModifierType modifier_state;
   gdouble *axes; /* future use */
   ClutterInputDevice *device;
+  ClutterScrollSource scroll_source;
+  ClutterScrollFinishFlags finish_flags;
 };
 
 /**
@@ -384,6 +390,84 @@ struct _ClutterTouchEvent
   ClutterInputDevice *device;
 };
 
+/**
+ * ClutterTouchpadPinchEvent:
+ * @type: event type
+ * @time: event time
+ * @flags: event flags
+ * @stage: event source stage
+ * @source: event source actor (unused)
+ * @phase: the current phase of the gesture
+ * @x: the X coordinate of the pointer, relative to the stage
+ * @y: the Y coordinate of the pointer, relative to the stage
+ * @dx: movement delta of the pinch focal point in the X axis
+ * @dy: movement delta of the pinch focal point in the Y axis
+ * @angle_delta: angle delta in degrees, clockwise rotations are
+ *   represented by positive deltas
+ * @scale: the current scale
+ *
+ * Used for touchpad pinch gesture events. The current state of the
+ * gesture will be determined by the @phase field.
+ *
+ * Each event with phase %CLUTTER_TOUCHPAD_GESTURE_PHASE_BEGIN
+ * will report a @scale of 1.0, all later phases in the gesture
+ * report the current scale relative to the initial 1.0 value
+ * (eg. 0.5 being half the size, 2.0 twice as big).
+ *
+ * Since: 1.24
+ */
+struct _ClutterTouchpadPinchEvent
+{
+  ClutterEventType type;
+  guint32 time;
+  ClutterEventFlags flags;
+  ClutterStage *stage;
+  ClutterActor *source;
+
+  ClutterTouchpadGesturePhase phase;
+  gfloat x;
+  gfloat y;
+  gfloat dx;
+  gfloat dy;
+  gfloat angle_delta;
+  gfloat scale;
+};
+
+/**
+ * ClutterTouchpadSwipeEvent
+ * @type: event type
+ * @time: event time
+ * @flags: event flags
+ * @stage: event source stage
+ * @source: event source actor (unused)
+ * @phase: the current phase of the gesture
+ * @n_fingers: the number of fingers triggering the swipe
+ * @x: the X coordinate of the pointer, relative to the stage
+ * @y: the Y coordinate of the pointer, relative to the stage
+ * @dx: movement delta of the pinch focal point in the X axis
+ * @dy: movement delta of the pinch focal point in the Y axis
+ *
+ * Used for touchpad swipe gesture events. The current state of the
+ * gesture will be determined by the @phase field.
+ *
+ * Since: 1.24
+ */
+struct _ClutterTouchpadSwipeEvent
+{
+  ClutterEventType type;
+  guint32 time;
+  ClutterEventFlags flags;
+  ClutterStage *stage;
+  ClutterActor *source;
+
+  ClutterTouchpadGesturePhase phase;
+  guint n_fingers;
+  gfloat x;
+  gfloat y;
+  gfloat dx;
+  gfloat dy;
+};
+
 /**
  * ClutterEvent:
  *
@@ -404,6 +488,8 @@ union _ClutterEvent
   ClutterStageStateEvent stage_state;
   ClutterCrossingEvent crossing;
   ClutterTouchEvent touch;
+  ClutterTouchpadPinchEvent touchpad_pinch;
+  ClutterTouchpadSwipeEvent touchpad_swipe;
 };
 
 /**
@@ -583,6 +669,26 @@ guint32                 clutter_get_current_event_time          (void);
 CLUTTER_AVAILABLE_IN_1_2
 const ClutterEvent *    clutter_get_current_event               (void);
 
+CLUTTER_AVAILABLE_IN_1_24
+guint                   clutter_event_get_gesture_swipe_finger_count (const ClutterEvent     *event);
+
+CLUTTER_AVAILABLE_IN_1_24
+gdouble                 clutter_event_get_gesture_pinch_angle_delta  (const ClutterEvent     *event);
+
+CLUTTER_AVAILABLE_IN_1_24
+gdouble                 clutter_event_get_gesture_pinch_scale        (const ClutterEvent     *event);
+
+CLUTTER_AVAILABLE_IN_1_24
+ClutterTouchpadGesturePhase clutter_event_get_gesture_phase          (const ClutterEvent     *event);
+
+CLUTTER_AVAILABLE_IN_1_24
+void                    clutter_event_get_gesture_motion_delta       (const ClutterEvent     *event,
+                                                                      gdouble                *dx,
+                                                                      gdouble                *dy);
+
+ClutterScrollSource      clutter_event_get_scroll_source             (const ClutterEvent     *event);
+ClutterScrollFinishFlags clutter_event_get_scroll_finish_flags       (const ClutterEvent     *event);
+
 G_END_DECLS
 
 #endif /* __CLUTTER_EVENT_H__ */

data/vendor/local/include/clutter-1.0/clutter/clutter-feature.h

@@ -21,13 +21,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CLUTTER_FEATURE_H__
+#define __CLUTTER_FEATURE_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_FEATURE_H__
-#define __CLUTTER_FEATURE_H__
-
 #include <clutter/clutter-types.h>
 
 G_BEGIN_DECLS

data/vendor/local/include/clutter-1.0/clutter/clutter-fixed-layout.h

@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi@linux.intel.com>
  */
 
+#ifndef __CLUTTER_FIXED_LAYOUT_H__
+#define __CLUTTER_FIXED_LAYOUT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_FIXED_LAYOUT_H__
-#define __CLUTTER_FIXED_LAYOUT_H__
-
 #include <clutter/clutter-layout-manager.h>
 
 G_BEGIN_DECLS

data/vendor/local/include/clutter-1.0/clutter/clutter-flow-layout.h

@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi@linux.intel.com>
  */
 
+#ifndef __CLUTTER_FLOW_LAYOUT_H__
+#define __CLUTTER_FLOW_LAYOUT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_FLOW_LAYOUT_H__
-#define __CLUTTER_FLOW_LAYOUT_H__
-
 #include <clutter/clutter-layout-manager.h>
 
 G_BEGIN_DECLS

data/vendor/local/include/clutter-1.0/clutter/clutter-gesture-action.h

@@ -23,13 +23,13 @@
  *   Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
  */
 
+#ifndef __CLUTTER_GESTURE_ACTION_H__
+#define __CLUTTER_GESTURE_ACTION_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_GESTURE_ACTION_H__
-#define __CLUTTER_GESTURE_ACTION_H__
-
 #include <clutter/clutter-action.h>
 
 G_BEGIN_DECLS

data/vendor/local/include/clutter-1.0/clutter/clutter-grid-layout.h

@@ -26,13 +26,13 @@
  *   Matthias Clasen
  */
 
+#ifndef __CLUTTER_GRID_LAYOUT_H__
+#define __CLUTTER_GRID_LAYOUT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_GRID_LAYOUT_H__
-#define __CLUTTER_GRID_LAYOUT_H__
-
 #include <clutter/clutter-layout-manager.h>
 
 G_BEGIN_DECLS

data/vendor/local/include/clutter-1.0/clutter/clutter-group.h

@@ -21,13 +21,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CLUTTER_GROUP_H__
+#define __CLUTTER_GROUP_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_GROUP_H__
-#define __CLUTTER_GROUP_H__
-
 #include <glib-object.h>
 #include <clutter/clutter-types.h>
 #include <clutter/clutter-actor.h>

data/vendor/local/include/clutter-1.0/clutter/clutter-image.h

@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi@linux.intel.com>
  */
 
+#ifndef __CLUTTER_IMAGE_H__
+#define __CLUTTER_IMAGE_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_IMAGE_H__
-#define __CLUTTER_IMAGE_H__
-
 #include <cogl/cogl.h>
 #include <clutter/clutter-types.h>
 

data/vendor/local/include/clutter-1.0/clutter/clutter-input-device.h

@@ -21,13 +21,13 @@
  * Author: Emmanuele Bassi <ebassi@linux.intel.com>
  */
 
+#ifndef __CLUTTER_INPUT_DEVICE_H__
+#define __CLUTTER_INPUT_DEVICE_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_INPUT_DEVICE_H__
-#define __CLUTTER_INPUT_DEVICE_H__
-
 #include <clutter/clutter-types.h>
 
 G_BEGIN_DECLS

data/vendor/local/include/clutter-1.0/clutter/clutter-interval.h

@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi@linux.intel.com>
  */
 
+#ifndef __CLUTTER_INTERVAL_H__
+#define __CLUTTER_INTERVAL_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_INTERVAL_H__
-#define __CLUTTER_INTERVAL_H__
-
 #include <clutter/clutter-types.h>
 
 G_BEGIN_DECLS

data/vendor/local/include/clutter-1.0/clutter/clutter-keyframe-transition.h

@@ -21,13 +21,13 @@
  * Author: Emmanuele Bassi <ebassi@linux.intel.com>
  */
 
+#ifndef __CLUTTER_KEYFRAME_TRANSITION_H__
+#define __CLUTTER_KEYFRAME_TRANSITION_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_KEYFRAME_TRANSITION_H__
-#define __CLUTTER_KEYFRAME_TRANSITION_H__
-
 #include <clutter/clutter-types.h>
 #include <clutter/clutter-property-transition.h>
 

data/vendor/local/include/clutter-1.0/clutter/clutter-layout-manager.h

@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi@linux.intel.com>
  */
 
+#ifndef __CLUTTER_LAYOUT_MANAGER_H__
+#define __CLUTTER_LAYOUT_MANAGER_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_LAYOUT_MANAGER_H__
-#define __CLUTTER_LAYOUT_MANAGER_H__
-
 #include <clutter/clutter-types.h>
 
 G_BEGIN_DECLS

data/vendor/local/include/clutter-1.0/clutter/clutter-layout-meta.h

@@ -22,13 +22,13 @@
  *      Emmanuele Bassi <ebassi@linux.intel.com>
  */
 
+#ifndef __CLUTTER_LAYOUT_META_H__
+#define __CLUTTER_LAYOUT_META_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_LAYOUT_META_H__
-#define __CLUTTER_LAYOUT_META_H__
-
 #include <clutter/clutter-types.h>
 #include <clutter/clutter-child-meta.h>
 #include <clutter/clutter-layout-manager.h>

data/vendor/local/include/clutter-1.0/clutter/clutter-macros.h

@@ -19,13 +19,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CLUTTER_MACROS_H__
+#define __CLUTTER_MACROS_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_MACROS_H__
-#define __CLUTTER_MACROS_H__
-
 #include <clutter/clutter-version.h>
 
 /**
@@ -96,6 +96,16 @@
 #define _CLUTTER_EXTERN extern
 #endif
 
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || \
+  __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 4)
+#define _CLUTTER_GNUC_DO_PRAGMA(x) _Pragma(G_STRINGIFY (x))
+#define _CLUTTER_DEPRECATED_MACRO _CLUTTER_GNUC_DO_PRAGMA(GCC warning "Deprecated macro")
+#define _CLUTTER_DEPRECATED_MACRO_FOR(f) _CLUTTER_GNUC_DO_PRAGMA(GCC warning #f)
+#else
+#define _CLUTTER_DEPRECATED_MACRO
+#define _CLUTTER_DEPRECATED_MACRO_FOR(f)
+#endif
+
 /* these macros are used to mark deprecated functions, and thus have to be
  * exposed in a public header.
  *
@@ -106,10 +116,14 @@
 #define CLUTTER_DEPRECATED _CLUTTER_EXTERN
 #define CLUTTER_DEPRECATED_FOR(f) _CLUTTER_EXTERN
 #define CLUTTER_UNAVAILABLE(maj,min) _CLUTTER_EXTERN
+#define CLUTTER_DEPRECATED_MACRO
+#define CLUTTER_DEPRECATED_MACRO_FOR(f)
 #else
 #define CLUTTER_DEPRECATED G_DEPRECATED _CLUTTER_EXTERN
 #define CLUTTER_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f) _CLUTTER_EXTERN
 #define CLUTTER_UNAVAILABLE(maj,min) G_UNAVAILABLE(maj,min) _CLUTTER_EXTERN
+#define CLUTTER_DEPRECATED_MACRO _CLUTTER_DEPRECATED_MACRO
+#define CLUTTER_DEPRECATED_MACRO_FOR(f) _CLUTTER_DEPRECATED_MACRO_FOR(f)
 #endif
 
 #define CLUTTER_AVAILABLE_IN_ALL _CLUTTER_EXTERN
@@ -338,4 +352,40 @@
 # define CLUTTER_AVAILABLE_IN_1_22              _CLUTTER_EXTERN
 #endif
 
+#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_24
+# define CLUTTER_DEPRECATED_IN_1_24             CLUTTER_DEPRECATED
+# define CLUTTER_DEPRECATED_IN_1_24_FOR(f)      CLUTTER_DEPRECATED_FOR(f)
+# define CLUTTER_MACRO_DEPRECATED_IN_1_24       CLUTTER_DEPRECATED_MACRO
+# define CLUTTER_MACRO_DEPRECATED_IN_1_24_FOR(f) CLUTTER_DEPRECATED_MACRO_FOR(f)
+#else
+# define CLUTTER_DEPRECATED_IN_1_24             _CLUTTER_EXTERN
+# define CLUTTER_DEPRECATED_IN_1_24_FOR(f)      _CLUTTER_EXTERN
+# define CLUTTER_MACRO_DEPRECATED_IN_1_24
+# define CLUTTER_MACRO_DEPRECATED_IN_1_24_FOR(f)
+#endif
+
+#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_24
+# define CLUTTER_AVAILABLE_IN_1_24              CLUTTER_UNAVAILABLE(1, 24)
+#else
+# define CLUTTER_AVAILABLE_IN_1_24              _CLUTTER_EXTERN
+#endif
+
+#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_26
+# define CLUTTER_DEPRECATED_IN_1_26             CLUTTER_DEPRECATED
+# define CLUTTER_DEPRECATED_IN_1_26_FOR(f)      CLUTTER_DEPRECATED_FOR(f)
+# define CLUTTER_MACRO_DEPRECATED_IN_1_26       CLUTTER_DEPRECATED_MACRO
+# define CLUTTER_MACRO_DEPRECATED_IN_1_26_FOR(f) CLUTTER_DEPRECATED_MACRO_FOR(f)
+#else
+# define CLUTTER_DEPRECATED_IN_1_26             _CLUTTER_EXTERN
+# define CLUTTER_DEPRECATED_IN_1_26_FOR(f)      _CLUTTER_EXTERN
+# define CLUTTER_MACRO_DEPRECATED_IN_1_26
+# define CLUTTER_MACRO_DEPRECATED_IN_1_26_FOR(f)
+#endif
+
+#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_26
+# define CLUTTER_AVAILABLE_IN_1_26              CLUTTER_UNAVAILABLE(1, 26)
+#else
+# define CLUTTER_AVAILABLE_IN_1_26              _CLUTTER_EXTERN
+#endif
+
 #endif /* __CLUTTER_MACROS_H__ */