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=e839a31545628370bea1322acbdd2a719f3d6e8a;hb=62df36db729c222cf47774268a0fb83dabc8c65a;hp=f1f5ad57300e4eb0ec02eadff25f9608d2e1b03f;hpb=f7c3085a0e3c5c813cf9ae40b55fd7390e9373e2;p=evince.git

diff --git a/shell/ev-view-private.h b/shell/ev-view-private.h
index f1f5ad57..e839a315 100644
--- a/shell/ev-view-private.h
+++ b/shell/ev-view-private.h
@@ -24,6 +24,9 @@
 #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"
 
 /* Information for middle clicking and moving around the doc */
 typedef struct {
@@ -39,8 +42,16 @@ typedef struct {
 	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,
@@ -65,14 +76,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,9 +107,12 @@ 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;
@@ -106,6 +120,7 @@ struct _EvView {
 	gboolean fullscreen;
 	gboolean presentation;
 	EvSizingMode sizing_mode;
+	cairo_surface_t *loading_text;
 
 	/* Presentation */
 	EvPresentationState presentation_state;
@@ -127,9 +142,14 @@ 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;
@@ -137,15 +157,14 @@ struct _EvView {
 };
 
 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,