X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fev-view-private.h;h=c36cd57bd421633fb1f2c3f0fd7e1f75c78f1bde;hb=f51872613abaaa42c716e2fe6a2e4695c529dc4b;hp=36053c31c65c20fd530531a8cc7f8d75ee15ee2d;hpb=913ada1452d003b49919126cd4cb2c91842bfdcd;p=evince.git

diff --git a/shell/ev-view-private.h b/shell/ev-view-private.h
index 36053c31..c36cd57b 100644
--- a/shell/ev-view-private.h
+++ b/shell/ev-view-private.h
@@ -24,6 +24,12 @@
 #include "ev-view.h"
 #include "ev-pixbuf-cache.h"
 #include "ev-page-cache.h"
+#include "ev-image.h"
+#include "ev-form-field.h"
+#include "ev-selection.h"
+#include "ev-transition-animation.h"
+
+#define DRAG_HISTORY 10
 
 /* Information for middle clicking and moving around the doc */
 typedef struct {
@@ -31,16 +37,36 @@ typedef struct {
 	GdkPoint start;
 	gdouble hadj;
 	gdouble vadj;
+	guint drag_timeout_id;
+	guint release_timeout_id;
+	GdkPoint buffer[DRAG_HISTORY];
+	GdkPoint momentum;
 } DragInfo;
 
+/* Autoscrolling */
+typedef struct {
+	gboolean autoscrolling;
+	guint last_y;
+	guint start_y;
+	guint timeout_id;	
+} AutoScrollInfo;
+
 /* Information for handling selection */
 typedef struct {
 	gboolean in_drag;
 	GdkPoint start;
 	gboolean in_selection;
 	GList *selections;
+	EvSelectionStyle style;
 } SelectionInfo;
 
+/* Information for handling images DND */
+typedef struct {
+	gboolean in_drag;
+	GdkPoint start;
+	EvImage *image;
+} ImageDNDInfo;
+
 typedef enum {
 	SCROLL_TO_KEEP_POSITION,
 	SCROLL_TO_PAGE_POSITION,
@@ -54,7 +80,8 @@ typedef enum {
 	EV_VIEW_CURSOR_LINK,
 	EV_VIEW_CURSOR_WAIT,
 	EV_VIEW_CURSOR_HIDDEN,
-	EV_VIEW_CURSOR_DRAG
+	EV_VIEW_CURSOR_DRAG,
+	EV_VIEW_CURSOR_AUTOSCROLL,
 } EvViewCursor;
 
 typedef enum {
@@ -65,14 +92,14 @@ typedef enum {
 } EvPresentationState;
 
 struct _EvView {
-	GtkWidget parent_instance;
+	GtkLayout layout;
 
 	EvDocument *document;
 
-	char *status;
 	char *find_status;
 	int find_result;
 	gboolean jump_to_find_result;
+	gboolean highlight_find_results;
 	
 	EvPageCache *page_cache;
 	EvPixbufCache *pixbuf_cache;
@@ -96,23 +123,35 @@ struct _EvView {
 	gint end_page;
 	gint current_page;
 
-	int rotation;
-	double scale;
-	int spacing;
+	gint rotation;
+	gdouble scale;
+	gint spacing;
+	gdouble dpi;
+	gdouble max_scale;
+	gdouble min_scale;
 
 	gboolean loading;
 	gboolean continuous;
 	gboolean dual_page;
 	gboolean fullscreen;
 	gboolean presentation;
-	EvPresentationState presentation_state;
 	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;
 
 	/* Information for middle clicking and dragging around. */
 	DragInfo drag_info;
+	
+	/* Autoscrolling */
+	AutoScrollInfo scroll_info;
 
 	/* Selection */
 	GdkPoint motion;
@@ -122,21 +161,31 @@ struct _EvView {
 	EvViewSelectionMode selection_mode;
 	SelectionInfo selection_info;
 
+	/* Image DND */
+	ImageDNDInfo image_dnd_info;
+
+#if !GTK_CHECK_VERSION (2, 11, 7)
 	/* Links */
 	GtkWidget *link_tooltip;
 	EvLink *hovered_link;
+#endif
+
+	/* Goto Popup */
+	GtkWidget *goto_window;
+	GtkWidget *goto_entry;
+
+	EvTransitionAnimation *animation;
 };
 
 struct _EvViewClass {
-	GtkWidgetClass parent_class;
+	GtkLayoutClass parent_class;
 
-	void	(*set_scroll_adjustments) (EvView         *view,
-					   GtkAdjustment  *hadjustment,
-					   GtkAdjustment  *vadjustment);
 	void    (*binding_activated)	  (EvView         *view,
 					   EvScrollType   scroll,
 					   gboolean        horizontal);
 	void    (*zoom_invalid)		  (EvView         *view);
+	void    (*handle_link)		  (EvView         *view,
+					   EvLink         *link);
 	void    (*external_link)	  (EvView         *view,
 					   EvLinkAction   *action);
 	void    (*popup_menu)		  (EvView         *view,