fix control bar on page flip

Author: jcupitt

README.md

@@ -232,8 +232,6 @@ On success, merge to master.
 
 - duplicate could copy zoom/pan settings
 
-- next image twice ... display bar stops working
-
 - get `object_unref: assertion 'G_IS_OBJECT (object)' failed` during free of
   stack ... seems to be a harmless minor glib bug with `g_clear_object()`
   failing with a crit for a null value
@@ -242,11 +240,7 @@ On success, merge to master.
 
 - load cancel does not work
 
-- duplicate should copy more view params? slider settings? scale and
-  position?
-
-- looks like duplicate of a texture view will fail ... see
-  tile_source_duplicate()
+- duplicate of a texture view crashes ... see tile_source_duplicate()
 
 - check mem use, esp with three large images loaded
 

src/displaybar.c

@@ -12,7 +12,7 @@ struct _Displaybar {
 	 */
 	ImageWindow *win;
 
-	/* The tile_source we are currently controlling. Not a ref.
+	/* A ref to the tile_source we are currently controlling. 
 	 */
 	TileSource *tile_source;
 
@@ -43,8 +43,10 @@ static void
 displaybar_tile_source_changed(TileSource *tile_source, Displaybar *displaybar)
 {
 #ifdef DEBUG
-#endif /*DEBUG*/
 	printf("displaybar_tile_source_changed:\n");
+#endif /*DEBUG*/
+
+	g_assert(tile_source == displaybar->tile_source);
 
 	if (TSLIDER(displaybar->scale)->value != tile_source->scale) {
 		TSLIDER(displaybar->scale)->value = tile_source->scale;
@@ -70,6 +72,8 @@ displaybar_page_changed(TileSource *tile_source, Displaybar *displaybar)
 	printf("displaybar_page_changed:\n");
 #endif /*DEBUG*/
 
+	g_assert(tile_source == displaybar->tile_source);
+
 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(displaybar->page),
 		tile_source->page);
 }
@@ -82,7 +86,7 @@ displaybar_disconnect(Displaybar *displaybar)
 		FREESID(displaybar->tiles_changed_sid, displaybar->tile_source);
 		FREESID(displaybar->page_changed_sid, displaybar->tile_source);
 
-		displaybar->tile_source = NULL;
+		VIPS_UNREF(displaybar->tile_source);
 	}
 }
 
@@ -91,28 +95,33 @@ displaybar_disconnect(Displaybar *displaybar)
 static void
 displaybar_image_window_changed(ImageWindow *win, Displaybar *displaybar)
 {
-	TileSource *tile_source = image_window_get_tile_source(win);
-
 #ifdef DEBUG
-#endif /*DEBUG*/
 	printf("displaybar_image_window_changed:\n");
+#endif /*DEBUG*/
 
 	displaybar_disconnect(displaybar);
 
-	if (tile_source) {
-		displaybar->changed_sid = g_signal_connect(tile_source, 
+	TileSource *new_tile_source = image_window_get_tile_source(win);
+	if (new_tile_source) {
+		/* Set new source.
+		 */
+		displaybar->changed_sid = g_signal_connect(new_tile_source, 
 			"changed",
 			G_CALLBACK(displaybar_tile_source_changed), displaybar);
-		displaybar->tiles_changed_sid = g_signal_connect(tile_source, 
+		displaybar->tiles_changed_sid = g_signal_connect(new_tile_source, 
 			"tiles-changed",
 			G_CALLBACK(displaybar_tile_source_changed), displaybar);
-		displaybar->page_changed_sid = g_signal_connect(tile_source, 
+		displaybar->page_changed_sid = g_signal_connect(new_tile_source, 
 			"page-changed",
 			G_CALLBACK(displaybar_page_changed), displaybar);
 
-		displaybar->tile_source = tile_source;
+		displaybar->tile_source = new_tile_source;
+		g_object_ref(new_tile_source);
 
-		displaybar_tile_source_changed(tile_source, displaybar);
+		/* Init from new source.
+		 */
+		displaybar_tile_source_changed(new_tile_source, displaybar);
+		displaybar_page_changed(new_tile_source, displaybar);
 	}
 }
 
@@ -122,11 +131,12 @@ displaybar_set_image_window(Displaybar *displaybar, ImageWindow *win)
 	/* No need to ref ... win holds a ref to us.
 	 */
 	displaybar->win = win;
-	displaybar->tile_source = image_window_get_tile_source(win);
 
 	g_signal_connect_object(win, "changed",
 		G_CALLBACK(displaybar_image_window_changed),
 		displaybar, 0);
+
+	displaybar_image_window_changed(win, displaybar);
 }
 
 static void

src/imagewindow.c

@@ -70,7 +70,7 @@ G_DEFINE_TYPE(ImageWindow, image_window, GTK_TYPE_APPLICATION_WINDOW);
 /* Our signals.
  */
 enum {
-	SIG_CHANGED,		/* A new imageui */
+	SIG_CHANGED,		/* A new imageui and tile_source */
 	SIG_STATUS_CHANGED, /* New mouse position */
 	SIG_LAST
 };
@@ -174,11 +174,6 @@ image_window_active_remove(ImageWindow *win, const char *filename)
 	if (active->imageui == win->imageui)
 		win->imageui = NULL;
 
-	// gtk hates killing widgets with active focus ... this triggers crashes
-	// in focus decoration redraw
-	gtk_widget_grab_focus(GTK_WIDGET(win->gears));
-
-	printf("image_window_active_remove: %s\n", filename);
 	gtk_stack_remove(GTK_STACK(win->stack), GTK_WIDGET(active->imageui));
 	g_hash_table_remove(win->active_hash, filename);
 }
@@ -199,8 +194,6 @@ image_window_active_add(ImageWindow *win,
 {
 	g_assert(!image_window_active_lookup(win, filename));
 
-	printf("image_window_active_add: %s\n", filename);
-
 	Active *active = VIPS_NEW(NULL, Active);
 	active->win = win;
 	active->filename = filename;
@@ -581,11 +574,6 @@ image_window_imageui_set_visible(ImageWindow *win,
 	VipsImage *image;
 	char *title;
 
-	/* Try to shut down any current evaluation.
-	 */
-	if (old_tile_source)
-		tile_source_kill(old_tile_source);
-
 	g_object_set(old_tile_source,
 		"visible", FALSE,
 		NULL);
@@ -648,7 +636,7 @@ image_window_imageui_set_visible(ImageWindow *win,
 	// not a ref, so we can just overwrite it
 	win->imageui = imageui;
 
-	// update the displaybar etc.
+	// tell everyone there's a new imageui
 	image_window_changed(win);
 
 	// update the menus

src/tilesource.c

@@ -587,11 +587,15 @@ tile_source_rgb_image(TileSource *tile_source, VipsImage *in)
 }
 
 /* Rebuild just the second half of the image pipeline, eg. after a change to
- * falsecolour, or if current_z changes.
+ * falsecolour, scale, or if current_z changes.
  */
 static int
 tile_source_update_rgb(TileSource *tile_source)
 {
+#ifdef DEBUG
+	printf("tile_source_update_rgb:\n");
+#endif /*DEBUG*/
+
 	if (tile_source->display) {
 		VipsImage *rgb;
 
@@ -1757,9 +1761,6 @@ tile_source_fill_tile(TileSource *tile_source, Tile *tile)
 		tile->region->valid.left, tile->region->valid.top);
 #endif /*DEBUG_VERBOSE*/
 
-	if (tile_source->kill)
-		return 0;
-
 	/* Change z if necessary.
 	 */
 	if (tile_source->current_z != tile->z ||
@@ -1904,15 +1905,3 @@ tile_source_duplicate(TileSource *tile_source)
 	return new_tile_source;
 }
 
-void
-tile_source_kill(TileSource *tile_source)
-{
-	tile_source->kill = TRUE;
-
-	if (tile_source->display)
-		vips_image_set_kill(tile_source->display, TRUE);
-	if (tile_source->mask)
-		vips_image_set_kill(tile_source->mask, TRUE);
-	if (tile_source->rgb)
-		vips_image_set_kill(tile_source->rgb, TRUE);
-}

src/tilesource.h

@@ -194,10 +194,6 @@ typedef struct _TileSource {
 	 * invisible images.
 	 */
 	gboolean visible;
-
-	/* Set this to try to shut down eval.
-	 */
-	gboolean kill;
 } TileSource;
 
 typedef struct _TileSourceClass {
@@ -250,6 +246,5 @@ gboolean tile_source_get_pixel(TileSource *tile_source,
 	int image_x, int image_y, double **vector, int *n);
 TileSource *tile_source_duplicate(TileSource *tile_source);
 void tile_source_changed(TileSource *tile_source);
-void tile_source_kill(TileSource *tile_source);
 
 #endif /*__TILE_SOURCE_H*/