Index: backend/Makefile.am =================================================================== RCS file: /cvs/gnome/evince/backend/Makefile.am,v retrieving revision 1.27 diff -u -8 -p -r1.27 Makefile.am --- backend/Makefile.am 2 May 2006 19:02:45 -0000 1.27 +++ backend/Makefile.am 3 May 2006 21:05:30 -0000 @@ -36,16 +36,18 @@ libevbackend_la_SOURCES= \ ev-document-fonts.h \ ev-document-links.c \ ev-document-links.h \ ev-document-security.c \ ev-document-security.h \ ev-document-find.c \ ev-document-find.h \ ev-document-info.h \ + ev-form.h \ + ev-form.c \ ev-ps-exporter.c \ ev-ps-exporter.h \ ev-render-context.h \ ev-render-context.c \ ev-selection.h \ ev-selection.c \ ev-document-misc.h \ ev-document-misc.c Index: backend/ev-document.c =================================================================== RCS file: /cvs/gnome/evince/backend/ev-document.c,v retrieving revision 1.35 diff -u -8 -p -r1.35 ev-document.c --- backend/ev-document.c 2 May 2006 19:02:45 -0000 1.35 +++ backend/ev-document.c 3 May 2006 21:05:30 -0000 @@ -220,16 +220,30 @@ ev_document_render_pixbuf (EvDocument LOG ("ev_document_render_pixbuf"); g_assert (iface->render_pixbuf); retval = iface->render_pixbuf (document, rc); return retval; } +GList * +ev_document_get_form_fields (EvDocument *document, + int page) +{ + EvDocumentIface *iface = EV_DOCUMENT_GET_IFACE (document); + GList *retval; + + LOG("ev_document_get_form_fields"); + if (iface->get_form_fields == NULL) + return NULL; + retval = iface->get_form_fields (document, page); + return retval; +} + void ev_document_info_free (EvDocumentInfo *info) { if (info == NULL) return; g_free (info->title); g_free (info->format); Index: backend/ev-document.h =================================================================== RCS file: /cvs/gnome/evince/backend/ev-document.h,v retrieving revision 1.34 diff -u -8 -p -r1.34 ev-document.h --- backend/ev-document.h 2 May 2006 19:02:45 -0000 1.34 +++ backend/ev-document.h 3 May 2006 21:05:30 -0000 @@ -22,16 +22,17 @@ #ifndef EV_DOCUMENT_H #define EV_DOCUMENT_H #include #include #include #include "ev-link.h" +#include "ev-form.h" #include "ev-document-info.h" #include "ev-render-context.h" G_BEGIN_DECLS #define EV_TYPE_DOCUMENT (ev_document_get_type ()) #define EV_DOCUMENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EV_TYPE_DOCUMENT, EvDocument)) #define EV_DOCUMENT_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT, EvDocumentIface)) @@ -83,16 +84,19 @@ struct _EvDocumentIface double *width, 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); + GList * (* get_form_fields) (EvDocument *document, + int page); + gboolean (* has_attachments) (EvDocument *document); GList * (* get_attachments) (EvDocument *document); GdkPixbuf * (* render_pixbuf) (EvDocument *document, EvRenderContext *rc); EvDocumentInfo * (* get_info) (EvDocument *document); }; GType ev_document_get_type (void); @@ -121,13 +125,16 @@ char *ev_document_get_text EvRectangle *rect); gboolean ev_document_has_attachments (EvDocument *document); GList *ev_document_get_attachments (EvDocument *document); GdkPixbuf *ev_document_render_pixbuf (EvDocument *document, EvRenderContext *rc); gint ev_rect_cmp (EvRectangle *a, EvRectangle *b); + +GList *ev_document_get_form_fields (EvDocument *document, + int page); G_END_DECLS #endif Index: backend/ev-form.c =================================================================== RCS file: backend/ev-form.c diff -N backend/ev-form.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ backend/ev-form.c 3 May 2006 21:05:30 -0000 @@ -0,0 +1,402 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; c-indent-level: 8 -*- */ +/* this file is part of evince, a gnome document viewer + * + * Copyright (C) 2005 Red Hat, Inc. + * Copyright (C) 2006 Julien Rebetez + * + * Evince is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * Evince is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "ev-form.h" + +enum { + PROP_0, + PROP_TITLE, + PROP_TYPE, + PROP_X1, + PROP_Y1, + PROP_X2, + PROP_Y2 +}; + +struct _EvFormField { + GObject base_instance; + EvFormFieldPrivate *priv; +}; + +struct _EvFormFieldClass { + GObjectClass base_class; +}; + +struct _EvFormFieldPrivate { + char *title; + EvFormFieldType type; + gdouble x1; + gdouble y1; + gdouble x2; + gdouble y2; +}; + +G_DEFINE_TYPE (EvFormField, ev_form_field, G_TYPE_OBJECT) + +#define EV_FORM_FIELD_GET_PRIVATE(object) \ + (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_FORM_FIELD, EvFormFieldPrivate)) + +GType +ev_form_field_type_get_type (void) +{ + static GType type = 0; + + if (G_UNLIKELY (type == 0)) { + static const GEnumValue values[] = { + { EV_FORM_FIELD_TYPE_BUTTON, "EV_FORM_FIELD_TYPE_TITLE", "button" }, + { EV_FORM_FIELD_TYPE_TEXT, "EV_FORM_FIELD_TYPE_TEXT", "text" }, + { EV_FORM_FIELD_TYPE_CHOICE, "EV_FORM_FIELD_TYPE_CHOICE", "choice" }, + { EV_FORM_FIELD_TYPE_SIGNATURE, "EV_FORM_FIELD_TYPE_SIGNATURE", "signature"}, + { 0, NULL, NULL } + }; + + type = g_enum_register_static ("EvFormFieldType", values); + } + + return type; +} + +const char * +ev_form_field_get_title (EvFormField *self) +{ + g_return_val_if_fail (EV_IS_FORM_FIELD (self), NULL); + + return self->priv->title; +} + + +EvFormFieldType +ev_form_field_get_form_field_type (EvFormField *self) +{ + g_return_val_if_fail (EV_IS_FORM_FIELD (self), 0); + + return self->priv->type; +} + +double +ev_form_field_get_x1 (EvFormField *field) +{ + g_return_val_if_fail (EV_IS_FORM_FIELD(field), 0); + return field->priv->x1; +} + +double +ev_form_field_get_y1 (EvFormField *field) +{ + g_return_val_if_fail (EV_IS_FORM_FIELD(field), 0); + return field->priv->y1; +} + +double +ev_form_field_get_x2 (EvFormField *field) +{ + g_return_val_if_fail (EV_IS_FORM_FIELD(field), 0); + return field->priv->x2; +} + +double +ev_form_field_get_y2 (EvFormField *field) +{ + g_return_val_if_fail (EV_IS_FORM_FIELD(field), 0); + return field->priv->y2; +} + +static void +ev_form_field_get_property (GObject *object, guint prop_id, GValue *value, + GParamSpec *param_spec) +{ + EvFormField *self; + + self = EV_FORM_FIELD (object); + + switch (prop_id) { + case PROP_TITLE: + g_value_set_string (value, self->priv->title); + break; + case PROP_TYPE: + g_value_set_enum (value, self->priv->type); + break; + case PROP_X1: + g_value_set_double (value, self->priv->x1); + break; + case PROP_Y1: + g_value_set_double (value, self->priv->y1); + break; + case PROP_X2: + g_value_set_double (value, self->priv->x2); + break; + case PROP_Y2: + g_value_set_double (value, self->priv->y2); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, + prop_id, + param_spec); + break; + } +} + +static void +ev_form_field_set_property (GObject *object, guint prop_id, const GValue *value, + GParamSpec *param_spec) +{ + EvFormField *field = EV_FORM_FIELD (object); + + switch (prop_id) { + case PROP_TITLE: + field->priv->title = g_strdup (g_value_get_string (value)); + break; + case PROP_TYPE: + field->priv->type = g_value_get_enum (value); + break; + case PROP_X1: + field->priv->x1 = g_value_get_double (value); + break; + case PROP_Y1: + field->priv->y1 = g_value_get_double (value); + break; + case PROP_X2: + field->priv->x2 = g_value_get_double (value); + break; + case PROP_Y2: + field->priv->y2 = g_value_get_double (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, + prop_id, + param_spec); + break; + } +} + +static void +ev_window_dispose (GObject *object) +{ + EvFormFieldPrivate *priv; + + g_return_if_fail (EV_IS_FORM_FIELD (object)); + + priv = EV_FORM_FIELD (object)->priv; + + if (priv->title) { + g_free (priv->title); + priv->title = NULL; + } + + G_OBJECT_CLASS (ev_form_field_parent_class)->dispose (object); +} + +static void +ev_form_field_init (EvFormField *ev_form_field) +{ + ev_form_field->priv = EV_FORM_FIELD_GET_PRIVATE (ev_form_field); +/* ev_form_field->priv->page = -1;*/ + ev_form_field->priv->type = EV_FORM_FIELD_TYPE_BUTTON; +} + +static void +ev_form_field_class_init (EvFormFieldClass *ev_window_class) +{ + GObjectClass *g_object_class; + + g_object_class = G_OBJECT_CLASS (ev_window_class); + g_object_class->dispose = ev_window_dispose; + g_object_class->set_property = ev_form_field_set_property; + g_object_class->get_property = ev_form_field_get_property; + + g_type_class_add_private (g_object_class, sizeof (EvFormFieldPrivate)); + + g_object_class_install_property (g_object_class, + PROP_TITLE, + g_param_spec_string ("title", + "Form Field Title", + "The form field title", + NULL, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (g_object_class, + PROP_TYPE, + g_param_spec_enum ("type", + "Form Field Type", + "The form field type", + EV_TYPE_FORM_FIELD_TYPE, + EV_FORM_FIELD_TYPE_BUTTON, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (g_object_class, + PROP_X1, + g_param_spec_double ("x1", + "Bounding rect x1 coord", + "The x1 coord of bounding rect", + -G_MAXDOUBLE, + G_MAXDOUBLE, + 0, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (g_object_class, + PROP_Y1, + g_param_spec_double ("y1", + "Bounding rect y1 coord", + "The y1 coord of bounding rect", + -G_MAXDOUBLE, + G_MAXDOUBLE, + 0, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (g_object_class, + PROP_X2, + g_param_spec_double ("x2", + "Bounding rect x2 coord", + "The x2 coord of bounding rect", + -G_MAXDOUBLE, + G_MAXDOUBLE, + 0, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (g_object_class, + PROP_Y2, + g_param_spec_double ("y2", + "Bounding rect y2 coord", + "The y2 coord of bounding rect", + -G_MAXDOUBLE, + G_MAXDOUBLE, + 0, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY)); +} + +EvFormField * +ev_form_field_new_button (const char *title, + gdouble px1, + gdouble py1, + gdouble px2, + gdouble py2) +{ + return EV_FORM_FIELD (g_object_new (EV_TYPE_FORM_FIELD, + "title", title, + "type", EV_FORM_FIELD_TYPE_BUTTON, + "x1", px1, + "y1", py1, + "x2", px2, + "y2", py2, + NULL)); +} + +EvFormField * +ev_form_field_new_text (const char *title, + gdouble px1, + gdouble py1, + gdouble px2, + gdouble py2) +{ + return EV_FORM_FIELD (g_object_new (EV_TYPE_FORM_FIELD, + "title", title, + "type", EV_FORM_FIELD_TYPE_TEXT, + "x1", px1, + "y1", py1, + "x2", px2, + "y2", py2, + NULL)); +} + +EvFormField * +ev_form_field_new_choice (const char *title, + gdouble px1, + gdouble py1, + gdouble px2, + gdouble py2) +{ + return EV_FORM_FIELD (g_object_new (EV_TYPE_FORM_FIELD, + "title", title, + "type", EV_FORM_FIELD_TYPE_CHOICE, + "x1", px1, + "y1", py1, + "x2", px2, + "y2", py2, + NULL)); +} + +EvFormField * +ev_form_field_new_signature (const char *title, + gdouble px1, + gdouble py1, + gdouble px2, + gdouble py2) +{ + return EV_FORM_FIELD (g_object_new (EV_TYPE_FORM_FIELD, + "title", title, + "type", EV_FORM_FIELD_TYPE_SIGNATURE, + "x1", px1, + "y1", py1, + "x2", px2, + "y2", py2, + NULL)); +} + +static void +ev_form_field_mapping_free_foreach (EvFormFieldMapping *form_field_mapping) +{ + g_object_unref (G_OBJECT (form_field_mapping->field)); + g_free (form_field_mapping); +} + +void +ev_form_field_mapping_free (GList *form_field_mapping) +{ + if (form_field_mapping == NULL) + return; + + g_list_foreach (form_field_mapping, (GFunc) (ev_form_field_mapping_free_foreach), NULL); + g_list_free (form_field_mapping); +} + + +EvFormField * +ev_form_field_mapping_find (GList *form_field_mapping, + gdouble x, + gdouble y) +{ + GList *list; + EvFormField *field = NULL; + int i; + + i = 0; + + for (list = form_field_mapping; list; list = list->next) { + EvFormFieldMapping *mapping = list->data; + + i++; + if ((x >= mapping->x1) && + (y >= mapping->y1) && + (x <= mapping->x2) && + (y <= mapping->y2)) { + field = mapping->field; + break; + } + } + + return field; +} + Index: backend/ev-form.h =================================================================== RCS file: backend/ev-form.h diff -N backend/ev-form.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ backend/ev-form.h 3 May 2006 21:05:31 -0000 @@ -0,0 +1,100 @@ +/* this file is part of evince, a gnome document viewer + * + * Copyright (C) 2005 Red Hat, Inc. + * Copyright (C) 2006 Julien Rebetez + * + * Evince is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * Evince is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef EV_FORM_H +#define EV_FORM_H + +#include + +G_BEGIN_DECLS + +typedef struct _EvFormField EvFormField; +typedef struct _EvFormFieldClass EvFormFieldClass; +typedef struct _EvFormFieldPrivate EvFormFieldPrivate; + +#define EV_TYPE_FORM_FIELD (ev_form_field_get_type()) +#define EV_FORM_FIELD(object) (G_TYPE_CHECK_INSTANCE_CAST((object), EV_TYPE_FORM_FIELD, EvFormField)) +#define EV_FORM_FIELD_CLASS(klass) (G_TYPE_CHACK_CLASS_CAST((klass), EV_TYPE_FORM_FIELD, EvFormField)) +#define EV_IS_FORM_FIELD(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), EV_TYPE_FORM_FIELD)) +#define EV_IS_FORM_FIELD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), EV_TYPE_FORM_FIELD)) +#define EV_FORM_FIELD_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), EV_TYPE_LINK, EvLinkClass)) + +#define EV_TYPE_FORM_FIELD_TYPE (ev_form_field_type_get_type ()) + + + +typedef enum +{ + EV_FORM_FIELD_TYPE_BUTTON, + EV_FORM_FIELD_TYPE_TEXT, + EV_FORM_FIELD_TYPE_CHOICE, + EV_FORM_FIELD_TYPE_SIGNATURE +} EvFormFieldType; + +GType ev_form_field_type_get_type (void); +GType ev_form_field_get_type (void); + +EvFormField *ev_form_field_new_button (const char *title, + gdouble px1, + gdouble py1, + gdouble px2, + gdouble py2); +EvFormField *ev_form_field_new_text (const char *title, + gdouble px1, + gdouble py1, + gdouble px2, + gdouble py2); +EvFormField *ev_form_field_new_choice (const char *title, + gdouble px1, + gdouble py1, + gdouble px2, + gdouble py2); +EvFormField *ev_form_field_new_signature (const char *title, + gdouble px1, + gdouble py1, + gdouble px2, + gdouble py2); + +const char* ev_form_field_get_title (EvFormField *field); +EvFormFieldType ev_form_field_get_form_field_type (EvFormField *field); +double ev_form_field_get_x1 (EvFormField *field); +double ev_form_field_get_y1 (EvFormField *field); +double ev_form_field_get_x2 (EvFormField *field); +double ev_form_field_get_y2 (EvFormField *field); + + +/* Form Mapping Stuff */ +typedef struct _EvFormFieldMapping EvFormFieldMapping; +struct _EvFormFieldMapping +{ + EvFormField *field; + gdouble x1; + gdouble y1; + gdouble x2; + gdouble y2; +}; + +void ev_form_field_mapping_free (GList *form_field_mapping); +EvFormField *ev_form_field_mapping_find (GList *form_field_mapping, + gdouble x, + gdouble y); +G_END_DECLS + +#endif /* !EV_FORM_H */ Index: pdf/ev-poppler.cc =================================================================== RCS file: /cvs/gnome/evince/pdf/ev-poppler.cc,v retrieving revision 1.67 diff -u -8 -p -r1.67 ev-poppler.cc --- pdf/ev-poppler.cc 2 May 2006 19:02:46 -0000 1.67 +++ pdf/ev-poppler.cc 3 May 2006 21:05:33 -0000 @@ -615,28 +615,72 @@ pdf_document_get_text (EvDocument *docum text = poppler_page_get_text (poppler_page, &r); g_object_unref (poppler_page); return text; } +static GList * +pdf_document_get_form_fields (EvDocument *document, + int page) +{ + PdfDocument *pdf_document; + PopplerPage *poppler_page; + GList *retval = NULL; + GList *fields; + GList *list; + double height; + printf("pdf_document_get_form_fields\n"); + + pdf_document = PDF_DOCUMENT (document); + poppler_page = poppler_document_get_page (pdf_document->document, + page); + fields = poppler_page_get_form_fields (poppler_page); + poppler_page_get_size (poppler_page, NULL, &height); + + for (list = fields; list; list = list->next) { + PopplerFormField *field; + EvFormFieldMapping *ev_form_field; + double rect[4]; + + field = (PopplerFormField *)list->data; + /* Invert y for X-style coordinates */ + rect[0] = field->area.x1; rect[1] = height - field->area.y2; + rect[2] = field->area.x2; rect[3] = height - field->area.y1; + + ev_form_field = g_new (EvFormFieldMapping, 1); + ev_form_field->field = ev_form_field_new_button("test",rect[0],rect[1],rect[2],rect[3]); + ev_form_field->x1 = rect[0]; + ev_form_field->x2 = rect[2]; + ev_form_field->y1 = rect[1]; + ev_form_field->y2 = rect[3]; + + retval = g_list_prepend(retval, ev_form_field); + } + poppler_page_free_form_fields(fields); + g_object_unref (poppler_page); + + return g_list_reverse(retval); +} + static void pdf_document_document_iface_init (EvDocumentIface *iface) { iface->save = pdf_document_save; iface->load = pdf_document_load; iface->get_n_pages = pdf_document_get_n_pages; iface->get_page_size = pdf_document_get_page_size; iface->get_page_label = pdf_document_get_page_label; iface->has_attachments = pdf_document_has_attachments; iface->get_attachments = pdf_document_get_attachments; iface->render_pixbuf = pdf_document_render_pixbuf; iface->get_text = pdf_document_get_text; + iface->get_form_fields = pdf_document_get_form_fields; iface->can_get_text = pdf_document_can_get_text; iface->get_info = pdf_document_get_info; }; static void pdf_document_security_iface_init (EvDocumentSecurityIface *iface) { iface->has_document_security = pdf_document_has_document_security; @@ -1495,8 +1539,11 @@ pdf_selection_iface_init (EvSelectionIfa iface->get_selection_map = pdf_selection_get_selection_map; } PdfDocument * pdf_document_new (void) { return PDF_DOCUMENT (g_object_new (PDF_TYPE_DOCUMENT, NULL)); } + + + Index: shell/ev-jobs.c =================================================================== RCS file: /cvs/gnome/evince/shell/ev-jobs.c,v retrieving revision 1.13 diff -u -8 -p -r1.13 ev-jobs.c --- shell/ev-jobs.c 2 May 2006 19:02:46 -0000 1.13 +++ shell/ev-jobs.c 3 May 2006 21:05:34 -0000 @@ -208,16 +208,17 @@ ev_job_links_run (EvJobLinks *job) EvJob * ev_job_render_new (EvDocument *document, EvRenderContext *rc, gint width, gint height, EvRectangle *selection_points, GdkColor *text, GdkColor *base, + gboolean include_form, gboolean include_links, gboolean include_text, gboolean include_selection) { EvJobRender *job; g_return_val_if_fail (EV_IS_RENDER_CONTEXT (rc), NULL); if (include_selection) @@ -226,16 +227,17 @@ ev_job_render_new (EvDocument *docu job = g_object_new (EV_TYPE_JOB_RENDER, NULL); EV_JOB (job)->document = g_object_ref (document); job->rc = g_object_ref (rc); job->target_width = width; job->target_height = height; job->text = *text; job->base = *base; + job->include_form = include_form; job->include_links = include_links; job->include_text = include_text; job->include_selection = include_selection; if (include_selection) job->selection_points = *selection_points; if (EV_IS_ASYNC_RENDERER (document)) { @@ -266,16 +268,19 @@ ev_job_render_run (EvJobRender *job) if (EV_JOB (job)->async) { EvAsyncRenderer *renderer = EV_ASYNC_RENDERER (EV_JOB (job)->document); ev_async_renderer_render_pixbuf (renderer, job->rc->page, job->rc->scale, job->rc->rotation); g_signal_connect (EV_JOB (job)->document, "render_finished", G_CALLBACK (render_finished_cb), job); } else { job->pixbuf = ev_document_render_pixbuf (EV_JOB (job)->document, job->rc); + if (job->include_form) + job->form_field_mapping = ev_document_get_form_fields (EV_JOB (job)->document, job->rc->page); + if (job->include_links) job->link_mapping = ev_document_links_get_links (EV_DOCUMENT_LINKS (EV_JOB (job)->document), job->rc->page); if (job->include_text && EV_IS_SELECTION (EV_JOB (job)->document)) job->text_mapping = ev_selection_get_selection_map (EV_SELECTION (EV_JOB (job)->document), job->rc); Index: shell/ev-jobs.h =================================================================== RCS file: /cvs/gnome/evince/shell/ev-jobs.h,v retrieving revision 1.11 diff -u -8 -p -r1.11 ev-jobs.h --- shell/ev-jobs.h 2 Apr 2006 23:24:26 -0000 1.11 +++ shell/ev-jobs.h 3 May 2006 21:05:35 -0000 @@ -111,23 +111,25 @@ struct _EvJobRender EvRenderContext *rc; gint target_width; gint target_height; GdkPixbuf *pixbuf; GList *link_mapping; GdkRegion *text_mapping; + GList *form_field_mapping; GdkPixbuf *selection; GdkRegion *selection_region; EvRectangle selection_points; GdkColor base; GdkColor text; - + + gint include_form : 1; gint include_links : 1; gint include_text : 1; gint include_selection : 1; }; struct _EvJobRenderClass { EvJobClass parent_class; @@ -185,16 +187,17 @@ void ev_job_links_run GType ev_job_render_get_type (void); EvJob *ev_job_render_new (EvDocument *document, EvRenderContext *rc, gint width, gint height, EvRectangle *selection_points, GdkColor *text, GdkColor *base, + gboolean include_form, gboolean include_links, gboolean include_text, gboolean include_selection); void ev_job_render_run (EvJobRender *thumbnail); /* EvJobThumbnail */ GType ev_job_thumbnail_get_type (void); EvJob *ev_job_thumbnail_new (EvDocument *document, Index: shell/ev-pixbuf-cache.c =================================================================== RCS file: /cvs/gnome/evince/shell/ev-pixbuf-cache.c,v retrieving revision 1.22 diff -u -8 -p -r1.22 ev-pixbuf-cache.c --- shell/ev-pixbuf-cache.c 7 Jan 2006 13:18:28 -0000 1.22 +++ shell/ev-pixbuf-cache.c 3 May 2006 21:05:38 -0000 @@ -7,16 +7,17 @@ typedef struct _CacheJobInfo { EvJob *job; EvRenderContext *rc; /* Data we get from rendering */ GdkPixbuf *pixbuf; GList *link_mapping; GdkRegion *text_mapping; + GList *form_field_mapping; /* 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; @@ -143,16 +144,20 @@ dispose_cache_job_info (CacheJobInfo *jo ev_job_queue_remove_job (job_info->job); g_object_unref (G_OBJECT (job_info->job)); job_info->job = NULL; } if (job_info->pixbuf) { g_object_unref (G_OBJECT (job_info->pixbuf)); job_info->pixbuf = NULL; } + if (job_info->form_field_mapping) { + ev_form_field_mapping_free (job_info->form_field_mapping); + job_info->form_field_mapping = NULL; + } if (job_info->link_mapping) { ev_link_mapping_free (job_info->link_mapping); job_info->link_mapping = NULL; } if (job_info->text_mapping) { gdk_region_destroy (job_info->text_mapping); job_info->text_mapping = NULL; } @@ -307,16 +312,17 @@ move_one_job (CacheJobInfo *job_info, new_priority = EV_JOB_PRIORITY_HIGH; target_page = new_job_list + page_offset; } *target_page = *job_info; job_info->job = NULL; job_info->pixbuf = NULL; job_info->link_mapping = NULL; + job_info->form_field_mapping = NULL; if (new_priority != priority && target_page->job) { ev_job_queue_update_job (target_page->job, new_priority); } } @@ -405,17 +411,19 @@ copy_job_to_job_info (EvJobRender *job dispose_cache_job_info (job_info, pixbuf_cache); job_info->pixbuf = pixbuf; job_info->rc = rc; if (job_render->link_mapping) job_info->link_mapping = job_render->link_mapping; if (job_render->text_mapping) - job_info->text_mapping = job_render->text_mapping; + job_info->text_mapping = job_render->text_mapping; + if (job_render->form_field_mapping) + job_info->form_field_mapping = job_render->form_field_mapping; if (job_render->include_selection) { pixbuf = g_object_ref (job_render->selection); job_info->selection_points = job_render->selection_points; job_info->selection_region = gdk_region_copy (job_render->selection_region); job_info->selection = pixbuf; g_assert (job_info->selection_points.x1 >= 0); } @@ -492,16 +500,17 @@ static void add_job_if_needed (EvPixbufCache *pixbuf_cache, CacheJobInfo *job_info, EvPageCache *page_cache, gint page, gint rotation, gfloat scale, EvJobPriority priority) { + gboolean include_form = FALSE; gboolean include_links = FALSE; gboolean include_text = FALSE; gboolean include_selection = FALSE; int width, height; GdkColor *text, *base; if (job_info->job) return; @@ -519,16 +528,18 @@ add_job_if_needed (EvPixbufCache *pixbuf job_info->rc = ev_render_context_new (rotation, page, scale); } else { ev_render_context_set_rotation (job_info->rc, rotation); ev_render_context_set_page (job_info->rc, page); ev_render_context_set_scale (job_info->rc, scale); } /* Figure out what else we need for this job */ + if (job_info->form_field_mapping == NULL) + include_form = TRUE; if (job_info->link_mapping == NULL) include_links = TRUE; if (job_info->text_mapping == NULL) include_text = TRUE; if (new_selection_pixbuf_needed (pixbuf_cache, job_info, page, scale)) { include_selection = TRUE; } @@ -536,16 +547,17 @@ add_job_if_needed (EvPixbufCache *pixbuf get_selection_colors (pixbuf_cache->view, &text, &base); job_info->job = ev_job_render_new (pixbuf_cache->document, job_info->rc, width, height, &(job_info->target_points), text, base, + include_form, include_links, include_text, include_selection); ev_job_queue_add_job (job_info->job, priority); g_signal_connect (job_info->job, "finished", G_CALLBACK (job_finished_cb), pixbuf_cache); } @@ -656,16 +668,34 @@ ev_pixbuf_cache_get_link_mapping (EvPixb /* We don't need to wait for the idle to handle the callback */ if (job_info->job && EV_JOB (job_info->job)->finished) { copy_job_to_job_info (EV_JOB_RENDER (job_info->job), job_info, pixbuf_cache); } return job_info->link_mapping; } + +GList * +ev_pixbuf_cache_get_form_field_mapping (EvPixbufCache *pixbuf_cache, + gint page) +{ + CacheJobInfo *job_info; + + job_info = find_job_cache (pixbuf_cache, page); + if(job_info == NULL) + return NULL; + + if(job_info->job && + EV_JOB(job_info->job)->finished) { + copy_job_to_job_info (EV_JOB_RENDER(job_info->job), job_info, pixbuf_cache); + } + return job_info->form_field_mapping; +} + static gboolean new_selection_pixbuf_needed (EvPixbufCache *pixbuf_cache, CacheJobInfo *job_info, gint page, gfloat scale) { EvPageCache *page_cache; Index: shell/ev-pixbuf-cache.h =================================================================== RCS file: /cvs/gnome/evince/shell/ev-pixbuf-cache.h,v retrieving revision 1.9 diff -u -8 -p -r1.9 ev-pixbuf-cache.h --- shell/ev-pixbuf-cache.h 6 Aug 2005 05:13:20 -0000 1.9 +++ shell/ev-pixbuf-cache.h 3 May 2006 21:05:38 -0000 @@ -58,16 +58,18 @@ void ev_pixbuf_cache_set_page_ gfloat scale, GList *selection_list); GdkPixbuf *ev_pixbuf_cache_get_pixbuf (EvPixbufCache *pixbuf_cache, gint page); GList *ev_pixbuf_cache_get_link_mapping (EvPixbufCache *pixbuf_cache, gint page); GdkRegion *ev_pixbuf_cache_get_text_mapping (EvPixbufCache *pixbuf_cache, gint page); +GList *ev_pixbuf_cache_get_form_field_mapping (EvPixbufCache *pixbuf_cache, + gint page); void ev_pixbuf_cache_clear (EvPixbufCache *pixbuf_cache); void ev_pixbuf_cache_style_changed (EvPixbufCache *pixbuf_cache); /* Selection */ GdkPixbuf *ev_pixbuf_cache_get_selection_pixbuf (EvPixbufCache *pixbuf_cache, gint page, gfloat scale, GdkRegion **region); Index: shell/ev-view.c =================================================================== RCS file: /cvs/gnome/evince/shell/ev-view.c,v retrieving revision 1.199 diff -u -8 -p -r1.199 ev-view.c --- shell/ev-view.c 2 May 2006 19:02:46 -0000 1.199 +++ shell/ev-view.c 3 May 2006 21:05:47 -0000 @@ -155,16 +155,24 @@ static gboolean doc_point_to_view_point static EvLink * ev_view_get_link_at_location (EvView *view, gdouble x, gdouble y); static char* tip_from_link (EvView *view, EvLink *link); static void handle_link_over_xy (EvView *view, gint x, gint y); + +/*** Forms ***/ +static EvFormField * ev_view_get_form_field_at_location (EvView *view, + gdouble x, + gdouble y); +static void handle_form_field_over_xy (EvView* view, + gint x, + gint y); /*** GtkWidget implementation ***/ static void ev_view_size_request_continuous_dual_page (EvView *view, GtkRequisition *requisition); static void ev_view_size_request_continuous (EvView *view, GtkRequisition *requisition); static void ev_view_size_request_dual_page (EvView *view, GtkRequisition *requisition); static void ev_view_size_request_single_page (EvView *view, @@ -1411,16 +1419,84 @@ handle_link_over_xy (EvView *view, gint ev_view_set_status (view, NULL); if (view->cursor == EV_VIEW_CURSOR_LINK || view->cursor == EV_VIEW_CURSOR_IBEAM) ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL); } return; } +/*** Form ***/ +static EvFormField * +ev_view_get_form_field_at_location (EvView *view, + gdouble x, + gdouble y) +{ + gint page = -1; + gint x_offset = 0, y_offset = 0; + GList *form_field_mapping; + + x += view->scroll_x; + y += view->scroll_y; + + find_page_at_location (view, x, y, &page, &x_offset, &y_offset); + + if (page == -1) + return NULL; + + form_field_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache, page); + + if (form_field_mapping) + return ev_form_field_mapping_find (form_field_mapping, x_offset / view->scale, y_offset / view->scale); + else + return NULL; +} + + +static void +handle_form_field_over_xy (EvView *view, gint x, gint y) +{ + EvFormField *field; + + field = ev_view_get_form_field_at_location (view, x, y); + if(field) { + //ev_view_set_cursor (view, EV_VIEW_CURSOR_LINK); + //printf("field\n"); + double v[4]; + GdkPoint d[2]; + EvPoint p[2]; + gint page = -1; + gint x_offset = 0, y_offset = 0; + + ev_view_set_cursor (view, /*EV_VIEW_CURSOR_IBEAM*/EV_VIEW_CURSOR_LINK); + p[0].x = ev_form_field_get_x1(field); + p[0].y = ev_form_field_get_y1(field); + p[1].x = ev_form_field_get_x2(field); + p[1].y = ev_form_field_get_y2(field); + + find_page_at_location(view, p[0].x, p[0].y, &page, &x_offset, &y_offset); + if(page < 0) + return; + doc_point_to_view_point(view, page,&p[0], &d[0]); + doc_point_to_view_point(view, page,&p[1], &d[1]); + + v[0] = d[0].x - view->scroll_x; v[1] = d[0].y - view->scroll_y; + v[2] = d[1].x - view->scroll_x; v[3] = d[1].y - view->scroll_y; + //display the field's bounding rectangle +#define LINE(x1,y1,x2,y2) gdk_draw_line(GTK_WIDGET(view)->window, GTK_WIDGET(view)->style->fg_gc[GTK_STATE_NORMAL],x1,y1,x2,y2) + LINE(v[0], v[1], v[2], v[1]); + LINE(v[2], v[1], v[2], v[3]); + LINE(v[2], v[3], v[0], v[3]); + LINE(v[0], v[3], v[0], v[1]); + + } else { + ev_view_set_cursor(view, EV_VIEW_CURSOR_NORMAL); + } +} + /*** GtkWidget implementation ***/ static void ev_view_size_request_continuous_dual_page (EvView *view, GtkRequisition *requisition) { int max_width; gint n_pages; @@ -1983,16 +2059,17 @@ ev_view_motion_notify_event (GtkWidget return TRUE; } /* For the Evince 0.4.x release, we limit links to un-rotated documents * only. */ } else if (view->pressed_button <= 0 && view->rotation == 0) { handle_link_over_xy (view, x, y); + handle_form_field_over_xy (view, x, y); return TRUE; } return FALSE; } static gboolean ev_view_button_release_event (GtkWidget *widget,