GdkWindowX11: the root window is not a toplevel

[~andy/gtk] / gdk / gdkframeclockidle.c

diff --git a/gdk/gdkframeclockidle.c b/gdk/gdkframeclockidle.c
index da05a9698acdb7ce0d3f4a892a86d13aa4f6816c..d07c1d80bb7d4e3f1297759c5b110e7e538453c7 100644 (file)
--- a/gdk/gdkframeclockidle.c
+++ b/gdk/gdkframeclockidle.c
@@ -37,9 +37,9 @@ struct _GdkFrameClockIdlePrivate
 {
   GTimer *timer;
   /* timer_base is used to avoid ever going backward */
-  guint64 timer_base;
-  guint64 frame_time;
-  guint64 min_next_frame_time;
+  gint64 timer_base;
+  gint64 frame_time;
+  gint64 min_next_frame_time;
   gint64 sleep_serial;
 
   guint flush_idle_id;
@@ -55,15 +55,13 @@ struct _GdkFrameClockIdlePrivate
 static gboolean gdk_frame_clock_flush_idle (void *data);
 static gboolean gdk_frame_clock_paint_idle (void *data);
 
-static void gdk_frame_clock_idle_finalize             (GObject                *object);
-
 G_DEFINE_TYPE (GdkFrameClockIdle, gdk_frame_clock_idle, GDK_TYPE_FRAME_CLOCK)
 
 static gint64 sleep_serial;
 static gint64 sleep_source_prepare_time;
 static GSource *sleep_source;
 
-gboolean
+static gboolean
 sleep_source_prepare (GSource *source,
                       gint    *timeout)
 {
@@ -72,7 +70,7 @@ sleep_source_prepare (GSource *source,
   return FALSE;
 }
 
-gboolean
+static gboolean
 sleep_source_check (GSource *source)
 {
   if (g_source_get_time (source) != sleep_source_prepare_time)
@@ -81,7 +79,7 @@ sleep_source_check (GSource *source)
   return FALSE;
 }
 
-gboolean
+static gboolean
 sleep_source_dispatch (GSource     *source,
                        GSourceFunc  callback,
                        gpointer     user_data)
@@ -121,26 +119,35 @@ gdk_frame_clock_idle_init (GdkFrameClockIdle *frame_clock_idle)
                                                         GdkFrameClockIdlePrivate);
   priv = frame_clock_idle->priv;
 
-  priv->timer = g_timer_new ();
   priv->freeze_count = 0;
 }
 
 static void
-gdk_frame_clock_idle_finalize (GObject *object)
+gdk_frame_clock_idle_dispose (GObject *object)
 {
   GdkFrameClockIdlePrivate *priv = GDK_FRAME_CLOCK_IDLE (object)->priv;
 
-  g_timer_destroy (priv->timer);
+  if (priv->flush_idle_id != 0)
+    {
+      g_source_remove (priv->flush_idle_id);
+      priv->flush_idle_id = 0;
+    }
+
+  if (priv->paint_idle_id != 0)
+    {
+      g_source_remove (priv->paint_idle_id);
+      priv->paint_idle_id = 0;
+    }
 
-  G_OBJECT_CLASS (gdk_frame_clock_idle_parent_class)->finalize (object);
+  G_OBJECT_CLASS (gdk_frame_clock_idle_parent_class)->dispose (object);
 }
 
-static guint64
+static gint64
 compute_frame_time (GdkFrameClockIdle *idle)
 {
   GdkFrameClockIdlePrivate *priv = idle->priv;
-  guint64 computed_frame_time;
-  guint64 elapsed;
+  gint64 computed_frame_time;
+  gint64 elapsed;
 
   elapsed = g_get_monotonic_time () + priv->timer_base;
   if (elapsed < priv->frame_time)
@@ -160,11 +167,11 @@ compute_frame_time (GdkFrameClockIdle *idle)
   return computed_frame_time;
 }
 
-static guint64
+static gint64
 gdk_frame_clock_idle_get_frame_time (GdkFrameClock *clock)
 {
   GdkFrameClockIdlePrivate *priv = GDK_FRAME_CLOCK_IDLE (clock)->priv;
-  guint64 computed_frame_time;
+  gint64 computed_frame_time;
 
   /* can't change frame time during a paint */
   if (priv->phase != GDK_FRAME_CLOCK_PHASE_NONE &&
@@ -196,8 +203,8 @@ maybe_start_idle (GdkFrameClockIdle *clock_idle)
 
       if (priv->min_next_frame_time != 0)
         {
-          guint64 now = compute_frame_time (clock_idle);
-          guint64 min_interval_us = MAX (priv->min_next_frame_time, now) - now;
+          gint64 now = compute_frame_time (clock_idle);
+          gint64 min_interval_us = MAX (priv->min_next_frame_time, now) - now;
           min_interval = (min_interval_us + 500) / 1000;
         }
 
@@ -220,8 +227,6 @@ maybe_start_idle (GdkFrameClockIdle *clock_idle)
                                                               gdk_frame_clock_paint_idle,
                                                               g_object_ref (clock_idle),
                                                               (GDestroyNotify) g_object_unref);
-
-          g_signal_emit_by_name (clock_idle, "frame-requested");
         }
     }
 }
@@ -286,7 +291,7 @@ gdk_frame_clock_paint_idle (void *data)
 
   if (priv->phase > GDK_FRAME_CLOCK_PHASE_BEFORE_PAINT)
     {
-      timings = gdk_frame_clock_get_current_frame_timings (clock);
+      timings = gdk_frame_clock_get_current_timings (clock);
     }
 
   if (!skip_to_resume_events)
@@ -302,12 +307,10 @@ gdk_frame_clock_paint_idle (void *data)
               priv->frame_time = compute_frame_time (clock_idle);
 
               _gdk_frame_clock_begin_frame (clock);
-              timings = gdk_frame_clock_get_current_frame_timings (clock);
+              timings = gdk_frame_clock_get_current_timings (clock);
 
-              gdk_frame_timings_set_frame_time (timings, priv->frame_time);
-
-              gdk_frame_timings_set_slept_before (timings,
-                                                  priv->sleep_serial != get_sleep_serial ());
+              timings->frame_time = priv->frame_time;
+              timings->slept_before = priv->sleep_serial != get_sleep_serial ();
 
               priv->phase = GDK_FRAME_CLOCK_PHASE_BEFORE_PAINT;
 
@@ -336,7 +339,7 @@ gdk_frame_clock_paint_idle (void *data)
                 {
                   if (priv->phase != GDK_FRAME_CLOCK_PHASE_LAYOUT &&
                       (priv->requested & GDK_FRAME_CLOCK_PHASE_LAYOUT))
-                    _gdk_frame_timings_set_layout_start_time (timings, g_get_monotonic_time ());
+                    timings->layout_start_time = g_get_monotonic_time ();
                 }
 #endif /* G_ENABLE_DEBUG */
 
@@ -355,7 +358,7 @@ gdk_frame_clock_paint_idle (void *data)
                 {
                   if (priv->phase != GDK_FRAME_CLOCK_PHASE_PAINT &&
                       (priv->requested & GDK_FRAME_CLOCK_PHASE_PAINT))
-                    _gdk_frame_timings_set_paint_start_time (timings, g_get_monotonic_time ());
+                    timings->paint_start_time = g_get_monotonic_time ();
                 }
 #endif /* G_ENABLE_DEBUG */
 
@@ -377,7 +380,7 @@ gdk_frame_clock_paint_idle (void *data)
 
 #ifdef G_ENABLE_DEBUG
               if ((_gdk_debug_flags & GDK_DEBUG_FRAMES) != 0)
-                _gdk_frame_timings_set_frame_end_time (timings, g_get_monotonic_time ());
+                timings->frame_end_time = g_get_monotonic_time ();
 #endif /* G_ENABLE_DEBUG */
             }
         case GDK_FRAME_CLOCK_PHASE_RESUME_EVENTS:
@@ -388,7 +391,7 @@ gdk_frame_clock_paint_idle (void *data)
 #ifdef G_ENABLE_DEBUG
   if ((_gdk_debug_flags & GDK_DEBUG_FRAMES) != 0)
     {
-      if (gdk_frame_timings_get_complete (timings))
+      if (timings->complete)
         _gdk_frame_clock_debug_print_timings (clock, timings);
     }
 #endif /* G_ENABLE_DEBUG */
@@ -432,14 +435,6 @@ gdk_frame_clock_idle_request_phase (GdkFrameClock      *clock,
   maybe_start_idle (clock_idle);
 }
 
-static GdkFrameClockPhase
-gdk_frame_clock_idle_get_requested (GdkFrameClock *clock)
-{
-  GdkFrameClockIdlePrivate *priv = GDK_FRAME_CLOCK_IDLE (clock)->priv;
-
-  return priv->requested;
-}
-
 static void
 gdk_frame_clock_idle_freeze (GdkFrameClock *clock)
 {
@@ -490,11 +485,10 @@ gdk_frame_clock_idle_class_init (GdkFrameClockIdleClass *klass)
   GObjectClass *gobject_class = (GObjectClass*) klass;
   GdkFrameClockClass *frame_clock_class = (GdkFrameClockClass *)klass;
 
-  gobject_class->finalize     = gdk_frame_clock_idle_finalize;
+  gobject_class->dispose = gdk_frame_clock_idle_dispose;
 
   frame_clock_class->get_frame_time = gdk_frame_clock_idle_get_frame_time;
   frame_clock_class->request_phase = gdk_frame_clock_idle_request_phase;
-  frame_clock_class->get_requested = gdk_frame_clock_idle_get_requested;
   frame_clock_class->freeze = gdk_frame_clock_idle_freeze;
   frame_clock_class->thaw = gdk_frame_clock_idle_thaw;