Change GdkFrameClock from an interface to a class

[~andy/gtk] / gdk / gdkframeclock.h

diff --git a/gdk/gdkframeclock.h b/gdk/gdkframeclock.h
index 624f6fef4c267ee52d2024496ce43621e025a78c..608d74320b4b8fe77f200044a723dc7449ebf0c0 100644 (file)
--- a/gdk/gdkframeclock.h
+++ b/gdk/gdkframeclock.h
@@ -31,37 +31,20 @@
 #ifndef __GDK_FRAME_CLOCK_H__
 #define __GDK_FRAME_CLOCK_H__
 
-#include <glib-object.h>
+#include <gdk/gdkframehistory.h>
 
 G_BEGIN_DECLS
 
-typedef struct _GdkFrameClock                GdkFrameClock;
-typedef struct _GdkFrameClockInterface       GdkFrameClockInterface;
-typedef struct _GdkFrameClockTarget          GdkFrameClockTarget;
-typedef struct _GdkFrameClockTargetInterface GdkFrameClockTargetInterface;
+#define GDK_TYPE_FRAME_CLOCK            (gdk_frame_clock_get_type ())
+#define GDK_FRAME_CLOCK(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_TYPE_FRAME_CLOCK, GdkFrameClock))
+#define GDK_FRAME_CLOCK_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_FRAME_CLOCK, GdkFrameClockClass))
+#define GDK_IS_FRAME_CLOCK(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDK_TYPE_FRAME_CLOCK))
+#define GDK_IS_FRAME_CLOCK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_FRAME_CLOCK))
+#define GDK_FRAME_CLOCK_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_FRAME_CLOCK, GdkFrameClockClass))
 
-#define GDK_TYPE_FRAME_CLOCK_TARGET             (gdk_frame_clock_target_get_type ())
-#define GDK_FRAME_CLOCK_TARGET(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_TYPE_FRAME_CLOCK_TARGET, GdkFrameClockTarget))
-#define GDK_IS_FRAME_CLOCK_TARGET(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDK_TYPE_FRAME_CLOCK_TARGET))
-#define GDK_FRAME_CLOCK_TARGET_GET_IFACE(inst)  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GDK_TYPE_FRAME_CLOCK_TARGET, GdkFrameClockTargetInterface))
-
-struct _GdkFrameClockTargetInterface
-{
-  GTypeInterface base_iface;
-
-  void (*set_clock) (GdkFrameClockTarget *target,
-                     GdkFrameClock       *clock);
-};
-
-GType gdk_frame_clock_target_get_type (void) G_GNUC_CONST;
-
-void gdk_frame_clock_target_set_clock (GdkFrameClockTarget *target,
-                                       GdkFrameClock       *clock);
-
-#define GDK_TYPE_FRAME_CLOCK             (gdk_frame_clock_get_type ())
-#define GDK_FRAME_CLOCK(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_TYPE_FRAME_CLOCK, GdkFrameClock))
-#define GDK_IS_FRAME_CLOCK(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDK_TYPE_FRAME_CLOCK))
-#define GDK_FRAME_CLOCK_GET_IFACE(inst)  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GDK_TYPE_FRAME_CLOCK, GdkFrameClockInterface))
+typedef struct _GdkFrameClock              GdkFrameClock;
+typedef struct _GdkFrameClockPrivate       GdkFrameClockPrivate;
+typedef struct _GdkFrameClockClass         GdkFrameClockClass;
 
 typedef enum {
   GDK_FRAME_CLOCK_PHASE_NONE          = 0,
@@ -70,37 +53,13 @@ typedef enum {
   GDK_FRAME_CLOCK_PHASE_UPDATE        = 1 << 2,
   GDK_FRAME_CLOCK_PHASE_LAYOUT        = 1 << 3,
   GDK_FRAME_CLOCK_PHASE_PAINT         = 1 << 4,
-  GDK_FRAME_CLOCK_PHASE_AFTER_PAINT   = 1 << 5,
-  GDK_FRAME_CLOCK_PHASE_RESUME_EVENTS = 1 << 6
+  GDK_FRAME_CLOCK_PHASE_RESUME_EVENTS = 1 << 5,
+  GDK_FRAME_CLOCK_PHASE_AFTER_PAINT   = 1 << 6
 } GdkFrameClockPhase;
 
-struct _GdkFrameClockInterface
-{
-  GTypeInterface                  base_iface;
-
-  guint64  (* get_frame_time)      (GdkFrameClock *clock);
-
-  void               (* request_phase) (GdkFrameClock      *clock,
-                                        GdkFrameClockPhase  phase);
-  GdkFrameClockPhase (* get_requested) (GdkFrameClock      *clock);
-
-  void     (* freeze)              (GdkFrameClock *clock);
-  void     (* thaw)                (GdkFrameClock *clock);
-
-  /* signals */
-  /* void (* frame_requested)    (GdkFrameClock *clock); */
-  /* void (* flush_events)       (GdkFrameClock *clock); */
-  /* void (* before_paint)       (GdkFrameClock *clock); */
-  /* void (* update)             (GdkFrameClock *clock); */
-  /* void (* layout)             (GdkFrameClock *clock); */
-  /* void (* paint)              (GdkFrameClock *clock); */
-  /* void (* after_paint)        (GdkFrameClock *clock); */
-  /* void (* resume_events)      (GdkFrameClock *clock); */
-};
-
 GType    gdk_frame_clock_get_type             (void) G_GNUC_CONST;
 
-guint64  gdk_frame_clock_get_frame_time      (GdkFrameClock *clock);
+guint64  gdk_frame_clock_get_frame_time            (GdkFrameClock *clock);
 
 void               gdk_frame_clock_request_phase (GdkFrameClock      *clock,
                                                   GdkFrameClockPhase  phase);
@@ -109,12 +68,18 @@ GdkFrameClockPhase gdk_frame_clock_get_requested (GdkFrameClock      *clock);
 void     gdk_frame_clock_freeze              (GdkFrameClock *clock);
 void     gdk_frame_clock_thaw                (GdkFrameClock *clock);
 
+GdkFrameHistory *gdk_frame_clock_get_history (GdkFrameClock *clock);
+
 /* Convenience API */
 void  gdk_frame_clock_get_frame_time_val (GdkFrameClock  *clock,
                                           GTimeVal       *timeval);
 
-/* Signal emitters (used in frame clock implementations) */
-void     gdk_frame_clock_frame_requested     (GdkFrameClock *clock);
+void gdk_frame_clock_get_refresh_info (GdkFrameClock *clock,
+                                       gint64         base_time,
+                                       gint64        *refresh_interval_return,
+                                       gint64        *presentation_time_return);
+
+GdkFrameTimings *gdk_frame_clock_get_current_frame_timings (GdkFrameClock *clock);
 
 G_END_DECLS