RTFL.

3 files changed, 22 insertions, 5 deletions

diff --git a/dw/outofflowmgr.cc b/dw/outofflowmgr.cc
index b5fc7ad0..be13447d 100644
--- a/dw/outofflowmgr.cc
+++ b/dw/outofflowmgr.cc
@@ -81,6 +81,9 @@ OutOfFlowMgr::Float::Float (OutOfFlowMgr *oofm, Widget *widget,
       DBG_OBJ_SET_NUM_O (widget, "<Float>.size.width", size.width);
       DBG_OBJ_SET_NUM_O (widget, "<Float>.size.ascent", size.ascent);
       DBG_OBJ_SET_NUM_O (widget, "<Float>.size.descent", size.descent);
+      DBG_OBJ_SET_BOOL_O (widget, "<Float>.dirty", dirty);
+      DBG_OBJ_SET_BOOL_O (widget, "<Float>.sizeChangedSinceLastAllocation",
+                         sizeChangedSinceLastAllocation);
    }
 }
 
@@ -1342,6 +1345,11 @@ void OutOfFlowMgr::markSizeChange (int ref)
 
       vloat->dirty = vloat->sizeChangedSinceLastAllocation = true;
 
+      DBG_OBJ_SET_BOOL_O (vloat->getWidget (), "<Float>.dirty", vloat->dirty);
+      DBG_OBJ_SET_BOOL_O (vloat->getWidget (),
+                          "<Float>.sizeChangedSinceLastAllocation",
+                          vloat->sizeChangedSinceLastAllocation);
+
       // The generating block is told directly about this. (Others later, in
       // sizeAllocateEnd.) Could be faster (cf. hasRelationChanged, which
       // differentiates many special cases), but the size is not known yet,
@@ -2067,6 +2075,7 @@ void OutOfFlowMgr::ensureFloatSize (Float *vloat)
       vloat->getWidget()->sizeRequest (&vloat->size);
       vloat->cbLineBreakWidth = containingBlock->getLineBreakWidth ();
       vloat->dirty = false;
+      DBG_OBJ_SET_BOOL_O (vloat->getWidget (), "<Float>.dirty", vloat->dirty);
 
       DBG_OBJ_MSGF ("resize.oofm", 1, "size: %d * (%d + %d)",
                     vloat->size.width, vloat->size.ascent, vloat->size.descent);
diff --git a/dw/widget.cc b/dw/widget.cc
index e7bd5f8f..35316c4c 100644
--- a/dw/widget.cc
+++ b/dw/widget.cc
@@ -1362,7 +1362,7 @@ void Widget::correctExtremesOfChild (Widget *child, Extremes *extremes)
 
    // TODO Extremes only corrected?
 
-   DBG_OBJ_ENTER ("resize", 0, "correctExtremedOfChild", "%p, %d / %d",
+   DBG_OBJ_ENTER ("resize", 0, "correctExtremesOfChild", "%p, %d / %d",
                   child, extremes->minWidth, extremes->maxWidth);
 
    if (style::isAbsLength (child->getStyle()->width)) {
diff --git a/lout/debug.hh b/lout/debug.hh
index 2b97778a..d4e545a2 100644
--- a/lout/debug.hh
+++ b/lout/debug.hh
@@ -231,6 +231,13 @@
       fflush (stdout); \
    } D_STMT_END
 
+#define DBG_OBJ_SET_PTR_O(obj, var, val)         \
+   D_STMT_START { \
+      printf (RTFL_PREFIX_FMT "obj-set:%p:%s:%p\n", \
+              RTFL_PREFIX_ARGS, obj, var, val); \
+      fflush (stdout); \
+   } D_STMT_END
+
 #define DBG_OBJ_SET_BOOL(var, val) \
    D_STMT_START { \
       printf (RTFL_PREFIX_FMT "obj-set:%p:%s:%s\n", \
@@ -238,10 +245,10 @@
       fflush (stdout); \
    } D_STMT_END
 
-#define DBG_OBJ_SET_PTR_O(obj, var, val)         \
+#define DBG_OBJ_SET_BOOL_O(obj, var, val)        \
    D_STMT_START { \
-      printf (RTFL_PREFIX_FMT "obj-set:%p:%s:%p\n", \
-              RTFL_PREFIX_ARGS, obj, var, val); \
+      printf (RTFL_PREFIX_FMT "obj-set:%p:%s:%s\n", \
+              RTFL_PREFIX_ARGS, obj, var, val ? "true" : "false");     \
       fflush (stdout); \
    } D_STMT_END
 
@@ -337,8 +344,9 @@
 #define DBG_OBJ_SET_SYM(var, val)                              D_STMT_NOP
 #define DBG_OBJ_SET_STR(var, val)                              D_STMT_NOP
 #define DBG_OBJ_SET_PTR(var, val)                              D_STMT_NOP
-#define DBG_OBJ_SET_BOOL(var, val)                             D_STMT_NOP
 #define DBG_OBJ_SET_PTR_O(obj, var, val)                       D_STMT_NOP
+#define DBG_OBJ_SET_BOOL(var, val)                             D_STMT_NOP
+#define DBG_OBJ_SET_BOOL_O(obj, var, val)                      D_STMT_NOP
 #define DBG_OBJ_ARRSET_NUM(var, ind, val)                      D_STMT_NOP
 #define DBG_OBJ_ARRSET_SYM(var, ind, val)                      D_STMT_NOP
 #define DBG_OBJ_ARRSET_STR(var, ind, val)                      D_STMT_NOP