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

diff --git a/shell/ev-view-private.h b/shell/ev-view-private.h
index eb7ec726..c36cd57b 100644
--- a/shell/ev-view-private.h
+++ b/shell/ev-view-private.h
@@ -25,6 +25,11 @@
 #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 {
@@ -32,14 +37,27 @@ 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 */
@@ -62,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 {
@@ -73,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;
@@ -117,6 +136,7 @@ struct _EvView {
 	gboolean fullscreen;
 	gboolean presentation;
 	EvSizingMode sizing_mode;
+	cairo_surface_t *loading_text;
 
 	/* Presentation */
 	EvPresentationState presentation_state;
@@ -129,6 +149,9 @@ struct _EvView {
 
 	/* Information for middle clicking and dragging around. */
 	DragInfo drag_info;
+	
+	/* Autoscrolling */
+	AutoScrollInfo scroll_info;
 
 	/* Selection */
 	GdkPoint motion;
@@ -141,25 +164,28 @@ struct _EvView {
 	/* 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,