another imagewindow repaint improvement

Author: jcupitt

CHANGELOG.md

@@ -1,6 +1,9 @@
 ## master
 
+## 9.0.3 2025/03/13
+
 - fix save-as
+- revise image repaint (again)
 
 ## 9.0.2 2025/03/10
 

TODO

@@ -1,181 +1,3 @@
-- try
-
-    nip4 ~/test.ws
-
-  open imagewindow, often does not paint correctlyo
-
-    seems to be a race
-
-  trace of failed repaint
-
-	looks like an unexpected thumbnail repaint is coming in half-way
-	though the main window repaint, causing the pipeline to rebuild, and
-	making the rest of the level0 tiles to be discarded
-
-	why does the thumbnail repaint cause a request? you'd think that would
-	just be served from cache
-
-
-
-row_deselect: FIXME ... call matrix_deselect()
-tilecache_init:
-tilecache_build_pyramid:
-	 2 pyr levels
-	 0) 512 x 512
-	 1) 256 x 256
-tilecache_source_tiles_changed:
-tilesource_background_load_worker: starting ...
-tilesource_set_property: ACTIVE = FALSE
-tilesource_set_property: VISIBLE = TRUE
-tilesource_background_load_worker: ... done
-tilesource_set_property: FALSECOLOUR = FALSE
-tilesource_set_property: LOG = FALSE
-tilesource_set_property: ICC = FALSE
-tilesource_set_property: MODE = ((TilesourceMode) TILESOURCE_MODE_MULTIPAGE)
-tilesource_background_load_worker: starting ...
-tilesource_background_load_worker: ... done
-
-tilecache_snapshot: scale = 1, x = 0, y = 0
-  paint_rect left = 550, top = 461, width = 0, height = 0
-tilecache_request: fetching left = 0, top = 0, width = 256, height = 256, z = 0
-tilesource_request_tile: 0 x 0
-  valid = 255
-tilecache_compute_visibility: z = 0
-viewport in level0 coordinates: left = 0, top = 0, width = 256, height = 256
-  level 0, 1 tiles, 1 visible, 0 free
-  level 1, 0 tiles, 0 visible, 0 free
-  level 0 tiles:
-    @ 0 x 0, 256 x 256, valid = 255, visible = 1, texture = 0x5d34010b1210
-  level 1 tiles:
-tilecache_snapshot: 3.573 ms
-
-tilesource_background_load_done_cb: ... unreffing
-tilesource_set_property: LOADED = TRUE
-tilesource_set_property: VISIBLE = TRUE
-tilesource_update_display:
-tilesource_update_rgb:
-tilecache_source_changed:
-tilecache_build_pyramid:
-	no geometry change, skipping pyr rebuild
-tilecache_source_tiles_changed:
-tilecache_source_changed:
-tilecache_build_pyramid:
-	no geometry change, skipping pyr rebuild
-tilecache_source_tiles_changed:
-tilesource_set_property: FALSECOLOUR = FALSE
-tilesource_set_property: LOG = FALSE
-tilesource_set_property: ICC = FALSE
-tilesource_set_property: MODE = ((TilesourceMode) TILESOURCE_MODE_MULTIPAGE)
-tilesource_background_load_done_cb: ... unreffing
-tilesource_set_property: LOADED = TRUE
-tilesource_set_property: VISIBLE = TRUE
-tilesource_update_display:
-tilesource_update_rgb:
-tilecache_source_changed:
-tilecache_build_pyramid:
-	no geometry change, skipping pyr rebuild
-tilecache_source_tiles_changed:
-tilecache_source_changed:
-tilecache_build_pyramid:
-	no geometry change, skipping pyr rebuild
-tilecache_source_tiles_changed:
-tilesource_set_property: FALSECOLOUR = FALSE
-tilesource_set_property: LOG = FALSE
-tilesource_set_property: ICC = FALSE
-tilesource_set_property: MODE = ((TilesourceMode) TILESOURCE_MODE_MULTIPAGE)
-
-tilecache_snapshot: scale = 1.80273, x = 0, y = 0
-  paint_rect left = 88, top = 0, width = 923, height = 923
-tilecache_request: fetching left = 0, top = 0, width = 256, height = 256, z = 0
-tilesource_request_tile: 0 x 0
-  valid = 0
-tilecache_request: fetching left = 256, top = 0, width = 256, height = 256, z = 0
-tilesource_request_tile: 256 x 0
-  valid = 0
-tilecache_request: fetching left = 0, top = 256, width = 256, height = 256, z = 0
-tilesource_request_tile: 0 x 256
-  valid = 0
-tilecache_request: fetching left = 256, top = 256, width = 256, height = 256, z = 0
-tilesource_request_tile: 256 x 256
-  valid = 0
-tilecache_compute_visibility: z = 0
-viewport in level0 coordinates: left = 0, top = 0, width = 512, height = 512
-  level 0, 4 tiles, 1 visible, 3 free
-  level 1, 0 tiles, 0 visible, 0 free
-  level 0 tiles:
-    @ 256 x 256, 256 x 256, valid = 0, visible = 0, texture = (nil)
-    @ 0 x 256, 256 x 256, valid = 0, visible = 0, texture = (nil)
-    @ 256 x 0, 256 x 256, valid = 0, visible = 0, texture = (nil)
-    @ 0 x 0, 256 x 256, valid = 0, visible = 1, texture = 0x5d34010b1210
-  level 1 tiles:
-tilecache_snapshot: 13.936 ms
-
-tilecache_snapshot: scale = 0.125, x = 0, y = 0
-  paint_rect left = 143, top = 0, width = 64, height = 64
-tilecache_request: fetching left = 0, top = 0, width = 512, height = 512, z = 1
-tilesource_request_tile: 0 x 0
-tilesource_update_display:
-tilesource_update_rgb:
-  valid = 0
-tilecache_compute_visibility: z = 1
-viewport in level0 coordinates: left = 0, top = 0, width = 512, height = 512
-  level 0, 0 tiles, 0 visible, 0 free
-  level 1, 1 tiles, 1 visible, 0 free
-  level 0 tiles:
-  level 1 tiles:
-    @ 0 x 0, 512 x 512, valid = 0, visible = 1, texture = 0x5d33ffc65320
-tilecache_snapshot: 4.511 ms
-
-tilecache_source_collect: left = 0, top = 0, width = 512, height = 512, z = 1
-tilesource_collect_tile: 0 x 0
-  valid = 255
-tilecache_source_collect: left = 0, top = 0, width = 512, height = 512, z = 1
-
-tilecache_snapshot: scale = 0.125, x = 0, y = 0
-  paint_rect left = 143, top = 0, width = 64, height = 64
-tilecache_compute_visibility: z = 1
-viewport in level0 coordinates: left = 0, top = 0, width = 512, height = 512
-  level 0, 0 tiles, 0 visible, 0 free
-  level 1, 1 tiles, 1 visible, 0 free
-  level 0 tiles:
-  level 1 tiles:
-    @ 0 x 0, 512 x 512, valid = 255, visible = 1, texture = 0x5d33fe3ec960
-tilecache_snapshot: 0.027 ms
-
-tilecache_snapshot: scale = 1.80273, x = 0, y = 0
-  paint_rect left = 88, top = 0, width = 923, height = 923
-tilecache_request: fetching left = 0, top = 0, width = 256, height = 256, z = 0
-tilesource_request_tile: 0 x 0
-tilesource_update_display:
-tilesource_update_rgb:
-  valid = 0
-tilecache_request: fetching left = 256, top = 0, width = 256, height = 256, z = 0
-tilesource_request_tile: 256 x 0
-  valid = 0
-tilecache_request: fetching left = 0, top = 256, width = 256, height = 256, z = 0
-tilesource_request_tile: 0 x 256
-  valid = 0
-tilecache_request: fetching left = 256, top = 256, width = 256, height = 256, z = 0
-tilesource_request_tile: 256 x 256
-  valid = 0
-tilecache_compute_visibility: z = 0
-viewport in level0 coordinates: left = 0, top = 0, width = 512, height = 512
-  level 0, 4 tiles, 1 visible, 3 free
-  level 1, 0 tiles, 0 visible, 0 free
-  level 0 tiles:
-    @ 256 x 256, 256 x 256, valid = 0, visible = 0, texture = (nil)
-    @ 0 x 256, 256 x 256, valid = 0, visible = 0, texture = (nil)
-    @ 256 x 0, 256 x 256, valid = 0, visible = 0, texture = (nil)
-    @ 0 x 0, 256 x 256, valid = 0, visible = 1, texture = 0x5d34010b1210
-  level 1 tiles:
-tilecache_snapshot: 14.875 ms
-
-
-
-
-
-
-
 # menu redesign
 
 - remove unused widgets

meson.build

@@ -1,6 +1,6 @@
 project('nip4', 'c',
   # ie. a major after nip2 8.9 for workspace save file versioning
-  version: '9.0.2-2',
+  version: '9.0.3',
   license: 'GPL',
   meson_version: '>=0.64',
   default_options: [

src/tilecache.c

@@ -93,6 +93,7 @@ tilecache_dispose(GObject *object)
 #endif /*DEBUG*/
 
 	FREESID(tilecache->tilesource_changed_sid, tilecache->tilesource);
+	FREESID(tilecache->tilesource_loaded_sid, tilecache->tilesource);
 	FREESID(tilecache->tilesource_tiles_changed_sid, tilecache->tilesource);
 	FREESID(tilecache->tilesource_collect_sid, tilecache->tilesource);
 	VIPS_UNREF(tilecache->tilesource);
@@ -278,7 +279,7 @@ tilecache_source_tiles_changed(Tilesource *tilesource,
 	int i;
 
 #ifdef DEBUG
-	printf("tilecache_source_tiles_changed:\n");
+	printf("tilecache_source_tiles_changed: %p\n", tilecache);
 #endif /*DEBUG*/
 
 	for (i = 0; i < tilecache->n_levels; i++) {
@@ -318,6 +319,21 @@ tilecache_source_changed(Tilesource *tilesource, Tilecache *tilecache)
 	tilecache_changed(tilecache);
 }
 
+/* background load is done ... no pixels have changed, but we should repaint
+ * in casewe have any missing tiles.
+ */
+static void
+tilecache_source_loaded(Tilesource *tilesource, Tilecache *tilecache)
+{
+#ifdef DEBUG
+	printf("tilecache_source_loaded:\n");
+#endif /*DEBUG*/
+
+	/* Repaint to trigger a request (if necessary).
+	 */
+	tilecache_changed(tilecache);
+}
+
 static Tile *
 tilecache_find(Tilecache *tilecache, VipsRect *tile_rect, int z)
 {
@@ -489,6 +505,7 @@ static void
 tilecache_set_tilesource(Tilecache *tilecache, Tilesource *tilesource)
 {
 	FREESID(tilecache->tilesource_changed_sid, tilecache->tilesource);
+	FREESID(tilecache->tilesource_loaded_sid, tilecache->tilesource);
 	FREESID(tilecache->tilesource_tiles_changed_sid, tilecache->tilesource);
 	FREESID(tilecache->tilesource_collect_sid, tilecache->tilesource);
 	VIPS_UNREF(tilecache->tilesource);
@@ -503,6 +520,9 @@ tilecache_set_tilesource(Tilecache *tilecache, Tilesource *tilesource)
 		tilecache->tilesource_changed_sid =
 			g_signal_connect(tilesource, "changed",
 				G_CALLBACK(tilecache_source_changed), tilecache);
+		tilecache->tilesource_loaded_sid =
+			g_signal_connect(tilesource, "loaded",
+				G_CALLBACK(tilecache_source_loaded), tilecache);
 		tilecache->tilesource_tiles_changed_sid =
 			g_signal_connect(tilesource, "tiles-changed",
 				G_CALLBACK(tilecache_source_tiles_changed), tilecache);
@@ -917,8 +937,8 @@ tilecache_snapshot(Tilecache *tilecache, GtkSnapshot *snapshot,
 	}
 
 #ifdef DEBUG
-	printf("tilecache_snapshot: scale = %g, x = %g, y = %g\n",
-		scale, x, y);
+	printf("tilecache_snapshot: %p scale = %g, x = %g, y = %g\n",
+		tilecache, scale, x, y);
 #endif /*DEBUG*/
 
 #ifdef DEBUG_VERBOSE
@@ -928,16 +948,19 @@ tilecache_snapshot(Tilecache *tilecache, GtkSnapshot *snapshot,
 		paint_rect->width, paint_rect->height);
 #endif /*DEBUG_VERBOSE*/
 
+#ifdef DEBUG_VERBOSE
+	printf("tilecache_snapshot: %p tiles are:\n", tilecache);
+	tilecache_print(tilecache);
+#endif /*DEBUG_VERBOSE*/
+
 	/* Pick a pyramid layer. For enlarging, we leave the z at 0
 	 * (the highest res layer).
 	 */
 	if (scale > 1.0 ||
 		scale == 0)
 		z = 0;
 	else
-		z = VIPS_CLIP(0,
-			log(1.0 / scale) / log(2.0),
-			tilecache->n_levels - 1);
+		z = VIPS_CLIP(0, log(1.0 / scale) / log(2.0), tilecache->n_levels - 1);
 
 	/* paint_rect in level0 coordinates.
 	 */

src/tilecache.h

@@ -90,6 +90,7 @@ typedef struct _Tilecache {
 	/* The signals we watch tilesource with.
 	 */
 	guint tilesource_changed_sid;
+	guint tilesource_loaded_sid;
 	guint tilesource_tiles_changed_sid;
 	guint tilesource_collect_sid;
 

src/tilesource.c

@@ -28,10 +28,10 @@
  */
 
 /*
- */
 #define DEBUG_VERBOSE
 #define DEBUG
 #define DEBUG_MAKE
+ */
 
 #include "nip4.h"
 
@@ -64,6 +64,7 @@ enum {
 	SIG_TILES_CHANGED,
 	SIG_COLLECT,
 	SIG_PAGE_CHANGED,
+	SIG_LOADED,
 
 	SIG_LAST
 };
@@ -122,6 +123,12 @@ tilesource_page_changed(Tilesource *tilesource)
 	g_signal_emit(tilesource, tilesource_signals[SIG_PAGE_CHANGED], 0);
 }
 
+static void
+tilesource_loaded(Tilesource *tilesource)
+{
+	g_signal_emit(tilesource, tilesource_signals[SIG_LOADED], 0);
+}
+
 typedef struct _TilesourceUpdate {
 	Tilesource *tilesource;
 	VipsImage *image;
@@ -279,8 +286,7 @@ tilesource_display_image(Tilesource *tilesource, VipsImage **mask_out)
 		/* There's a pyramid ... compute the size of image we need,
 		 * then find the layer which is one larger.
 		 */
-		int required_width =
-			tilesource->display_width >> tilesource->current_z;
+		int required_width = tilesource->width >> tilesource->current_z;
 
 		int i;
 		int level;
@@ -417,10 +423,8 @@ tilesource_display_image(Tilesource *tilesource, VipsImage **mask_out)
          * some layer other than the base one. Calculate the
          * subsample as (current_width / required_width).
          */
-        int width =
-            VIPS_MAX(1, tilesource->display_width >> tilesource->current_z);
-        int height =
-            VIPS_MAX(1, tilesource->display_height >> tilesource->current_z);
+        int width = VIPS_MAX(1, tilesource->width >> tilesource->current_z);
+        int height = VIPS_MAX(1, tilesource->height >> tilesource->current_z);
         int xfac = image->Xsize / width;
         int yfac = image->Ysize / height;
 
@@ -1082,7 +1086,7 @@ tilesource_background_load_done_idle(void *user_data)
 		"visible", TRUE,
 		NULL);
 	tilesource_update_display(tilesource);
-	tilesource_changed(tilesource);
+	tilesource_loaded(tilesource);
 
 	/* Drop the ref that kept this tilesource alive during load, see
 	 * tilesource_background_load().
@@ -1258,6 +1262,14 @@ tilesource_class_init(TilesourceClass *class)
 		g_cclosure_marshal_VOID__VOID,
 		G_TYPE_NONE, 0);
 
+	tilesource_signals[SIG_LOADED] = g_signal_new("loaded",
+		G_TYPE_FROM_CLASS(class),
+		G_SIGNAL_RUN_LAST,
+		G_STRUCT_OFFSET(TilesourceClass, loaded),
+		NULL, NULL,
+		g_cclosure_marshal_VOID__VOID,
+		G_TYPE_NONE, 0);
+
 	g_assert(!tilesource_background_load_pool);
 	tilesource_background_load_pool = g_thread_pool_new(
 		tilesource_background_load_worker,

src/tilesource.h

@@ -267,6 +267,12 @@ typedef struct _TilesourceClass {
 	 */
 	void (*page_changed)(Tilesource *tilesource);
 
+	/* The image has loaded and you can fetch pixels (ie. you should repaint,
+	 * but don't invalidate any cache, since the pixels will not have changed
+	 * since last time).
+	 */
+	void (*loaded)(Tilesource *tilesource);
+
 } TilesourceClass;
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(Tilesource, g_object_unref)