+2007-08-31 Carlos Garcia Campos <carlosgc@gnome.org>
+
+ * backend/dvi/dvi-document.c: (dvi_document_document_iface_init):
+ * backend/impress/impress-document.c:
+ (impress_document_document_iface_init):
+ * backend/ps/ps-document.c: (ps_document_document_iface_init):
+ * backend/djvu/djvu-document.c:
+ (djvu_document_document_iface_init),
+ (djvu_selection_get_selected_text), (djvu_selection_iface_init):
+ * backend/tiff/tiff-document.c:
+ (tiff_document_document_iface_init):
+ * backend/pixbuf/pixbuf-document.c:
+ (pixbuf_document_document_iface_init):
+ * backend/comics/comics-document.c:
+ (comics_document_document_iface_init):
+ * backend/pdf/ev-poppler.cc: (pdf_document_document_iface_init),
+ (pdf_selection_render_selection),
+ (pdf_selection_get_selected_text),
+ (pdf_selection_get_selection_region),
+ (pdf_selection_get_selection_map), (pdf_selection_iface_init):
+ * libdocument/ev-selection.[ch]: (ev_selection_get_selected_text),
+ (ev_selection_get_selection_region),
+ (ev_selection_get_selection_map):
+ * libdocument/ev-document.[ch]:
+ * shell/ev-pixbuf-cache.[ch]: (add_job),
+ (ev_pixbuf_cache_get_selection_surface), (update_job_selection):
+ * shell/ev-view-private.h:
+ * shell/ev-jobs.[ch]: (ev_job_render_new), (ev_job_render_new),
+ (ev_job_render_run):
+ * shell/ev-window.c: (ev_window_setup_action_sensitivity):
+ * shell/ev-view.c: (start_selection_for_event),
+ (ev_view_button_press_event), (ev_view_drag_data_get),
+ (ev_view_drag_data_received), (ev_view_button_release_event),
+ (compute_new_selection_text), (compute_selections),
+ (ev_view_select_all), (get_selected_text), (ev_view_copy),
+ (ev_view_primary_get_cb):
+
+ Add support for double and triple click selections.
+
2007-08-28 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
* NEWS:
gobject_class->finalize = comics_document_finalize;
}
-static gboolean
-comics_document_can_get_text (EvDocument *document)
-{
- return FALSE;
-}
-
static EvDocumentInfo *
comics_document_get_info (EvDocument *document)
{
{
iface->load = comics_document_load;
iface->save = comics_document_save;
- iface->can_get_text = comics_document_can_get_text;
iface->get_n_pages = comics_document_get_n_pages;
iface->get_page_size = comics_document_get_page_size;
iface->render = comics_document_render;
#include "ev-document-misc.h"
#include "ev-document-find.h"
#include "ev-document-links.h"
+#include "ev-selection.h"
#include <gdk-pixbuf/gdk-pixbuf-core.h>
#include <glib/gi18n.h>
static void djvu_document_file_exporter_iface_init (EvFileExporterIface *iface);
static void djvu_document_find_iface_init (EvDocumentFindIface *iface);
static void djvu_document_document_links_iface_init (EvDocumentLinksIface *iface);
+static void djvu_selection_iface_init (EvSelectionIface *iface);
G_DEFINE_TYPE_WITH_CODE
(DjvuDocument, djvu_document, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (EV_TYPE_FILE_EXPORTER, djvu_document_file_exporter_iface_init);
G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_FIND, djvu_document_find_iface_init);
G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_LINKS, djvu_document_document_links_iface_init);
+ G_IMPLEMENT_INTERFACE (EV_TYPE_SELECTION, djvu_selection_iface_init);
});
gobject_class->finalize = djvu_document_finalize;
}
-static gboolean
-djvu_document_can_get_text (EvDocument *document)
-{
- return TRUE;
-}
-
-
-static char *
-djvu_document_get_text (EvDocument *document, int page, EvRectangle *rect)
-{
- DjvuDocument *djvu_document = DJVU_DOCUMENT (document);
- double width, height;
- EvRectangle rectangle;
- char* text;
-
- djvu_document_get_page_size (document, page, &width, &height);
- rectangle.x1 = rect->x1 / SCALE_FACTOR;
- rectangle.y1 = (height - rect->y2) / SCALE_FACTOR;
- rectangle.x2 = rect->x2 / SCALE_FACTOR;
- rectangle.y2 = (height - rect->y1) / SCALE_FACTOR;
-
- text = djvu_text_copy (djvu_document, page, &rectangle);
-
- if (text == NULL)
- text = g_strdup ("");
-
- return text;
-}
-
static EvDocumentInfo *
djvu_document_get_info (EvDocument *document)
{
{
iface->load = djvu_document_load;
iface->save = djvu_document_save;
- iface->can_get_text = djvu_document_can_get_text;
- iface->get_text = djvu_document_get_text;
iface->get_n_pages = djvu_document_get_n_pages;
iface->get_page_size = djvu_document_get_page_size;
iface->render = djvu_document_render;
iface->get_info = djvu_document_get_info;
}
+static gchar *
+djvu_selection_get_selected_text (EvSelection *selection,
+ EvRenderContext *rc,
+ EvSelectionStyle style,
+ EvRectangle *points)
+{
+ DjvuDocument *djvu_document = DJVU_DOCUMENT (selection);
+ double width, height;
+ EvRectangle rectangle;
+ gchar *text;
+
+ djvu_document_get_page_size (EV_DOCUMENT (djvu_document),
+ rc->page, &width, &height);
+ rectangle.x1 = points->x1 / SCALE_FACTOR;
+ rectangle.y1 = (height - points->y2) / SCALE_FACTOR;
+ rectangle.x2 = points->x2 / SCALE_FACTOR;
+ rectangle.y2 = (height - points->y1) / SCALE_FACTOR;
+
+ text = djvu_text_copy (djvu_document, rc->page, &rectangle);
+
+ if (text == NULL)
+ text = g_strdup ("");
+
+ return text;
+}
+
+static void
+djvu_selection_iface_init (EvSelectionIface *iface)
+{
+ iface->get_selected_text = djvu_selection_get_selected_text;
+}
+
static void
djvu_document_thumbnails_get_dimensions (EvDocumentThumbnails *document,
EvRenderContext *rc,
dvi_context_mutex = g_mutex_new ();
}
-static gboolean
-dvi_document_can_get_text (EvDocument *document)
-{
- return FALSE;
-}
-
static EvDocumentInfo *
dvi_document_get_info (EvDocument *document)
{
{
iface->load = dvi_document_load;
iface->save = dvi_document_save;
- iface->can_get_text = dvi_document_can_get_text;
iface->get_n_pages = dvi_document_get_n_pages;
iface->get_page_size = dvi_document_get_page_size;
iface->render = dvi_document_render;
gobject_class->finalize = impress_document_finalize;
}
-static gboolean
-impress_document_can_get_text (EvDocument *document)
-{
- return FALSE;
-}
-
static EvDocumentInfo *
impress_document_get_info (EvDocument *document)
{
{
iface->load = impress_document_load;
iface->save = impress_document_save;
- iface->can_get_text = impress_document_can_get_text;
iface->get_n_pages = impress_document_get_n_pages;
iface->get_page_size = impress_document_get_page_size;
iface->render = impress_document_render;
document->password = g_strdup (password);
}
-static gboolean
-pdf_document_can_get_text (EvDocument *document)
-{
- return TRUE;
-}
-
static EvDocumentInfo *
pdf_document_get_info (EvDocument *document)
{
return info;
}
-static char *
-pdf_document_get_text (EvDocument *document, int page, EvRectangle *rect)
-{
- PdfDocument *pdf_document = PDF_DOCUMENT (document);
- PopplerPage *poppler_page;
- PopplerRectangle r;
- double height;
- char *text;
-
- poppler_page = poppler_document_get_page (pdf_document->document, page);
- g_return_val_if_fail (poppler_page != NULL, NULL);
-
- poppler_page_get_size (poppler_page, NULL, &height);
- r.x1 = rect->x1;
- r.y1 = height - rect->y2;
- r.x2 = rect->x2;
- r.y2 = height - rect->y1;
-
- text = poppler_page_get_text (poppler_page, &r);
-
- g_object_unref (poppler_page);
-
- return text;
-}
-
static void
pdf_document_document_iface_init (EvDocumentIface *iface)
{
iface->has_attachments = pdf_document_has_attachments;
iface->get_attachments = pdf_document_get_attachments;
iface->render = pdf_document_render;
- iface->get_text = pdf_document_get_text;
- iface->can_get_text = pdf_document_can_get_text;
iface->get_info = pdf_document_get_info;
};
cairo_surface_t **surface,
EvRectangle *points,
EvRectangle *old_points,
+ EvSelectionStyle style,
GdkColor *text,
GdkColor *base)
{
width = (int) ((width_points * rc->scale) + 0.5);
height = (int) ((height_points * rc->scale) + 0.5);
-
#ifdef HAVE_POPPLER_PAGE_RENDER
cairo_t *cr;
cr,
(PopplerRectangle *)points,
(PopplerRectangle *)old_points,
- POPPLER_SELECTION_NORMAL, /* SelectionStyle */
+ (PopplerSelectionStyle)style,
text,
base);
cairo_destroy (cr);
rc->scale, rc->rotation, pixbuf,
(PopplerRectangle *)points,
(PopplerRectangle *)old_points,
- POPPLER_SELECTION_NORMAL, /* SelectionStyle */
+ (PopplerSelectionStyle)style,
text,
base);
if (*surface)
#endif /* HAVE_POPPLER_PAGE_RENDER */
}
+static gchar *
+pdf_selection_get_selected_text (EvSelection *selection,
+ EvRenderContext *rc,
+ EvSelectionStyle style,
+ EvRectangle *points)
+{
+ PdfDocument *pdf_document = PDF_DOCUMENT (selection);
+ PopplerPage *poppler_page;
+ PopplerRectangle r;
+ double height;
+ char *retval;
+
+ poppler_page = poppler_document_get_page (pdf_document->document, rc->page);
+ g_return_val_if_fail (poppler_page != NULL, NULL);
+
+ poppler_page_get_size (poppler_page, NULL, &height);
+ r.x1 = points->x1;
+ r.y1 = height - points->y2;
+ r.x2 = points->x2;
+ r.y2 = height - points->y1;
+
+ retval = poppler_page_get_text (poppler_page,
+ (PopplerSelectionStyle)style,
+ &r);
+
+ g_object_unref (poppler_page);
+
+ return retval;
+}
static GdkRegion *
pdf_selection_get_selection_region (EvSelection *selection,
EvRenderContext *rc,
+ EvSelectionStyle style,
EvRectangle *points)
{
PdfDocument *pdf_document;
retval = poppler_page_get_selection_region ((PopplerPage *)rc->data,
rc->scale,
+ (PopplerSelectionStyle)style,
(PopplerRectangle *) points);
return retval;
}
points.x1 = 0.0;
points.y1 = 0.0;
poppler_page_get_size (poppler_page, &(points.x2), &(points.y2));
- retval = poppler_page_get_selection_region (poppler_page, 1.0, &points);
+ retval = poppler_page_get_selection_region (poppler_page, 1.0,
+ POPPLER_SELECTION_GLYPH,
+ &points);
g_object_unref (poppler_page);
return retval;
pdf_selection_iface_init (EvSelectionIface *iface)
{
iface->render_selection = pdf_selection_render_selection;
+ iface->get_selected_text = pdf_selection_get_selected_text;
iface->get_selection_region = pdf_selection_get_selection_region;
iface->get_selection_map = pdf_selection_get_selection_map;
}
gobject_class->finalize = pixbuf_document_finalize;
}
-static gboolean
-pixbuf_document_can_get_text (EvDocument *document)
-{
- return FALSE;
-}
-
static EvDocumentInfo *
pixbuf_document_get_info (EvDocument *document)
{
{
iface->load = pixbuf_document_load;
iface->save = pixbuf_document_save;
- iface->can_get_text = pixbuf_document_can_get_text;
iface->get_n_pages = pixbuf_document_get_n_pages;
iface->get_page_size = pixbuf_document_get_page_size;
iface->render = pixbuf_document_render;
}
}
-static gboolean
-ps_document_can_get_text (EvDocument *document)
-{
- return FALSE;
-}
-
static EvDocumentInfo *
ps_document_get_info (EvDocument *document)
{
{
iface->load = ps_document_load;
iface->save = ps_document_save;
- iface->can_get_text = ps_document_can_get_text;
iface->get_n_pages = ps_document_get_n_pages;
iface->get_page_size = ps_document_get_page_size;
iface->get_info = ps_document_get_info;
gobject_class->finalize = tiff_document_finalize;
}
-static gboolean
-tiff_document_can_get_text (EvDocument *document)
-{
- return FALSE;
-}
-
static EvDocumentInfo *
tiff_document_get_info (EvDocument *document)
{
{
iface->load = tiff_document_load;
iface->save = tiff_document_save;
- iface->can_get_text = tiff_document_can_get_text;
iface->get_n_pages = tiff_document_get_n_pages;
iface->get_page_size = tiff_document_get_page_size;
iface->render = tiff_document_render;
return iface->get_page_label (document, page);
}
-gboolean
-ev_document_can_get_text (EvDocument *document)
-{
- EvDocumentIface *iface = EV_DOCUMENT_GET_IFACE (document);
-
- return iface->can_get_text (document);
-}
-
EvDocumentInfo *
ev_document_get_info (EvDocument *document)
{
return iface->get_info (document);
}
-char *
-ev_document_get_text (EvDocument *document,
- int page,
- EvRectangle *rect)
-{
- EvDocumentIface *iface = EV_DOCUMENT_GET_IFACE (document);
- char *retval;
-
- LOG ("ev_document_get_text");
- retval = iface->get_text (document, page, rect);
-
- return retval;
-}
-
gboolean
ev_document_has_attachments (EvDocument *document)
{
double *height);
char * (* get_page_label) (EvDocument *document,
int page);
- gboolean (* can_get_text) (EvDocument *document);
- char * (* get_text) (EvDocument *document,
- int page,
- EvRectangle *rect);
gboolean (* has_attachments) (EvDocument *document);
GList * (* get_attachments) (EvDocument *document);
cairo_surface_t * (* render) (EvDocument *document,
double *height);
char *ev_document_get_page_label (EvDocument *document,
int page);
-gboolean ev_document_can_get_text (EvDocument *document);
-char *ev_document_get_text (EvDocument *document,
- int page,
- EvRectangle *rect);
gboolean ev_document_has_attachments (EvDocument *document);
GList *ev_document_get_attachments (EvDocument *document);
cairo_surface_t *ev_document_render (EvDocument *document,
cairo_surface_t **surface,
EvRectangle *points,
EvRectangle *old_points,
- GdkColor *text,
- GdkColor *base)
+ EvSelectionStyle style,
+ GdkColor *text,
+ GdkColor *base)
{
EvSelectionIface *iface = EV_SELECTION_GET_IFACE (selection);
+ if (!iface->render_selection)
+ return;
+
iface->render_selection (selection, rc,
surface,
points, old_points,
+ style,
text, base);
}
+gchar *
+ev_selection_get_selected_text (EvSelection *selection,
+ EvRenderContext *rc,
+ EvSelectionStyle style,
+ EvRectangle *points)
+{
+ EvSelectionIface *iface = EV_SELECTION_GET_IFACE (selection);
+
+ return iface->get_selected_text (selection, rc, style, points);
+}
+
GdkRegion *
ev_selection_get_selection_region (EvSelection *selection,
EvRenderContext *rc,
+ EvSelectionStyle style,
EvRectangle *points)
{
EvSelectionIface *iface = EV_SELECTION_GET_IFACE (selection);
- return iface->get_selection_region (selection, rc, points);
+ if (!iface->get_selection_region)
+ return NULL;
+
+ return iface->get_selection_region (selection, rc, style, points);
}
GdkRegion *
{
EvSelectionIface *iface = EV_SELECTION_GET_IFACE (selection);
+ if (!iface->get_selection_map)
+ return NULL;
+
return iface->get_selection_map (selection, rc);
}
#define EV_IS_SELECTION_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EV_TYPE_SELECTION))
#define EV_SELECTION_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_SELECTION, EvSelectionIface))
+typedef enum {
+ EV_SELECTION_STYLE_GLYPH,
+ EV_SELECTION_STYLE_WORD,
+ EV_SELECTION_STYLE_LINE
+} EvSelectionStyle;
+
typedef struct _EvSelection EvSelection;
typedef struct _EvSelectionIface EvSelectionIface;
cairo_surface_t **surface,
EvRectangle *points,
EvRectangle *old_points,
- GdkColor *text,
- GdkColor *base);
+ EvSelectionStyle style,
+ GdkColor *text,
+ GdkColor *base);
+ gchar * (* get_selected_text) (EvSelection *selection,
+ EvRenderContext *rc,
+ EvSelectionStyle style,
+ EvRectangle *points);
GdkRegion * (* get_selection_map) (EvSelection *selection,
EvRenderContext *rc);
GdkRegion * (* get_selection_region) (EvSelection *selection,
EvRenderContext *rc,
+ EvSelectionStyle style,
EvRectangle *points);
};
cairo_surface_t **surface,
EvRectangle *points,
EvRectangle *old_points,
+ EvSelectionStyle style,
GdkColor *text,
GdkColor *base);
+gchar *ev_selection_get_selected_text (EvSelection *selection,
+ EvRenderContext *rc,
+ EvSelectionStyle style,
+ EvRectangle *points);
GdkRegion *ev_selection_get_selection_map (EvSelection *selection,
EvRenderContext *rc);
GdkRegion *ev_selection_get_selection_region (EvSelection *selection,
EvRenderContext *rc,
+ EvSelectionStyle style,
EvRectangle *points);
G_END_DECLS
#include "ev-document-misc.h"
#include "ev-file-helpers.h"
#include "ev-document-fonts.h"
-#include "ev-selection.h"
#include "ev-async-renderer.h"
#include <glib/gstdio.h>
gint width,
gint height,
EvRectangle *selection_points,
+ EvSelectionStyle selection_style,
GdkColor *text,
GdkColor *base,
gboolean include_forms,
job->rc = g_object_ref (rc);
job->target_width = width;
job->target_height = height;
+ job->selection_style = selection_style;
job->text = *text;
job->base = *base;
job->include_forms = include_forms;
&(job->selection),
&(job->selection_points),
NULL,
+ job->selection_style,
&(job->text), &(job->base));
job->selection_region =
ev_selection_get_selection_region (EV_SELECTION (EV_JOB (job)->document),
job->rc,
+ job->selection_style,
&(job->selection_points));
}
#include "ev-document.h"
#include "ev-window.h"
#include "ev-file-exporter.h"
+#include "ev-selection.h"
G_BEGIN_DECLS
cairo_surface_t *selection;
GdkRegion *selection_region;
EvRectangle selection_points;
+ EvSelectionStyle selection_style;
GdkColor base;
GdkColor text;
gint width,
gint height,
EvRectangle *selection_points,
+ EvSelectionStyle selection_style,
GdkColor *text,
GdkColor *base,
gboolean include_forms,
#include "ev-pixbuf-cache.h"
#include "ev-job-queue.h"
#include "ev-page-cache.h"
-#include "ev-selection.h"
#include "ev-document-images.h"
#include "ev-document-forms.h"
#include "ev-image.h"
/* Selection data.
* Selection_points are the coordinates encapsulated in selection.
* target_points is the target selection size. */
- EvRectangle selection_points;
- EvRectangle target_points;
- gboolean points_set;
+ EvRectangle selection_points;
+ EvRectangle target_points;
+ EvSelectionStyle selection_style;
+ gboolean points_set;
cairo_surface_t *selection;
GdkRegion *selection_region;
job_info->rc,
width, height,
&(job_info->target_points),
+ job_info->selection_style,
text, base,
include_forms,
include_links,
job_info->selection_region =
ev_selection_get_selection_region (EV_SELECTION (pixbuf_cache->document),
job_info->rc,
+ job_info->selection_style,
&(job_info->target_points));
gtk_widget_ensure_style (pixbuf_cache->view);
job_info->rc, &(job_info->selection),
&(job_info->target_points),
old_points,
+ job_info->selection_style,
text, base);
job_info->selection_points = job_info->target_points;
ev_document_doc_mutex_unlock ();
{
job_info->points_set = TRUE;
job_info->target_points = selection->rect;
+ job_info->selection_style = selection->style;
}
static void
#include <gtk/gtkwidget.h>
#include "ev-document.h"
+#include "ev-selection.h"
#include "ev-job-queue.h"
G_BEGIN_DECLS
int page;
EvRectangle rect;
GdkRegion *covered_region;
+ EvSelectionStyle style;
} EvViewSelection;
typedef struct _EvPixbufCache EvPixbufCache;
#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 {
GdkPoint start;
gboolean in_selection;
GList *selections;
+ EvSelectionStyle style;
} SelectionInfo;
/* Information for handling images DND */
#include "ev-view.h"
#include "ev-view-private.h"
#include "ev-utils.h"
-#include "ev-selection.h"
#include "ev-document-links.h"
#include "ev-document-images.h"
#include "ev-document-find.h"
/*** Selection ***/
static void compute_selections (EvView *view,
+ EvSelectionStyle style,
GdkPoint *start,
GdkPoint *stop);
static void clear_selection (EvView *view);
}
#endif /* GTK_CHECK_VERSION (2, 11, 7) */
+static void
+start_selection_for_event (EvView *view,
+ GdkEventButton *event)
+{
+ EvSelectionStyle style;
+
+ clear_selection (view);
+
+ view->selection_info.start.x = event->x + view->scroll_x;
+ view->selection_info.start.y = event->y + view->scroll_y;
+
+ switch (event->type) {
+ case GDK_2BUTTON_PRESS:
+ style = EV_SELECTION_STYLE_WORD;
+ break;
+ case GDK_3BUTTON_PRESS:
+ style = EV_SELECTION_STYLE_LINE;
+ break;
+ default:
+ style = EV_SELECTION_STYLE_GLYPH;
+ break;
+ }
+
+ view->selection_info.style = style;
+}
+
static gboolean
ev_view_button_press_event (GtkWidget *widget,
GdkEventButton *event)
EvImage *image;
EvFormField *field;
- if (view->selection_info.selections) {
- if (location_in_selected_text (view,
+ if (EV_IS_SELECTION (view->document) && view->selection_info.selections) {
+ if (event->type == GDK_3BUTTON_PRESS) {
+ start_selection_for_event (view, event);
+ } else if (location_in_selected_text (view,
event->x + view->scroll_x,
event->y + view->scroll_y)) {
view->selection_info.in_drag = TRUE;
} else {
- clear_selection (view);
-
- view->selection_info.start.x = event->x + view->scroll_x;
- view->selection_info.start.y = event->y + view->scroll_y;
+ start_selection_for_event (view, event);
}
-
+
gtk_widget_queue_draw (widget);
} else if (!location_in_text (view, event->x + view->scroll_x, event->y + view->scroll_y) &&
(image = ev_view_get_image_at_location (view, event->x, event->y))) {
ev_view_handle_form_field (view, field, event->x, event->y);
} else {
ev_view_remove_all (view);
- view->selection_info.start.x = event->x + view->scroll_x;
- view->selection_info.start.y = event->y + view->scroll_y;
+
+ if (EV_IS_SELECTION (view->document))
+ start_selection_for_event (view, event);
}
}
return TRUE;
switch (info) {
case TARGET_DND_TEXT:
- if (view->selection_info.selections &&
- ev_document_can_get_text (view->document)) {
+ if (EV_IS_SELECTION (view->document) &&
+ view->selection_info.selections) {
gchar *text;
text = get_selected_text (view);
-
gtk_selection_data_set_text (selection_data,
text,
strlen (text));
-
g_free (text);
}
break;
static gboolean
selection_update_idle_cb (EvView *view)
{
- compute_selections (view, &view->selection_info.start, &view->motion);
+ compute_selections (view,
+ view->selection_info.style,
+ &view->selection_info.start,
+ &view->motion);
view->selection_update_id = 0;
return FALSE;
}
view->selection_update_id = 0;
}
+ if (!view->selection_info.in_selection &&
+ view->selection_info.style != EV_SELECTION_STYLE_GLYPH) {
+ compute_selections (view,
+ view->selection_info.style,
+ &(view->selection_info.start),
+ &(view->selection_info.start));
+ }
+
if (view->selection_info.selections) {
ev_view_update_primary_selection (view);
}
static GList *
-compute_new_selection_text (EvView *view,
- GdkPoint *start,
- GdkPoint *stop)
+compute_new_selection_text (EvView *view,
+ EvSelectionStyle style,
+ GdkPoint *start,
+ GdkPoint *stop)
{
int n_pages, i, first, last;
GList *list = NULL;
selection = g_new0 (EvViewSelection, 1);
selection->page = i;
+ selection->style = style;
selection->rect.x1 = selection->rect.y1 = 0;
selection->rect.x2 = width;
selection->rect.y2 = height;
}
static void
-compute_selections (EvView *view,
- GdkPoint *start,
- GdkPoint *stop)
+compute_selections (EvView *view,
+ EvSelectionStyle style,
+ GdkPoint *start,
+ GdkPoint *stop)
{
GList *list;
if (view->selection_mode == EV_VIEW_SELECTION_RECTANGLE)
list = compute_new_selection_rect (view, start, stop);
else
- list = compute_new_selection_text (view, start, stop);
+ list = compute_new_selection_text (view, style, start, stop);
merge_selection_region (view, list);
}
g_object_notify (G_OBJECT (view), "has-selection");
}
-
void
ev_view_select_all (EvView *view)
{
+ GList *selections = NULL;
int n_pages, i;
/* Disable selection on rotated pages for the 0.4.0 series */
return;
clear_selection (view);
-
+
n_pages = ev_page_cache_get_n_pages (view->page_cache);
for (i = 0; i < n_pages; i++) {
int width, height;
selection = g_new0 (EvViewSelection, 1);
selection->page = i;
+ selection->style = EV_SELECTION_STYLE_GLYPH;
selection->rect.x1 = selection->rect.y1 = 0;
selection->rect.x2 = width;
selection->rect.y2 = height;
- view->selection_info.selections = g_list_append (view->selection_info.selections, selection);
+ selections = g_list_append (selections, selection);
}
- ev_pixbuf_cache_set_selection_list (view->pixbuf_cache, view->selection_info.selections);
- g_object_notify (G_OBJECT (view), "has-selection");
+ merge_selection_region (view, selections);
gtk_widget_queue_draw (GTK_WIDGET (view));
}
}
static char *
-get_selected_text (EvView *ev_view)
+get_selected_text (EvView *view)
{
GString *text;
GList *l;
gchar *normalized_text;
+ EvRenderContext *rc;
text = g_string_new (NULL);
+ rc = ev_render_context_new (view->rotation, 1, view->scale);
ev_document_doc_mutex_lock ();
- for (l = ev_view->selection_info.selections; l != NULL; l = l->next) {
+ for (l = view->selection_info.selections; l != NULL; l = l->next) {
EvViewSelection *selection = (EvViewSelection *)l->data;
- char *tmp;
+ gchar *tmp;
+
+ ev_render_context_set_page (rc, selection->page);
+ tmp = ev_selection_get_selected_text (EV_SELECTION (view->document),
+ rc, selection->style,
+ &(selection->rect));
- tmp = ev_document_get_text (ev_view->document,
- selection->page,
- &selection->rect);
g_string_append (text, tmp);
g_free (tmp);
}
ev_document_doc_mutex_unlock ();
+ g_object_unref (rc);
+
normalized_text = g_utf8_normalize (text->str, text->len, G_NORMALIZE_NFKC);
g_string_free (text, TRUE);
return normalized_text;
GtkClipboard *clipboard;
char *text;
- if (!ev_document_can_get_text (ev_view->document)) {
+ if (!EV_IS_SELECTION (ev_view->document))
return;
- }
text = get_selected_text (ev_view);
clipboard = gtk_widget_get_clipboard (GTK_WIDGET (ev_view),
EvView *ev_view = EV_VIEW (data);
char *text;
- if (!ev_document_can_get_text (ev_view->document)) {
+ if (!EV_IS_SELECTION (ev_view->document))
return;
- }
text = get_selected_text (ev_view);
if (text) {
has_properties = FALSE;
}
- if (has_document && ev_document_can_get_text (document)) {
+ if (has_document && EV_IS_SELECTION (document)) {
can_get_text = TRUE;
}
https://www.fi.muni.cz/~kas/git / evince.git / commitdiff