Changeset bc6d81d

Timestamp:

Sep 27, 2011, 4:19:08 PM (12 years ago)

Author:

GitHub Merge Button <merge-button@github.com>

Parents:

bbd0cf1 (diff), 8e40da74 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 8e40da7419b6431d25fbdbc22d60b91b64994bb4 into bbd0cf162e91b3b75e5ee8670e46db64431aa63b

File:

• window.c (modified) (1 diff)

window.c

@@ -441 +441 @@
 }
 
+static bool _owl_window_is_subtree_dirty(owl_window *w)
+{
+  owl_window *child;
+
+  if (w->dirty)
+    return true;
+  for (child = w->child;
+       child != NULL;
+       child = child->next) {
+    if (child->dirty_subtree)
+      return true;
+  }
+  return false;
+}
+
 static void _owl_window_redraw_subtree(owl_window *w)
 {
   FuncOneArg ptr = (FuncOneArg)_owl_window_redraw_subtree;
+
   if (!w->dirty_subtree)
     return;
+
   _owl_window_redraw(w);
   owl_window_children_foreach(w, first_arg_only, &ptr);
-  w->dirty_subtree = 0;
+
+  /* Clear the dirty_subtree bit, unless a child doesn't have it
+   * cleared because we dirtied a window in redraw. Dirtying a
+   * non-descendant window during a redraw handler is
+   * discouraged. Redraw will not break, but it is undefined whether
+   * the dirty is delayed to the next event loop iteration. */
+  if (_owl_window_is_subtree_dirty(w)) {
+    owl_function_debugmsg("subtree still dirty after one iteration!");
+  } else {
+    w->dirty_subtree = 0;
+  }
 }