X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-view.c;h=476c791b0a93cde94367c4325a18bed6e5f37ddf;hb=de3612f2a4b46b555edc50ca344a04bc3a8f7280;hp=c9eb4d2ee0233277bc778f4625e4d396e6e4cf42;hpb=df1b45e49e809c90e5f79e36c2da95b342d063d6;p=evince.git

diff --git a/shell/ev-view.c b/shell/ev-view.c
index c9eb4d2e..476c791b 100644
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -78,6 +78,7 @@ static guint signals[N_SIGNALS];
 
 typedef enum {
 	EV_VIEW_CURSOR_NORMAL,
+	EV_VIEW_CURSOR_IBEAM,
 	EV_VIEW_CURSOR_LINK,
 	EV_VIEW_CURSOR_WAIT,
 	EV_VIEW_CURSOR_HIDDEN,
@@ -944,6 +945,28 @@ find_page_at_location (EvView  *view,
 	*page = -1;
 }
 
+static gboolean
+location_in_text (EvView  *view,
+		  gdouble  x,
+		  gdouble  y)
+{
+	GdkRegion *region;
+	gint page = -1;
+	gint x_offset = 0, y_offset = 0;
+
+	find_page_at_location (view, x, y, &page, &x_offset, &y_offset);
+
+	if (page == -1)
+		return FALSE;
+	
+	region = ev_pixbuf_cache_get_text_mapping (view->pixbuf_cache, page);
+
+	if (region)
+		return gdk_region_point_in (region, x_offset / view->scale, y_offset / view->scale);
+	else
+		return FALSE;
+}
+
 /*** Hyperref ***/
 static EvLink *
 get_link_at_location (EvView  *view,
@@ -1337,7 +1360,7 @@ ev_view_button_press_event (GtkWidget      *widget,
 			}
 
 			view->selection_info.start.x = event->x + view->scroll_x;
-			view->selection_info.start.y = event->y + view->scroll_x;
+			view->selection_info.start.y = event->y + view->scroll_y;
 			return TRUE;
 		case 2:
 			/* use root coordinates as reference point because
@@ -1420,11 +1443,13 @@ ev_view_motion_notify_event (GtkWidget      *widget,
 			ev_view_set_status (view, msg);
 			ev_view_set_cursor (view, EV_VIEW_CURSOR_LINK);
 			g_free (msg);
+		} else if (location_in_text (view, event->x + view->scroll_x, event->y + view->scroll_y)) {
+			ev_view_set_cursor (view, EV_VIEW_CURSOR_IBEAM);
 		} else {
 			ev_view_set_status (view, NULL);
-			if (view->cursor == EV_VIEW_CURSOR_LINK) {
+			if (view->cursor == EV_VIEW_CURSOR_LINK ||
+			    view->cursor == EV_VIEW_CURSOR_IBEAM)
 				ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL);
-			}
 		}
 		return TRUE;
 	}
@@ -3036,6 +3061,9 @@ ev_view_set_cursor (EvView *view, EvViewCursor new_cursor)
 		case EV_VIEW_CURSOR_NORMAL:
 			gdk_window_set_cursor (widget->window, NULL);
 			break;
+		case EV_VIEW_CURSOR_IBEAM:
+			cursor = gdk_cursor_new_for_display (display, GDK_XTERM);
+			break;
 		case EV_VIEW_CURSOR_LINK:
 			cursor = gdk_cursor_new_for_display (display, GDK_HAND2);
 			break;