X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-view.c;h=bc3cb980daf295efb03aad5d20d5f0fb6b504b65;hb=f343927df4325959193353c52cff1ea4b20b2286;hp=0fd2834aeb6b03f89004eaf6d90259012be76709;hpb=1624d8ca4f26f53dcae3e2f122285d75fa003384;p=evince.git

diff --git a/shell/ev-view.c b/shell/ev-view.c
index 0fd2834a..bc3cb980 100644
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -320,6 +320,7 @@ static void       compute_selections                         (EvView
 							      GdkPoint           *start,
 							      GdkPoint           *stop);
 static void       clear_selection                            (EvView             *view);
+static void       clear_link_selected                        (EvView             *view);
 static void       selection_free                             (EvViewSelection    *selection);
 static char*      get_selected_text                          (EvView             *ev_view);
 static void       ev_view_primary_get_cb                     (GtkClipboard       *clipboard,
@@ -1575,7 +1576,8 @@ ev_view_handle_cursor_over_xy (EvView *view, gint x, gint y)
 	} else {
 		if (view->cursor == EV_VIEW_CURSOR_LINK ||
 		    view->cursor == EV_VIEW_CURSOR_IBEAM ||
-		    view->cursor == EV_VIEW_CURSOR_DRAG)
+		    view->cursor == EV_VIEW_CURSOR_DRAG ||
+		    view->cursor == EV_VIEW_CURSOR_AUTOSCROLL)
 			ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL);
 	}
 }
@@ -1657,9 +1659,9 @@ ev_view_form_field_get_region (EvView      *view,
 	GList       *forms_mapping;
 
 	forms_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache,
-								field->page);
+								field->page->index);
 	ev_form_field_mapping_get_area (forms_mapping, field, &field_area);
-	doc_rect_to_view_rect (view, field->page, &field_area, &view_area);
+	doc_rect_to_view_rect (view, field->page->index, &field_area, &view_area);
 	view_area.x -= view->scroll_x;
 	view_area.y -= view->scroll_y;
 
@@ -1710,7 +1712,7 @@ ev_view_form_field_button_create_widget (EvView      *view,
 			 * we need to update also the region for the current selected item
 			 */
 			forms_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache,
-										field->page);
+										field->page->index);
 			for (l = forms_mapping; l; l = g_list_next (l)) {
 				EvFormField *button = ((EvFormFieldMapping *)(l->data))->field;
 				GdkRegion   *button_region;
@@ -1738,7 +1740,7 @@ ev_view_form_field_button_create_widget (EvView      *view,
 
 	ev_pixbuf_cache_reload_page (view->pixbuf_cache,
 				     field_region,
-				     field->page,
+				     field->page->index,
 				     view->rotation,
 				     view->scale);
 	gdk_region_destroy (field_region);
@@ -1768,7 +1770,7 @@ ev_view_form_field_text_save (EvView    *view,
 		field->changed = FALSE;
 		ev_pixbuf_cache_reload_page (view->pixbuf_cache,
 					     field_region,
-					     field->page,
+					     field->page->index,
 					     view->rotation,
 					     view->scale);
 		gdk_region_destroy (field_region);
@@ -1889,7 +1891,7 @@ ev_view_form_field_choice_save (EvView    *view,
 		field->changed = FALSE;
 		ev_pixbuf_cache_reload_page (view->pixbuf_cache,
 					     field_region,
-					     field->page,
+					     field->page->index,
 					     view->rotation,
 					     view->scale);
 		gdk_region_destroy (field_region);
@@ -1906,7 +1908,8 @@ ev_view_form_field_choice_changed (GtkWidget   *widget,
 		gint item;
 		
 		item = gtk_combo_box_get_active (GTK_COMBO_BOX (widget));
-		if (GPOINTER_TO_INT (field_choice->selected_items->data) != item) {
+		if (!field_choice->selected_items ||
+		    GPOINTER_TO_INT (field_choice->selected_items->data) != item) {
 			g_list_free (field_choice->selected_items);
 			field_choice->selected_items = NULL;
 			field_choice->selected_items = g_list_prepend (field_choice->selected_items,
@@ -2105,10 +2108,10 @@ ev_view_handle_form_field (EvView      *view,
 				g_object_ref (field),
 				(GDestroyNotify)g_object_unref);
 
-	form_field_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache, field->page);
+	form_field_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache, field->page->index);
 	ev_form_field_mapping_get_area (form_field_mapping, field, &field_area);
 	
-	doc_rect_to_view_rect (view, field->page, &field_area, &view_area);
+	doc_rect_to_view_rect (view, field->page->index, &field_area, &view_area);
 	view_area.x -= view->scroll_x;
 	view_area.y -= view->scroll_y;
 
@@ -2308,10 +2311,10 @@ ev_view_size_allocate (GtkWidget      *widget,
 			continue;
 
 		form_field_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache,
-									     field->page);
+									     field->page->index);
 		ev_form_field_mapping_get_area (form_field_mapping, field, &field_area);
 
-		doc_rect_to_view_rect (view, field->page, &field_area, &view_area);
+		doc_rect_to_view_rect (view, field->page->index, &field_area, &view_area);
 		view_area.x -= view->scroll_x;
 		view_area.y -= view->scroll_y;
 
@@ -2385,15 +2388,16 @@ ev_view_scroll_event (GtkWidget *widget, GdkEventScroll *event)
 	}
 
 	view->jump_to_find_result = FALSE;
+
 	/* Shift+Wheel scrolls the in the perpendicular direction */
 	if (state & GDK_SHIFT_MASK) {
 		if (event->direction == GDK_SCROLL_UP)
 			event->direction = GDK_SCROLL_LEFT;
-		if (event->direction == GDK_SCROLL_LEFT)
+		else if (event->direction == GDK_SCROLL_LEFT)
 			event->direction = GDK_SCROLL_UP;
-		if (event->direction == GDK_SCROLL_DOWN)
+		else if (event->direction == GDK_SCROLL_DOWN)
 			event->direction = GDK_SCROLL_RIGHT;
-		if (event->direction == GDK_SCROLL_RIGHT)
+		else if (event->direction == GDK_SCROLL_RIGHT)
 			event->direction = GDK_SCROLL_DOWN;
 
 		event->state &= ~GDK_SHIFT_MASK;
@@ -2480,7 +2484,7 @@ ev_view_expose_event (GtkWidget      *widget,
 	cairo_t *cr;
 	gint     i;
 
-	if (view->animation) {
+	if (view->animation && ev_transition_animation_ready (view->animation)) {
 		GdkRectangle page_area;
 		GtkBorder    border;
 
@@ -2686,15 +2690,12 @@ ev_view_button_press_event (GtkWidget      *widget,
 	
 	view->pressed_button = event->button;
 	view->selection_info.in_drag = FALSE;
+
+	if (view->scroll_info.autoscrolling)
+		return TRUE;
 	
 	switch (event->button) {
 	        case 1: {
-
-			if (view->scroll_info.autoscrolling == TRUE) {
-				view->scroll_info.autoscrolling = FALSE;
-				return TRUE;
-			}
-
 			EvImage *image;
 			EvFormField *field;
 
@@ -2733,10 +2734,6 @@ ev_view_button_press_event (GtkWidget      *widget,
 		case 2:
 			/* use root coordinates as reference point because
 			 * scrolling changes window relative coordinates */
-			if (view->scroll_info.autoscrolling == TRUE) {
-				view->scroll_info.autoscrolling = FALSE;
-				return TRUE;
-			}
 			view->drag_info.start.x = event->x_root;
 			view->drag_info.start.y = event->y_root;
 			view->drag_info.hadj = gtk_adjustment_get_value (view->hadjustment);
@@ -2746,8 +2743,7 @@ ev_view_button_press_event (GtkWidget      *widget,
 
 			return TRUE;
 		case 3:
-			if (!view->scroll_info.autoscrolling)
-				view->scroll_info.start_y = event->y;
+			view->scroll_info.start_y = event->y;
 			return ev_view_do_popup_menu (view, event->x, event->y);
 	}
 	
@@ -2794,16 +2790,28 @@ ev_view_drag_data_get (GtkWidget        *widget,
 			if (view->image_dnd_info.image) {
 				GdkPixbuf *pixbuf;
 
-				pixbuf = ev_image_get_pixbuf (view->image_dnd_info.image);
+				ev_document_doc_mutex_lock ();
+				pixbuf = ev_document_images_get_image (EV_DOCUMENT_IMAGES (view->document),
+								       view->image_dnd_info.image);
+				ev_document_doc_mutex_unlock ();
+				
 				gtk_selection_data_set_pixbuf (selection_data, pixbuf);
+				g_object_unref (pixbuf);
 			}
 			break;
 	        case TARGET_DND_URI:
 			if (view->image_dnd_info.image) {
+				GdkPixbuf   *pixbuf;
 				const gchar *tmp_uri;
 				gchar      **uris;
 
-				tmp_uri = ev_image_save_tmp (view->image_dnd_info.image);
+				ev_document_doc_mutex_lock ();
+				pixbuf = ev_document_images_get_image (EV_DOCUMENT_IMAGES (view->document),
+								       view->image_dnd_info.image);
+				ev_document_doc_mutex_unlock ();
+				
+				tmp_uri = ev_image_save_tmp (view->image_dnd_info.image, pixbuf);
+				g_object_unref (pixbuf);
 
 				uris = g_new0 (gchar *, 2);
 				uris[0] = (gchar *)tmp_uri;
@@ -2992,6 +3000,7 @@ ev_view_motion_notify_event (GtkWidget      *widget,
 
 	if (view->scroll_info.autoscrolling) {
 		view->scroll_info.last_y = y;
+		return TRUE;
 	}
 
 	if (view->selection_info.in_drag) {
@@ -3125,19 +3134,30 @@ ev_view_button_release_event (GtkWidget      *widget,
 	EvView *view = EV_VIEW (widget);
 	EvLink *link = NULL;
 
-	view->drag_info.in_drag = FALSE;
 	view->image_dnd_info.in_drag = FALSE;
-	
-	view->drag_info.release_timeout_id = g_timeout_add (20,
-			(GSourceFunc)ev_view_scroll_drag_release, view);
 
-	if (view->pressed_button == 2) {
-		ev_view_handle_cursor_over_xy (view, event->x, event->y);
+	if (view->scroll_info.autoscrolling) {
+		ev_view_autoscroll_stop (view);
+		view->pressed_button = -1;
+
+		return TRUE;
+	} 
+
+	if (view->drag_info.in_drag) {
+		view->drag_info.release_timeout_id =
+			g_timeout_add (20,
+				       (GSourceFunc)ev_view_scroll_drag_release, view);
 	}
 
-	if (view->document && view->pressed_button != 3) {
+	if (view->document && !view->drag_info.in_drag && view->pressed_button != 3) {
 		link = ev_view_get_link_at_location (view, event->x, event->y);
 	}
+	
+	view->drag_info.in_drag = FALSE;
+
+	if (view->pressed_button == 2) {
+		ev_view_handle_cursor_over_xy (view, event->x, event->y);
+	}
 
 	view->pressed_button = -1;
 
@@ -3159,6 +3179,7 @@ ev_view_button_release_event (GtkWidget      *widget,
 	}
 
 	if (view->selection_info.selections) {
+		clear_link_selected (view);
 		ev_view_update_primary_selection (view);
 		
 		if (view->selection_info.in_drag) {
@@ -3419,6 +3440,8 @@ ev_view_key_press_event (GtkWidget   *widget,
 	switch (event->keyval) {
 	        case GDK_b:
 	        case GDK_B:
+	        case GDK_period:
+	        case GDK_KP_Decimal:
 			view->presentation_state =
 				(view->presentation_state == EV_PRESENTATION_BLACK) ?
 				EV_PRESENTATION_NORMAL : EV_PRESENTATION_BLACK;
@@ -3720,9 +3743,12 @@ draw_one_page (EvView       *view,
 		page_surface = ev_pixbuf_cache_get_surface (view->pixbuf_cache, page);
 
 		if (!page_surface) {
-			draw_loading_text (view,
-					   &real_page_area,
-					   expose_area);
+			if (!view->presentation) {
+				draw_loading_text (view,
+						   &real_page_area,
+						   expose_area);
+			}
+
 			*page_ready = FALSE;
 
 			return;
@@ -3801,6 +3827,7 @@ ev_view_finalize (GObject *object)
 	g_free (view->find_status);
 
 	clear_selection (view);
+	clear_link_selected (view);
 
 	if (view->image_dnd_info.image)
 		g_object_unref (view->image_dnd_info.image);
@@ -4409,7 +4436,8 @@ ev_view_set_loading (EvView 	  *view,
 	gtk_widget_queue_draw (GTK_WIDGET (view));
 }
 
-static gboolean ev_view_autoscroll_cb (EvView *view)
+static gboolean
+ev_view_autoscroll_cb (EvView *view)
 {
 	gdouble speed, value;
 
@@ -4442,10 +4470,43 @@ static gboolean ev_view_autoscroll_cb (EvView *view)
 
 }
 
-void ev_view_autoscroll(EvView *view)
+void
+ev_view_autoscroll_start (EvView *view)
 {
+	gint x, y;
+	
+	g_return_if_fail (EV_IS_VIEW (view));
+
+	if (view->scroll_info.autoscrolling)
+		return;
+	
 	view->scroll_info.autoscrolling = TRUE;
-	view->scroll_info.timeout_id = g_timeout_add (20, (GSourceFunc)(ev_view_autoscroll_cb), view);
+	view->scroll_info.timeout_id =
+		g_timeout_add (20, (GSourceFunc)ev_view_autoscroll_cb,
+			       view);
+	
+	gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y);
+	ev_view_handle_cursor_over_xy (view, x, y);
+}
+
+void
+ev_view_autoscroll_stop (EvView *view)
+{
+	gint x, y;
+	
+	g_return_if_fail (EV_IS_VIEW (view));
+
+	if (!view->scroll_info.autoscrolling)
+		return;
+
+	view->scroll_info.autoscrolling = FALSE;
+	if (view->scroll_info.timeout_id) {
+		g_source_remove (view->scroll_info.timeout_id);
+		view->scroll_info.timeout_id = 0;
+	}
+
+	gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y);
+	ev_view_handle_cursor_over_xy (view, x, y);
 }
 
 void
@@ -4707,17 +4768,10 @@ ev_view_presentation_transition_start (EvView *view)
 	duration = ev_document_transition_get_page_duration (EV_DOCUMENT_TRANSITION (view->document),
 							     view->current_page);
 	if (duration > 0) {
-#if GLIB_CHECK_VERSION (2, 13, 0)
 		view->trans_timeout_id =
 			g_timeout_add_seconds (duration,
 					       (GSourceFunc) transition_next_page,
 					       view);
-#else
-		view->trans_timeout_id =
-			g_timeout_add (duration * 1000,
-				       (GSourceFunc) transition_next_page,
-				       view);
-#endif
 	}
 }
 
@@ -5284,18 +5338,30 @@ ev_view_find_previous (EvView *view)
 	}
 }
 
-void ev_view_search_changed (EvView *view)
+void
+ev_view_search_changed (EvView *view)
 {
 	/* search string has changed, focus on new search result */
 	view->jump_to_find_result = TRUE;
 }
 
-void ev_view_set_highlight_search (EvView *view, gboolean value)
+void
+ev_view_set_highlight_search (EvView *view, gboolean value)
 {
 	view->highlight_find_results = value;
 	gtk_widget_queue_draw (GTK_WIDGET (view));
 }
 
+void
+ev_view_find_cancel (EvView *view)
+{
+	if (EV_IS_DOCUMENT_FIND (view->document)) {
+		EvDocumentFind *find = EV_DOCUMENT_FIND (view->document);
+
+		ev_document_find_cancel (find);
+	}
+}
+
 /*** Selections ***/
 
 /* compute_new_selection_rect/text calculates the area currently selected by
@@ -5655,15 +5721,19 @@ get_selected_text (EvView *view)
 	EvRenderContext *rc;
 
 	text = g_string_new (NULL);
-	rc = ev_render_context_new (view->rotation, 1, view->scale);
+	rc = ev_render_context_new (NULL, view->rotation, view->scale);
 
 	ev_document_doc_mutex_lock ();
 
 	for (l = view->selection_info.selections; l != NULL; l = l->next) {
 		EvViewSelection *selection = (EvViewSelection *)l->data;
+		EvPage *page;
 		gchar *tmp;
 
-		ev_render_context_set_page (rc, selection->page);
+		page = ev_document_get_page (view->document, selection->page);
+		ev_render_context_set_page (rc, page);
+		g_object_unref (page);
+		
 		tmp = ev_selection_get_selected_text (EV_SELECTION (view->document),
 						      rc, selection->style,
 						      &(selection->rect));
@@ -5672,28 +5742,36 @@ get_selected_text (EvView *view)
 		g_free (tmp);
 	}
 
-	ev_document_doc_mutex_unlock ();
-
 	g_object_unref (rc);
 	
+	ev_document_doc_mutex_unlock ();
+	
 	normalized_text = g_utf8_normalize (text->str, text->len, G_NORMALIZE_NFKC);
 	g_string_free (text, TRUE);
 	return normalized_text;
 }
 
+static void
+ev_view_clipboard_copy (EvView      *view,
+			const gchar *text)
+{
+	GtkClipboard *clipboard;
+
+	clipboard = gtk_widget_get_clipboard (GTK_WIDGET (view),
+					      GDK_SELECTION_CLIPBOARD);
+	gtk_clipboard_set_text (clipboard, text, -1);
+}
+
 void
 ev_view_copy (EvView *ev_view)
 {
-	GtkClipboard *clipboard;
 	char *text;
 
 	if (!EV_IS_SELECTION (ev_view->document))
 		return;
 
 	text = get_selected_text (ev_view);
-	clipboard = gtk_widget_get_clipboard (GTK_WIDGET (ev_view),
-					      GDK_SELECTION_CLIPBOARD);
-	gtk_clipboard_set_text (clipboard, text, -1);
+	ev_view_clipboard_copy (ev_view, text);
 	g_free (text);
 }
 
@@ -5704,15 +5782,20 @@ ev_view_primary_get_cb (GtkClipboard     *clipboard,
 			gpointer          data)
 {
 	EvView *ev_view = EV_VIEW (data);
-	char *text;
 
-	if (!EV_IS_SELECTION (ev_view->document))
-		return;
-
-	text = get_selected_text (ev_view);
-	if (text) {
-		gtk_selection_data_set_text (selection_data, text, -1);
-		g_free (text);
+	if (ev_view->link_selected) {
+		gtk_selection_data_set_text (selection_data,
+					     ev_link_action_get_uri (ev_view->link_selected),
+					     -1);
+	} else if (EV_IS_SELECTION (ev_view->document) &&
+		   ev_view->selection_info.selections) {
+		gchar *text;
+		
+		text = get_selected_text (ev_view);
+		if (text) {
+			gtk_selection_data_set_text (selection_data, text, -1);
+			g_free (text);
+		}
 	}
 }
 
@@ -5723,6 +5806,7 @@ ev_view_primary_clear_cb (GtkClipboard *clipboard,
 	EvView *view = EV_VIEW (data);
 
 	clear_selection (view);
+	clear_link_selected (view);
 }
 
 static void
@@ -5733,7 +5817,7 @@ ev_view_update_primary_selection (EvView *ev_view)
 	clipboard = gtk_widget_get_clipboard (GTK_WIDGET (ev_view),
                                               GDK_SELECTION_PRIMARY);
 
-	if (ev_view->selection_info.selections) {
+	if (ev_view->selection_info.selections || ev_view->link_selected) {
 		if (!gtk_clipboard_set_with_owner (clipboard,
 						   clipboard_targets,
 						   G_N_ELEMENTS (clipboard_targets),
@@ -5747,6 +5831,27 @@ ev_view_update_primary_selection (EvView *ev_view)
 	}
 }
 
+static void
+clear_link_selected (EvView *view)
+{
+	if (view->link_selected) {
+		g_object_unref (view->link_selected);
+		view->link_selected = NULL;
+	}
+}
+
+void
+ev_view_copy_link_address (EvView       *view,
+			   EvLinkAction *action)
+{
+	clear_link_selected (view);
+	
+	ev_view_clipboard_copy (view, ev_link_action_get_uri (action));
+	
+	view->link_selected = g_object_ref (action);
+	ev_view_update_primary_selection (view);
+}
+
 /*** Cursor operations ***/
 
 static GdkCursor *