[maemo-commits] [maemo-commits] r17169 - in projects/haf/trunk/clutter: clutter debian

[From: subversion at stage.maemo.org]

Author: gw
Date: 2009-01-14 12:28:34 +0200 (Wed, 14 Jan 2009)
New Revision: 17169

Modified:
   projects/haf/trunk/clutter/clutter/clutter-main.h
   projects/haf/trunk/clutter/clutter/clutter-stage.c
   projects/haf/trunk/clutter/debian/changelog
Log:
Changed delay back to 0, and added code so this is understood and 
display goes back to updating immediately.



Modified: projects/haf/trunk/clutter/clutter/clutter-main.h
===================================================================
--- projects/haf/trunk/clutter/clutter/clutter-main.h	2009-01-14 10:23:41 UTC (rev 17168)
+++ projects/haf/trunk/clutter/clutter/clutter-main.h	2009-01-14 10:28:34 UTC (rev 17169)
@@ -79,13 +79,13 @@
 #define CLUTTER_PRIORITY_TIMELINE       (G_PRIORITY_DEFAULT + 30)
 
 /**
- * CLUTTER_REDRAW_INTERVAL:
+ * CLUTTER_REDRAW_DAMAGE_INTERVAL:
  *
- * The amount of time between a redraw request and the actual redraw.
+ * The amount of time between a damage redraw request and the actual redraw.
  *
  * Since: 0.8.2-maemo
  */
-#define CLUTTER_REDRAW_INTERVAL         (10)
+#define CLUTTER_REDRAW_DAMAGE_INTERVAL         (0)
 
 /* Initialisation */
 void             clutter_base_init        (void);

Modified: projects/haf/trunk/clutter/clutter/clutter-stage.c
===================================================================
--- projects/haf/trunk/clutter/clutter/clutter-stage.c	2009-01-14 10:23:41 UTC (rev 17168)
+++ projects/haf/trunk/clutter/clutter/clutter-stage.c	2009-01-14 10:28:34 UTC (rev 17169)
@@ -1988,15 +1988,26 @@
       CLUTTER_TIMESTAMP (SCHEDULER, "Adding idle source for stage: %p", stage);
 
       /* FIXME: weak_ref self in case we disappear before paint? */
-      stage->priv->update_idle =
-        clutter_threads_add_timeout_full ( CLUTTER_PRIORITY_REDRAW,
-                                           CLUTTER_REDRAW_INTERVAL,
-                                           redraw_update_idle,
-                                           stage,
-                                           NULL);
-      /* we're rendering with a timeout here so we can stop
-       * double-redraws we're doing when we get multiple XDamage events
-       * for what should be a single frame. */
+      if (CLUTTER_REDRAW_DAMAGE_INTERVAL > 0)
+        {
+          stage->priv->update_idle =
+            clutter_threads_add_timeout_full ( CLUTTER_PRIORITY_REDRAW,
+                                               CLUTTER_REDRAW_DAMAGE_INTERVAL,
+                                               redraw_update_idle,
+                                               stage,
+                                               NULL);
+          /* we're rendering with a timeout here so we can stop
+           * double-redraws we're doing when we get multiple XDamage events
+           * for what should be a single frame. */
+        }
+      else
+        {
+          stage->priv->update_idle =
+                  clutter_threads_add_idle_full (CLUTTER_PRIORITY_REDRAW,
+                                                 redraw_update_idle,
+                                                 stage,
+                                                 NULL);
+        }
     }
 }
 

Modified: projects/haf/trunk/clutter/debian/changelog
===================================================================
--- projects/haf/trunk/clutter/debian/changelog	2009-01-14 10:23:41 UTC (rev 17168)
+++ projects/haf/trunk/clutter/debian/changelog	2009-01-14 10:28:34 UTC (rev 17169)
@@ -1,8 +1,9 @@
 clutter (0.8.2-0maemo14~unreleased) unstable; urgency=low
 
-  * Modified clutter_stage_redraw_damage to set the stage to be redrawn with
+  * Modified clutter_stage_redraw_damage so that the stage can be redrawn with
     a delay - which helps get rid of multiple redraws when we get >1 XDamage
-    events within a few ms of each other.
+    events within a few ms of each other. Currently this is set to 0 delay as 
+    we found it didn't help much.
   * Added CLUTTER_TEXTURE_FLAG_16_BIT to force 16 bit textures in 
     set_from_rgb_data