X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-view.c;h=b51082f24dfde8aada92f9c383fe296bb24cfd49;hb=594edf9b1277d5ec88892c2ea02c2bdc2f2e8b0e;hp=636e0f566b4dfe04b163fc666d6efccfa35a7176;hpb=fafa1cef81fe708fa734a004bfa1ed0e5dfecd56;p=evince.git

diff --git a/shell/ev-view.c b/shell/ev-view.c
index 636e0f56..b51082f2 100644
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -114,6 +114,8 @@ struct _EvView {
 	double scale;
 	int width;
 	int height;
+	GtkBorder border;
+	gboolean show_border;
 };
 
 struct _EvViewClass {
@@ -208,8 +210,8 @@ ev_view_finalize (GObject *object)
 
 	LOG ("Finalize");
 
-
-	ev_view_set_scroll_adjustments (view, NULL, NULL);
+	g_free (view->status);
+	g_free (view->find_status);
 
 	G_OBJECT_CLASS (ev_view_parent_class)->finalize (object);
 }
@@ -238,7 +240,6 @@ ev_view_get_offsets (EvView *view, int *x_offset, int *y_offset)
 	EvDocument *document = view->document;
 	GtkWidget *widget = GTK_WIDGET (view);
 	int width, height, target_width, target_height;
-	GtkBorder border;
 
 	g_return_if_fail (EV_IS_DOCUMENT (document));
 
@@ -247,12 +248,12 @@ ev_view_get_offsets (EvView *view, int *x_offset, int *y_offset)
 				view->scale,
 				&width, &height);
 
-	ev_document_misc_get_page_border_size (width, height, &border);
-
 	*x_offset = view->spacing;
 	*y_offset = view->spacing;
-	target_width = width + border.left + border.right + view->spacing * 2;
-	target_height = height + border.top + border.bottom + view->spacing * 2;
+	target_width = width + view->border.left +
+		       view->border.right + view->spacing * 2;
+	target_height = height + view->border.top +
+			view->border.bottom + view->spacing * 2;
 	*x_offset += MAX (0, (widget->allocation.width - target_width) / 2);
 	*y_offset += MAX (0, (widget->allocation.height - target_height) / 2);
 }
@@ -281,6 +282,66 @@ doc_rect_to_view_rect (EvView *view, EvRectangle *doc_rect, GdkRectangle *view_r
 	view_rect->height = ceil (doc_rect->y2 * view->scale) + y_offset - view_rect->y;
 }
 
+static void
+compute_border (EvView *view, int width, int height, GtkBorder *border)
+{
+	if (view->show_border) {
+		ev_document_misc_get_page_border_size (width, height, border);
+	} else {
+		border->left = 0;
+		border->right = 0;
+		border->top = 0;
+		border->bottom = 0;
+	}
+}
+
+static void
+compute_zoom_factor (EvView *view)
+{
+	int doc_width, doc_height;
+	double scale, scale_w, scale_h;
+	GtkBorder border;
+
+	if (view->width <= 0 && view->height <= 0) {
+		return;
+	}
+
+	doc_width = doc_height = 0;
+	scale = scale_w = scale_h = 1.0;
+	ev_page_cache_get_size (view->page_cache,
+				view->current_page,
+				1.0,
+				&doc_width,
+				&doc_height);
+
+	compute_border (view, doc_width, doc_height, &border);
+
+	if (doc_width == 0 || doc_height == 0) {
+		return;
+	}
+
+	if (view->width >= 0) {
+		int target_width;
+
+		target_width = view->width - (view->spacing * 2 + view->border.left +
+					      view->border.right);
+		scale = scale_w = (double)target_width / doc_width;
+	}
+
+	if (view->height >= 0) {
+		int target_height;
+
+		target_height = view->height - (view->spacing * 2 + view->border.top +
+						view->border.bottom);
+		scale = scale_h = (double)target_height / doc_height;
+	}
+
+	if (view->width >= 0 && view->height >= 0) {
+		scale = (scale_w < scale_h) ? scale_w : scale_h;
+	}
+
+	view->scale = scale;
+}
 
 /* Called by size_request to make sure we have appropriate jobs running.
  */
@@ -289,7 +350,6 @@ ev_view_size_request (GtkWidget      *widget,
 		      GtkRequisition *requisition)
 {
 	EvView *view = EV_VIEW (widget);
-	GtkBorder border;
 	gint width, height;
 
 	if (!GTK_WIDGET_REALIZED (widget))
@@ -301,29 +361,32 @@ ev_view_size_request (GtkWidget      *widget,
 		return;
 	}
 
+	compute_zoom_factor (view);
+
 	ev_page_cache_get_size (view->page_cache,
 				view->current_page,
 				view->scale,
 				&width, &height);
 
+	compute_border (view, width, height, &(view->border));
+
 	ev_pixbuf_cache_set_page_range (view->pixbuf_cache,
 					view->current_page,
 					view->current_page,
 					view->scale);
-	ev_document_misc_get_page_border_size (width, height, &border);
 
 	if (view->width >= 0) {
 		requisition->width = 0;
 	} else {
-		requisition->width = width + border.left + border.right +
-				     view->spacing * 2;
+		requisition->width = width + view->border.left +
+				     view->border.right + view->spacing * 2;
 	}
 
 	if (view->height >= 0) {
 		requisition->height = 0;
 	} else {
-		requisition->height = height + border.top + border.bottom +
-				      view->spacing * 2;
+		requisition->height = height + view->border.top +
+				      view->border.bottom + view->spacing * 2;
 	}
 }
 
@@ -501,7 +564,6 @@ expose_bin_window (GtkWidget      *widget,
 		   GdkEventExpose *event)
 {
 	EvView *view = EV_VIEW (widget);
-	GtkBorder border;
 	gint width, height;
 	GdkRectangle area;
 	int x_offset, y_offset;
@@ -517,14 +579,16 @@ expose_bin_window (GtkWidget      *widget,
 				view->scale,
 				&width, &height);
 
-	ev_document_misc_get_page_border_size (width, height, &border);
-
 	/* Paint the frame */
 	area.x = x_offset;
 	area.y = y_offset;
-	area.width = width + border.left + border.right;
-	area.height = height + border.top + border.bottom;
-	ev_document_misc_paint_one_page (view->bin_window, widget, &area, &border);
+	area.width = width + view->border.left + view->border.right;
+	area.height = height + view->border.top + view->border.bottom;
+
+	if (view->show_border) {
+		ev_document_misc_paint_one_page (view->bin_window, widget, &area,
+						 &(view->border));
+	}
 
 	/* Render the document itself */
 	LOG ("Render area %d %d %d %d - Offset %d %d",
@@ -548,8 +612,8 @@ expose_bin_window (GtkWidget      *widget,
 				 GTK_WIDGET (view)->style->fg_gc[GTK_STATE_NORMAL],
 				 scaled_image,
 				 0, 0,
-				 area.x + border.left,
-				 area.y + border.top,
+				 area.x + view->border.left,
+				 area.y + view->border.top,
 				 width, height,
 				 GDK_RGB_DITHER_NORMAL,
 				 0, 0);
@@ -592,7 +656,6 @@ ev_view_select_all (EvView *ev_view)
 	GdkRectangle selection;
 	int width, height;
 	int x_offset, y_offset;
-	GtkBorder border;
 
 	g_return_if_fail (EV_IS_VIEW (ev_view));
 
@@ -602,11 +665,10 @@ ev_view_select_all (EvView *ev_view)
 				ev_view->current_page,
 				ev_view->scale,
 				&width, &height);
-	ev_document_misc_get_page_border_size (width, height, &border);
 
 	ev_view->has_selection = TRUE;
-	selection.x = x_offset + border.left;
-        selection.y = y_offset + border.top;
+	selection.x = x_offset + ev_view->border.left;
+        selection.y = y_offset + ev_view->border.top;
 	selection.width = width;
 	selection.height = height;
 	view_rect_to_doc_rect (ev_view, &selection, &ev_view->selection);
@@ -620,6 +682,10 @@ ev_view_copy (EvView *ev_view)
 	GtkClipboard *clipboard;
 	char *text;
 
+	if (!ev_document_can_get_text (ev_view->document)) {
+		return;
+	}
+
 	g_mutex_lock (EV_DOC_MUTEX);
 	text = ev_document_get_text (ev_view->document,
 				     ev_view->current_page,
@@ -632,6 +698,16 @@ ev_view_copy (EvView *ev_view)
 	g_free (text);
 }
 
+void
+ev_view_set_show_border (EvView *view, gboolean show_border)
+{
+	g_return_if_fail (EV_IS_VIEW (view));
+
+	view->show_border = show_border;
+
+	gtk_widget_queue_resize (GTK_WIDGET (view));
+}
+
 static void
 ev_view_primary_get_cb (GtkClipboard     *clipboard,
 			GtkSelectionData *selection_data,
@@ -641,6 +717,10 @@ ev_view_primary_get_cb (GtkClipboard     *clipboard,
 	EvView *ev_view = EV_VIEW (data);
 	char *text;
 
+	if (!ev_document_can_get_text (ev_view->document)) {
+		return;
+	}
+
 	g_mutex_lock (EV_DOC_MUTEX);
 	text = ev_document_get_text (ev_view->document,
 				     ev_view->current_page,
@@ -817,17 +897,15 @@ find_page_at_location (EvView  *view,
 		       gint    *x_offset,
 		       gint    *y_offset)
 {
-	GtkBorder border;
 	gint width, height;
 
 	ev_page_cache_get_size (view->page_cache,
 				view->current_page,
 				view->scale,
 				&width, &height);
-	ev_document_misc_get_page_border_size (width, height, &border);
 
-	x -= (border.left + view->spacing);
-	y -= (border.top + view->spacing);
+	x -= (view->border.left + view->spacing);
+	y -= (view->border.top + view->spacing);
 
 	if ((x < 0) || (y < 0) ||
 	    (x >= width) || (y >= height)) {
@@ -897,6 +975,31 @@ ev_view_motion_notify_event (GtkWidget      *widget,
 	return TRUE;
 }
 
+/* FIXME: standardize this sometime */
+static void
+go_to_link (EvView *view, EvLink *link)
+{
+	EvLinkType type;
+	const char *uri;
+	int page;
+
+	type = ev_link_get_link_type (link);
+
+	switch (type) {
+		case EV_LINK_TYPE_TITLE:
+			break;
+		case EV_LINK_TYPE_PAGE:
+			page = ev_link_get_page (link);
+			ev_page_cache_set_current_page (view->page_cache, page);
+			break;
+		case EV_LINK_TYPE_EXTERNAL_URI:
+			uri = ev_link_get_uri (link);
+			gnome_vfs_url_show (uri);
+			break;
+	}
+}
+
+
 static gboolean
 ev_view_button_release_event (GtkWidget      *widget,
 			      GdkEventButton *event)
@@ -912,7 +1015,7 @@ ev_view_button_release_event (GtkWidget      *widget,
 
 		link = get_link_at_location (view, event->x, event->y);
 		if (link) {
-			ev_view_go_to_link (view, link);
+			go_to_link (view, link);
 		}
 	}
 
@@ -969,10 +1072,10 @@ ev_view_set_scroll_adjustments (EvView *view,
 }
 
 static void
-add_scroll_binding (GtkBindingSet  *binding_set,
-		    guint           keyval,
-		    GtkScrollType   scroll,
-		    gboolean        horizontal)
+add_scroll_binding_keypad (GtkBindingSet  *binding_set,
+    			   guint           keyval,
+    			   GtkScrollType   scroll,
+			   gboolean        horizontal)
 {
   guint keypad_keyval = keyval - GDK_Left + GDK_KP_Left;
 
@@ -986,6 +1089,23 @@ add_scroll_binding (GtkBindingSet  *binding_set,
 				G_TYPE_BOOLEAN, horizontal);
 }
 
+static void
+add_scroll_binding_shifted (GtkBindingSet  *binding_set,
+    			    guint           keyval,
+    			    GtkScrollType   scroll_normal,
+    			    GtkScrollType   scroll_shifted,
+			    gboolean        horizontal)
+{
+  gtk_binding_entry_add_signal (binding_set, keyval, 0,
+                                "scroll_view", 2,
+                                GTK_TYPE_SCROLL_TYPE, scroll_normal,
+				G_TYPE_BOOLEAN, horizontal);
+  gtk_binding_entry_add_signal (binding_set, keyval, GDK_SHIFT_MASK,
+                                "scroll_view", 2,
+                                GTK_TYPE_SCROLL_TYPE, scroll_shifted,
+				G_TYPE_BOOLEAN, horizontal);
+}
+
 static void
 ev_view_jump (EvView        *view,
 	      GtkScrollType  scroll)
@@ -1178,16 +1298,29 @@ ev_view_class_init (EvViewClass *class)
 
 	binding_set = gtk_binding_set_by_class (class);
 
-	add_scroll_binding (binding_set, GDK_Left,  GTK_SCROLL_STEP_BACKWARD, TRUE);
-	add_scroll_binding (binding_set, GDK_Right, GTK_SCROLL_STEP_FORWARD,  TRUE);
-	add_scroll_binding (binding_set, GDK_Up,    GTK_SCROLL_STEP_BACKWARD, FALSE);
-	add_scroll_binding (binding_set, GDK_Down,  GTK_SCROLL_STEP_FORWARD,  FALSE);
+	add_scroll_binding_keypad (binding_set, GDK_Left,  GTK_SCROLL_STEP_BACKWARD, TRUE);
+	add_scroll_binding_keypad (binding_set, GDK_Right, GTK_SCROLL_STEP_FORWARD,  TRUE);
+	add_scroll_binding_keypad (binding_set, GDK_Up,    GTK_SCROLL_STEP_BACKWARD, FALSE);
+	add_scroll_binding_keypad (binding_set, GDK_Down,  GTK_SCROLL_STEP_FORWARD,  FALSE);
+
+	add_scroll_binding_keypad (binding_set, GDK_Page_Up,   GTK_SCROLL_PAGE_BACKWARD, FALSE);
+	add_scroll_binding_keypad (binding_set, GDK_Page_Down, GTK_SCROLL_PAGE_FORWARD,  FALSE);
+
+	add_scroll_binding_shifted (binding_set, GDK_space, EV_SCROLL_PAGE_FORWARD, EV_SCROLL_PAGE_BACKWARD, FALSE);
+	add_scroll_binding_shifted (binding_set, GDK_BackSpace, EV_SCROLL_PAGE_BACKWARD, EV_SCROLL_PAGE_FORWARD, FALSE);
+}
+
+void
+ev_view_set_spacing (EvView     *view,
+		     int         spacing)
+{
+	g_return_if_fail (EV_IS_VIEW (view));
 
-	add_scroll_binding (binding_set, GDK_Page_Up,   GTK_SCROLL_PAGE_BACKWARD, FALSE);
-	add_scroll_binding (binding_set, GDK_Page_Down, GTK_SCROLL_PAGE_FORWARD,  FALSE);
+	view->spacing = spacing;
 
-	add_scroll_binding (binding_set, GDK_space, EV_SCROLL_PAGE_FORWARD, FALSE);
-	add_scroll_binding (binding_set, GDK_BackSpace, EV_SCROLL_PAGE_BACKWARD, FALSE);
+	if (view->document) {
+		gtk_widget_queue_resize (GTK_WIDGET (view));
+	}
 }
 
 static void
@@ -1195,11 +1328,12 @@ ev_view_init (EvView *view)
 {
 	GTK_WIDGET_SET_FLAGS (view, GTK_CAN_FOCUS);
 
-	view->spacing = 10;
+	view->spacing = 0;
 	view->scale = 1.0;
 	view->current_page = 0;
 	view->pressed_button = -1;
 	view->cursor = EV_VIEW_CURSOR_NORMAL;
+	view->show_border = TRUE;
 }
 
 static void
@@ -1373,17 +1507,18 @@ page_changed_cb (EvPageCache *page_cache,
 				old_page,
 				view->scale,
 				&old_width, &old_height);
+
+	view->current_page = new_page;
+	view->has_selection = FALSE;
+
+	compute_zoom_factor (view);
+
 	ev_page_cache_get_size (page_cache,
 				new_page,
 				view->scale,
 				&new_width, &new_height);
 
-	if (view->cursor != EV_VIEW_CURSOR_HIDDEN) {
-		//ev_view_set_cursor (view, EV_VIEW_CURSOR_WAIT);
-	}
-
-	view->current_page = new_page;
-	view->has_selection = FALSE;
+	compute_border (view, new_width, new_height, &(view->border));
 
 	ev_pixbuf_cache_set_page_range (view->pixbuf_cache,
 					view->current_page,
@@ -1443,41 +1578,6 @@ ev_view_set_document (EvView     *view,
 	}
 }
 
-int
-ev_view_get_page        (EvView     *view)
-{
-	return view->current_page;
-}
-
-static void
-go_to_link (EvView *view, EvLink *link)
-{
-	EvLinkType type;
-	const char *uri;
-	int page;
-
-	type = ev_link_get_link_type (link);
-
-	switch (type) {
-		case EV_LINK_TYPE_TITLE:
-			break;
-		case EV_LINK_TYPE_PAGE:
-			page = ev_link_get_page (link);
-			ev_page_cache_set_current_page (view->page_cache, page);
-			break;
-		case EV_LINK_TYPE_EXTERNAL_URI:
-			uri = ev_link_get_uri (link);
-			gnome_vfs_url_show (uri);
-			break;
-	}
-}
-
-void
-ev_view_go_to_link (EvView *view, EvLink *link)
-{
-	go_to_link (view, link);
-}
-
 static void
 ev_view_zoom (EvView   *view,
 	      double    factor,
@@ -1493,83 +1593,34 @@ ev_view_zoom (EvView   *view,
 	scale = CLAMP (scale, MIN_SCALE, MAX_SCALE);
 
 	view->scale = scale;
+	view->width = view->height = -1;
 	gtk_widget_queue_resize (GTK_WIDGET (view));
 }
 
 void
 ev_view_zoom_in (EvView *view)
 {
-	view->width = view->height = -1;
 	ev_view_zoom (view, ZOOM_IN_FACTOR, TRUE);
 }
 
 void
 ev_view_zoom_out (EvView *view)
 {
-	view->width = view->height = -1;
 	ev_view_zoom (view, ZOOM_OUT_FACTOR, TRUE);
 }
 
-static double
-size_to_zoom_factor (EvView *view, int width, int height)
-{
-	int doc_width, doc_height;
-	double scale, scale_w, scale_h;
-	GtkBorder border;
-
-	doc_width = doc_height = 0;
-	scale = scale_w = scale_h = 1.0;
-	ev_page_cache_get_size (view->page_cache,
-				view->current_page,
-				view->scale,
-				&doc_width,
-				&doc_height);
-
-	/* FIXME: The border size isn't constant.  Ugh.  Still, if we have extra
-	 * space, we just cut it from the border */
-	ev_document_misc_get_page_border_size (doc_width, doc_height, &border);
-
-	if (doc_width == 0 && doc_height == 0) {
-		return 0;
-	}
-
-	if (width >= 0) {
-		int target_width;
-
-		target_width = width - (view->spacing * 2 + border.left + border.right);
-		scale = scale_w = (double)target_width * view->scale / doc_width;
-	}
-
-	if (height >= 0) {
-		int target_height;
-
-		target_height = height - (view->spacing * 2 + border.top + border.bottom);
-		scale = scale_h = (double)target_height * view->scale / doc_height;
-	}
-
-	if (width >= 0 && height >= 0) {
-		scale = (scale_w < scale_h) ? scale_w : scale_h;
-	}
-
-	return scale;
-}
-
 void
 ev_view_set_size (EvView     *view,
 		  int         width,
 		  int         height)
 {
-	double factor;
-
-	if (!view->document)
+	if (!view->document) {
 		return;
+	}
 
-	if (view->width != width ||
-	    view->height != height) {
+	if (width != view->width || height != view->height) {
 		view->width = width;
 		view->height = height;
-		factor = size_to_zoom_factor (view, width, height);
-		ev_view_zoom (view, factor, FALSE);
 		gtk_widget_queue_resize (GTK_WIDGET (view));
 	}
 }