delay row dirty until recomp

stops subrows getting stuck

Author: jcupitt

CHANGELOG.md

@@ -7,6 +7,10 @@
 - fix a segv in Colour widget edit action
 - much better next/prev/refresh in imagewindow
 - much better imagewindow focus indicator
+- new tilecache flickers less and is faster
+- matching changes in libvips 8.18 improve render speed and improve
+  cancellation of out of date renders
+- better sync of view settings between imagewindow and thumbnail
 
 ## 9.0.10 2025/06/22
 

TODO

@@ -1,21 +1,3 @@
-
-- seeing unfixable dirty rows sometimes
-
-	happened in a row containing a region as a subobject
-
-	are we updating a row while it's also being computed? can this race?
-
-	we should modify the model and queue a scan and recomp, but not update
-	the heap or mark the row dirty
-
-	exactly what variables are crashing into each opther when we mark the
-	row dirty during row recomp? can we fix this?
-
-		much easier than reworking region into a scan model
-
-
-
-
 - get judder with rotate and images smaller than the window
 
 	draw on update, then draw again on relayout

src/classmodel.c

@@ -33,7 +33,12 @@
 #define DEBUG
  */
 
-G_DEFINE_TYPE(Classmodel, classmodel, HEAPMODEL_TYPE)
+G_DEFINE_TYPE(Classmodel, classmodel, HEAPMODEL_TYPE);
+
+/* All the classmodel that have been updated ... recomp needs to mark these
+ * dirty before pickng the next row.
+ */
+static GSList *classmodel_updated = NULL;
 
 void
 image_value_init(ImageValue *image, Classmodel *classmodel)
@@ -602,6 +607,8 @@ classmodel_dispose(GObject *gobject)
 		(SListMapFn) classmodel_iimage_unlink_rev, classmodel);
 	VIPS_FREE(classmodel->filename);
 
+	classmodel_updated = g_slist_remove(classmodel_updated, classmodel);
+
 	G_OBJECT_CLASS(classmodel_parent_class)->dispose(gobject);
 }
 
@@ -1217,11 +1224,6 @@ classmodel_set_edited(Classmodel *classmodel, gboolean edited)
 
 		classmodel->edited = edited;
 		iobject_changed(IOBJECT(classmodel));
-
-		if (HEAPMODEL(classmodel)->row &&
-			HEAPMODEL(classmodel)->row->expr)
-			expr_dirty(HEAPMODEL(classmodel)->row->expr,
-				link_serial_new());
 	}
 
 	/* Mark eds for application.
@@ -1252,7 +1254,8 @@ classmodel_update(Classmodel *classmodel)
 	 * modified, we might be in parse.
 	 */
 	classmodel_set_edited(classmodel, TRUE);
-	expr_dirty(row->expr, link_serial_new());
+
+	classmodel_updated = g_slist_prepend(classmodel_updated, classmodel);
 }
 
 /* Model has been changed by a view. Mark for recomp, and since this was a
@@ -1267,6 +1270,28 @@ classmodel_update_view(Classmodel *classmodel)
 	if (row &&
 		row->expr)
 		workspace_set_modified(row->ws, TRUE);
+
+	symbol_recalculate_all();
+}
+
+static void *
+classmodel_dirty_updated_sub(void *a, void *b)
+{
+	Classmodel *classmodel = CLASSMODEL(a);
+	Row *row = HEAPMODEL(classmodel)->row;
+
+	if (row &&
+		row->expr)
+		expr_dirty(row->expr, link_serial_new());
+
+	return NULL;
+}
+
+void
+classmodel_dirty_updated(void)
+{
+	slist_map(classmodel_updated, classmodel_dirty_updated_sub, NULL);
+	VIPS_FREEF(g_slist_free, classmodel_updated);
 }
 
 /* Make a new classmodel subtype (eg. TYPE_PATHNAME) and link it on.

src/classmodel.h

@@ -153,5 +153,6 @@ GType classmodel_get_type(void);
 void classmodel_update(Classmodel *classmodel);
 void classmodel_update_view(Classmodel *classmodel);
 void classmodel_set_edited(Classmodel *classmodel, gboolean edited);
+void classmodel_dirty_updated(void);
 
 Classmodel *classmodel_new_classmodel(GType type, Rhs *rhs);

src/imageui.c

@@ -1217,8 +1217,8 @@ imageui_drag_update(GtkEventControllerMotion *self,
 		imageui_regionview_update(imageui, imageui->grabbed);
 
 		/* And nudge background recomp.
-		 */
 		regionview_model_update(imageui->grabbed);
+		 */
 
 		break;
 

src/symbol.c

@@ -1103,6 +1103,10 @@ symbol_recalculate_leaf(void)
 
 	recalculated = FALSE;
 
+	/* Mark any classmodels dirty that have updates ready.
+	 */
+	classmodel_dirty_updated();
+
 #ifdef DEBUG
 	printf("symbol_recalculate_leaves: Leaf set: ");
 	slist_map(symbol_leaf_set, (SListMapFn) dump_tiny, NULL);