improve responsiveness with large workspaces

Author: jcupitt

CHANGELOG.md

@@ -4,6 +4,7 @@
 - fix menu state init
 - save and restore more view settings
 - add "Merge column" and "Merge tab" submenus
+- update interface during recomp, update regions during drag
 
 ## 9.0.9 2025/05/28
 

src/imageui.c

@@ -1181,6 +1181,14 @@ imageui_drag_begin(GtkEventControllerMotion *self,
 	}
 }
 
+static void
+imageui_regionview_update(Imageui *imageui, Regionview *regionview)
+{
+	regionview->draw_area = regionview->our_area;
+	regionview->draw_type = regionview->type;
+	imageui_queue_draw(imageui);
+}
+
 static void
 imageui_drag_update(GtkEventControllerMotion *self,
 	gdouble offset_x, gdouble offset_y, gpointer user_data)
@@ -1206,6 +1214,13 @@ imageui_drag_update(GtkEventControllerMotion *self,
 			imageui->tilesource->image_width, imageui->tilesource->image_height,
 			offset_x / zoom, offset_y / zoom);
 
+		/* Refresh immediately .. gives immediate feedback during drag in large
+		 * workspaces, especially on windows.
+		 */
+		imageui_regionview_update(imageui, imageui->grabbed);
+
+		/* And nudge background recomp.
+		 */
 		regionview_model_update(imageui->grabbed);
 
 		break;
@@ -1214,13 +1229,7 @@ imageui_drag_update(GtkEventControllerMotion *self,
 		regionview_resize(imageui->floating, imagewindow_get_modifiers(win),
 			imageui->tilesource->image_width, imageui->tilesource->image_height,
 			offset_x / zoom, offset_y / zoom);
-
-		// fine to do an immediate redraw, since we don't rely on calc for
-		// position
-		imageui->floating->draw_area = imageui->floating->our_area;
-		imageui->floating->draw_type = imageui->floating->type;
-		imageui_queue_draw(imageui);
-
+		imageui_regionview_update(imageui, imageui->floating);
 		break;
 
 	case IMAGEUI_SCROLL:
@@ -1312,6 +1321,7 @@ imageui_drag_end(GtkEventControllerMotion *self,
 		break;
 
 	case IMAGEUI_SELECT:
+		regionview_model_update(imageui->grabbed);
 		VIPS_UNREF(imageui->grabbed);
 		break;
 

src/progress.c

@@ -325,3 +325,4 @@ progress_end(void)
 	ProgressEvent *event = progress_event_new(SIG_END, 0, 0, "");
 	progress_event_signal(event);
 }
+

src/reduce.c

@@ -1102,6 +1102,9 @@ reduce_spine(Reduce *rc, PElement *out)
 reduce_start:
 	reduce_total_recomputations += 1;
 	if ((reduce_total_recomputations % 100000) == 0) {
+		// helps keep the interface live
+		process_events();
+
 		if (progress_update_expr(reduce_current_expr)) {
 			error_top(_("Cancelled"));
 			error_sub(_("evaluation cancelled"));

src/regionview.c

@@ -200,7 +200,6 @@ regionview_model_update(Regionview *regionview)
 
 	if (classmodel) {
 		classmodel_update_view(classmodel);
-
 		symbol_recalculate_all();
 	}
 

src/row.c

@@ -1596,7 +1596,8 @@ row_recomp_all(Row *top_row)
 
 	/* Rebuild all dirty rows.
 	 */
-	while (!top_row->err && top_row->recomp) {
+	while (!top_row->err &&
+		top_row->recomp) {
 		Row *dirty_row = ROW(top_row->recomp->data);
 
 #ifdef DEBUG_ROW
@@ -1630,6 +1631,10 @@ row_recomp_all(Row *top_row)
 		printf("row_recomp_all: after row recomp, top value now ");
 		pgraph(&top_row->expr->root);
 #endif /*DEBUG*/
+
+		/* So we don't stall updates for too long.
+		 */
+		process_events();
 	}
 
 	workspace_error_sanity(top_row->ws);
@@ -1685,7 +1690,7 @@ row_recomp(Row *row)
 	 */
 	row_recomp_all(top_row);
 
-	/* Our workspace may have been closed in a callback: bail out.
+	/* Our workspace may have been closed in a callback.
 	 */
 	if (!top_row->sym)
 		return;
@@ -1740,7 +1745,7 @@ row_recomp(Row *row)
 		 */
 		row_recomp_all(top_row);
 
-		/* Our workspace may have been closed in a callback: bail out.
+		/* Our workspace may have been closed in a callback.
 		 */
 		if (!top_row->sym)
 			return;

src/symbol.c

@@ -942,11 +942,11 @@ symbol_recalculate_sub(Symbol *sym)
 	gboolean result = TRUE;
 
 #ifdef DEBUG_TIME
-	static GTimer *timer = NULL;
+    static GTimer *timer = NULL;
 
-	if (!timer)
-		timer = g_timer_new();
-	g_timer_reset(timer);
+    if (!timer)
+        timer = g_timer_new();
+    g_timer_reset(timer);
 #endif /*DEBUG_TIME*/
 
 	g_assert(is_value(sym));
@@ -972,9 +972,9 @@ symbol_recalculate_sub(Symbol *sym)
 	}
 
 #ifdef DEBUG_TIME
-	printf("symbol_recalculate_sub: ");
-	symbol_name_scope_print(sym);
-	printf(" %g\n", g_timer_elapsed(timer, NULL));
+    printf("symbol_recalculate_sub: ");
+    symbol_name_scope_print(sym);
+    printf(" %g\n", g_timer_elapsed(timer, NULL));
 #endif /*DEBUG_TIME*/
 
 	return result;
@@ -1009,7 +1009,8 @@ symbol_get_last_calc(void)
  */
 static gboolean symbol_running = FALSE;
 
-/* Recalc a symbol ... with error checks.
+/* Recalc a symbol with error checks. This can succeed, stop with a timeout,
+ * or fail with an error.
  */
 static void *
 symbol_recalculate_leaf_sub(Symbol *sym)
@@ -1034,6 +1035,7 @@ symbol_recalculate_leaf_sub(Symbol *sym)
 
 		return sym;
 	}
+
 	if (!sym->dirty)
 		return NULL;
 	if (!is_value(sym)) {
@@ -1045,14 +1047,19 @@ symbol_recalculate_leaf_sub(Symbol *sym)
 
 	reduce_context->heap->filled = FALSE;
 	symbol_running = TRUE;
-	progress_begin();
 	symbol_note_calc_name(sym);
-	if (!symbol_recalculate_sub(sym) ||
+	progress_begin();
+
+	// false for error, true for success or timeout
+	gboolean result = symbol_recalculate_sub(sym);
+
+	symbol_running = FALSE;
+	progress_end();
+
+	if (!result ||
 		reduce_context->heap->filled) {
 		if (sym->expr)
 			expr_error_set(sym->expr);
-		symbol_running = FALSE;
-		progress_end();
 
 #ifdef DEBUG_RECALC
 		if (sym->expr)
@@ -1063,11 +1070,9 @@ symbol_recalculate_leaf_sub(Symbol *sym)
 
 		return sym;
 	}
-	symbol_running = FALSE;
-	progress_end();
 
-	/* Have we discovered any dirty children? If not, we've cleaned this
-	 * sym.
+	/* Any dirty children? If not, we've cleaned this sym and it can come
+	 * off the leaf set.
 	 */
 	if (!sym->ndirtychildren) {
 		symbol_dirty_clear(sym);
@@ -1124,11 +1129,11 @@ symbol_recalculate_leaf(void)
 		/* We can get errors during backtracking, don't report here.
 		 */
 
-		/* Note a pending GC.
+		/* Queue a GC.
 		 */
 		(void) heap_gc_request(reduce_context->heap);
 
-		/* We have recalculated a symbol.
+		/* We have made some progress.
 		 */
 		recalculated = TRUE;
 	}
@@ -1143,10 +1148,6 @@ static gint symbol_idle_id = 0;
 static gboolean
 symbol_recalculate_idle(void *user_data)
 {
-	static GTimer *timer = NULL;
-
-	gboolean run_again;
-
 #ifdef DEBUG_RECALC
 	printf("symbol_recalculate_idle:\n");
 #endif /*DEBUG_RECALC*/
@@ -1158,34 +1159,22 @@ symbol_recalculate_idle(void *user_data)
 		 */
 		return TRUE;
 
-	if (!timer)
-		timer = g_timer_new();
-
-	g_timer_reset(timer);
-
-	run_again = TRUE;
-
-	if (!mainwindow_auto_recalc)
-		/* Auto-calc has been turned off during a recomp.
-		 */
-		run_again = FALSE;
-	else
-		while (g_timer_elapsed(timer, NULL) < 0.1)
-			if (!symbol_recalculate_leaf()) {
-				run_again = FALSE;
-				break;
-			}
+	if (mainwindow_auto_recalc)
+		while (symbol_recalculate_leaf())
+			;
 
-	if (!run_again) {
+	if (!symbol_leaf_next()) {
 #ifdef DEBUG_RECALC
 		printf("symbol_recalculate_idle: bg recalc done\n");
 #endif /*DEBUG_RECALC*/
 
 		symbol_idle_id = 0;
 		progress_end();
-	}
 
-	return run_again;
+		return FALSE;
+	}
+	else
+		return TRUE;
 }
 
 /* Recalculate ... either nudge the idle recomp, or in batch mode, do a recomp

src/symbol.h

@@ -177,6 +177,7 @@ void *symbol_strip(Symbol *sym);
 void symbol_state_change(Symbol *sym);
 
 const char *symbol_get_last_calc(void);
+gboolean symbol_recalculate_timeout(void);
 gboolean symbol_recalculate_check(Symbol *sym);
 void symbol_recalculate_all_force(gboolean now);
 void symbol_recalculate_all(void);