diff src/typedefs.h @ 23:17acca639a86

##### Note: GQview CVS on sourceforge is not always up to date, please use ##### ##### an offical release when making enhancements and translation updates. ##### Fri Mar 18 19:52:38 2005 John Ellis <[e-mail]> * pixbuf-renderer.c: Fix broken 2pass queueing so it merges a single queue item for each tile, and now that a tile holds a queue pointer there is no need to walk the tile list to find a possible merge victim. Thu Mar 17 19:23:56 2005 John Ellis <[e-mail]> * image.c, pixbuf-renderer.[ch]: More progress, and 2 pass zoom now works again (mostly). Tue Mar 15 23:17:41 2005 John Ellis <[e-mail]> * image.[ch]: Start conversion to use of PixbufRenderer. * pixbuf-renderer.[ch]: Additions and fixes for use by ImageWindow. * fullscreen.c, image-overlay.c, img-view.c, info.c, layout.c, layout_image.c, print.c: Changes for above ImageWindow conversion. * typedefs.h: Remove unused ImageWindow variables. Mon Mar 14 20:45:50 2005 John Ellis <[e-mail]> * pan-view.c: Convert to using new PixbufRenderer. * pixbuf-renderer.[ch]: Clean up and fixes. Sun Mar 13 10:21:35 2005 John Ellis <[e-mail]> * image.c (image_scroller_start): Unref scroller pixbuf after adding it as an overlay to avoid leaking it. * pixbuf-renderer.[ch]: All functions defined in header file are now implemented. Fri Mar 11 17:05:36 2005 John Ellis <[e-mail]> * pixbuf-renderer.[ch]: Set up object properties and additional. Mar 10 19:22:18 2005 John Ellis <[e-mail]> * pixbuf-renderer.[ch]: FIx scrolling to use old method of gdk_draw and not gdk_scroll, as scroll often invalidates the entire window (!). Also merged in source tiles code from image.c. * pan-view.c: Change picked up when testing PixbufRender zoom. Tue Mar 8 23:26:00 2005 John Ellis <[e-mail]> * pixbuf-renderer.[ch]: Start of turning image drawing portion of ImageWindow into an actual GtkWidget. * src/Makefile.am: Add pixbuf-renderer.[ch]. * pan-view.c: Added temporary hack button and callback for testing PixbufRenderer widget.

--- a/src/typedefs.h	Sat Mar 05 21:40:46 2005 +0000
+++ b/src/typedefs.h	Sat Mar 19 01:15:17 2005 +0000
@@ -219,69 +219,22 @@
 struct _ImageWindow
 {
 	GtkWidget *widget;	/* use this to add it and show it */
-	GtkWidget *image;
+	GtkWidget *pr;
+	GtkWidget *frame;
 
 	gchar *image_path;
 	const gchar *image_name;
 
-	gint image_width;	/* image actual dimensions (pixels) */
-	gint image_height;
-	GdkPixbuf *pixbuf;
 	gint64 size;		/* file size (bytes) */
 	time_t mtime;		/* file modified time stamp */
 	gint unknown;		/* failed to load image */
 
-	gint window_width;	/* allocated size of window (drawing area) */
-	gint window_height;
-
-	gint x_offset;		/* offset of image start (non-zero when image < window) */
-	gint y_offset;
-
-	gint vis_width;		/* dimensions of visible part of image */
-	gint vis_height;
-
-	gint width;		/* size of scaled image (result) */
-	gint height;
-
-	gint x_scroll;		/* scroll offset of image (into width, height to start drawing) */
-	gint y_scroll;
-
-	gdouble zoom_min;
-	gdouble zoom_max;
-	gdouble zoom;		/* zoom we want (0 is auto) */
-	gdouble scale;		/* zoom we got (should never be 0) */
-
-	gint tile_width;
-	gint tile_height;
-	gint tile_cols;		/* count of tile columns */
-	GList *tiles;		/* list of buffer tiles */
-	GList *tile_cache;	/* list of pixmap/pixbuf tile allocations */
-	gint tile_cache_size;	/* allocated size of pixmaps/pixbufs */
-	GList *draw_queue;	/* list of areas to redraw */
-
-	gint source_tiles_enabled;
-	gint source_tiles_cache_size;
-
-	GList *source_tiles;	/* list of active source tiles */
-	gint source_tile_width;
-	gint source_tile_height;
-
-	GList *draw_queue_2pass;/* list when 2 pass is enabled */
-
 	ImageLoader *il;
 
-	gint draw_idle_id;
-	gint draw_idle_high;	/* current idle_id has high priority */
-
-	gint in_drag;
-	gint drag_last_x;
-	gint drag_last_y;
-	gint drag_moved;
-
 	gint has_frame;
-	gint top_window_sync;	/* resize top_window when image dimensions change */
 
 	/* top level (not necessarily parent) window */
+	gint top_window_sync;	/* resize top_window when image dimensions change */
 	GtkWidget *top_window;	/* window that gets title, and window to resize when 'fitting' */
 	gchar *title;		/* window title to display left of file name */
 	gchar *title_right;	/* window title to display right of file name */
@@ -331,17 +284,6 @@
 	gint auto_refresh_interval;
 
 	gint delay_flip;
-
-	gint scroller_id;
-	gint scroller_overlay;
-	gint scroller_x;
-	gint scroller_y;
-	gint scroller_xpos;
-	gint scroller_ypos;
-	gint scroller_xinc;
-	gint scroller_yinc;
-
-	GList *overlay_list;
 };
 
 struct _FileData {