X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=libview%2Fev-view-private.h;h=f16264cb4ced40fc98b4f3161fb67423f9edbf0c;hb=19a00ed1cd086dcca4b6bfeb84e0b1488b2e3089;hp=76998d375bb8a68b3b51a72c5a264ce9c6064b87;hpb=ea6eb7ebc9898463a4e165d76aea75634a8b519b;p=evince.git

diff --git a/libview/ev-view-private.h b/libview/ev-view-private.h
index 76998d37..f16264cb 100644
--- a/libview/ev-view-private.h
+++ b/libview/ev-view-private.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #if !defined (EVINCE_COMPILATION)
@@ -28,11 +28,12 @@
 #include "ev-view.h"
 #include "ev-document-model.h"
 #include "ev-pixbuf-cache.h"
+#include "ev-page-cache.h"
 #include "ev-jobs.h"
 #include "ev-image.h"
 #include "ev-form-field.h"
 #include "ev-selection.h"
-#include "ev-transition-animation.h"
+#include "ev-view-cursor.h"
 
 #define DRAG_HISTORY 10
 
@@ -100,23 +101,6 @@ typedef enum {
 	SCROLL_TO_FIND_LOCATION,
 } PendingScroll;
 
-typedef enum {
-	EV_VIEW_CURSOR_NORMAL,
-	EV_VIEW_CURSOR_IBEAM,
-	EV_VIEW_CURSOR_LINK,
-	EV_VIEW_CURSOR_WAIT,
-	EV_VIEW_CURSOR_HIDDEN,
-	EV_VIEW_CURSOR_DRAG,
-	EV_VIEW_CURSOR_AUTOSCROLL,
-} EvViewCursor;
-
-typedef enum {
-	EV_PRESENTATION_NORMAL,
-	EV_PRESENTATION_BLACK,
-	EV_PRESENTATION_WHITE,
-	EV_PRESENTATION_END
-} EvPresentationState;
-
 typedef struct _EvHeightToPageCache {
 	gint rotation;
 	gdouble *height_to_page;
@@ -136,6 +120,7 @@ struct _EvView {
 
 	EvDocumentModel *model;
 	EvPixbufCache *pixbuf_cache;
+	EvPageCache *page_cache;
 	EvHeightToPageCache *height_to_page_cache;
 	EvViewCursor cursor;
 	EvJobRender *current_job;
@@ -165,16 +150,9 @@ struct _EvView {
 	gboolean continuous;
 	gboolean dual_page;
 	gboolean fullscreen;
-	gboolean presentation;
 	EvSizingMode sizing_mode;
 	cairo_surface_t *loading_text;
 
-	/* Presentation */
-	EvPresentationState presentation_state;
-	EvSizingMode sizing_mode_saved;
-	double scale_saved;
-	guint  trans_timeout_id;
-
 	/* Common for button press handling */
 	int pressed_button;
 
@@ -198,12 +176,6 @@ struct _EvView {
 	/* Image DND */
 	ImageDNDInfo image_dnd_info;
 
-	/* Goto Popup */
-	GtkWidget *goto_window;
-	GtkWidget *goto_entry;
-
-	EvTransitionAnimation *animation;
-
 	/* Annotations */
 	GList             *window_children;
 	EvViewWindowChild *window_child_focus;
@@ -220,7 +192,8 @@ struct _EvViewClass {
 	void    (*external_link)	  (EvView         *view,
 					   EvLinkAction   *action);
 	void    (*popup_menu)		  (EvView         *view,
-					   EvLink         *link);
+					   GList          *items);
+	void    (*selection_changed)      (EvView         *view);
 };
 
 void _get_page_size_for_scale_and_rotation (EvDocument *document,