8 files changed, 93 insertions, 19 deletions
diff --git a/libdocument/ev-document-find.c b/libdocument/ev-document-find.c
index 0b5fac01..92dfffe5 100644
--- a/libdocument/ev-document-find.c
+++ b/libdocument/ev-document-find.c
@@ -40,3 +40,12 @@ ev_document_find_find_text (EvDocumentFind *document_find,
 return iface->find_text (document_find, page, text, case_sensitive);
 }
 
+guint
+ev_document_find_check_for_hits(EvDocumentFind *document_find,
+ EvPage *page,
+ const gchar *text,
+ gboolean case_sensitive)
+{
+ EvDocumentFindInterface *iface = EV_DOCUMENT_FIND_GET_IFACE (document_find);
+ return iface->check_for_hits (document_find, page, text, case_sensitive);
+}
+\ No newline at end of file
diff --git a/libdocument/ev-document-find.h b/libdocument/ev-document-find.h
index 7fcf49c7..2b6ba68b 100644
--- a/libdocument/ev-document-find.h
+++ b/libdocument/ev-document-find.h
@@ -52,6 +52,11 @@ struct _EvDocumentFindInterface
 EvPage *page,
 const gchar *text,
 gboolean case_sensitive);
+
+ guint (* check_for_hits) (EvDocumentFind *document_find,
+ EvPage *page,
+ const gchar *text,
+ gboolean case_sensitive);
 };
 
 GType ev_document_find_get_type (void) G_GNUC_CONST;
@@ -60,6 +65,10 @@ GList *ev_document_find_find_text (EvDocumentFind *document_find,
 const gchar *text,
 gboolean case_sensitive);
 
+guint ev_document_find_check_for_hits (EvDocumentFind *document_find,
+ EvPage *page,
+ const gchar *text,
+ gboolean case_sensitive);
 G_END_DECLS
 
 #endif /* EV_DOCUMENT_FIND_H */
diff --git a/libdocument/ev-document-thumbnails.c b/libdocument/ev-document-thumbnails.c
index 9482e09e..65248683 100644
--- a/libdocument/ev-document-thumbnails.c
+++ b/libdocument/ev-document-thumbnails.c
@@ -59,5 +59,4 @@ ev_document_thumbnails_get_dimensions (EvDocumentThumbnails *document,
 
 iface = EV_DOCUMENT_THUMBNAILS_GET_IFACE (document);
 iface->get_dimensions (document, rc, width, height);
-}
-
+}
+\ No newline at end of file
diff --git a/libdocument/ev-document-thumbnails.h b/libdocument/ev-document-thumbnails.h
index 1a7cb9fd..5f425ef0 100644
--- a/libdocument/ev-document-thumbnails.h
+++ b/libdocument/ev-document-thumbnails.h
@@ -26,7 +26,7 @@
 #define EV_DOCUMENT_THUMBNAILS_H
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
-
+#include <gtk/gtk.h>
 #include "ev-render-context.h"
 
 G_BEGIN_DECLS
@@ -52,6 +52,7 @@ struct _EvDocumentThumbnailsInterface {
 EvRenderContext *rc,
 gint *width,
 gint *height);
+ 
 };
 
 GType ev_document_thumbnails_get_type (void) G_GNUC_CONST;
@@ -63,7 +64,6 @@ void ev_document_thumbnails_get_dimensions (EvDocumentThumbnails *document
 EvRenderContext *rc,
 gint *width,
 gint *height);
-
 G_END_DECLS
 
 #endif /* EV_DOCUMENT_THUMBNAILS_H */
diff --git a/libdocument/ev-document.c b/libdocument/ev-document.c
index 19d51d9b..a242bdf6 100644
--- a/libdocument/ev-document.c
+++ b/libdocument/ev-document.c
@@ -26,6 +26,7 @@
 
 #include "ev-document.h"
 #include "synctex_parser.h"
+#include "ev-file-helpers.h"
 
 #define EV_DOCUMENT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EV_TYPE_DOCUMENT, EvDocumentPrivate))
 
@@ -141,6 +142,8 @@ ev_document_init (EvDocument *document)
 
 /* Assume all pages are the same size until proven otherwise */
 document->priv->uniform = TRUE;
+ /* Assume that the document is not a web document*/
+ document->iswebdocument = FALSE ;
 }
 
 static void
@@ -237,6 +240,14 @@ ev_document_load (EvDocument *document,
 gboolean retval;
 GError *err = NULL;
 
+ /*
+ * Hardcoding a check for ePub documents, cause it needs a web document DOM
+ * and webkit, support for any other web document types can be added similarly.
+ */
+
+ if ( !g_strcmp0 (ev_file_get_mime_type(uri,TRUE,&err),"application/epub+zip") )
+ document->iswebdocument=TRUE ;
+ 
 retval = klass->load (document, uri, &err);
 if (!retval) {
 if (err) {
@@ -258,18 +269,34 @@ ev_document_load (EvDocument *document,
 /* Cache some info about the document to avoid
 * going to the backends since it requires locks
 */
+
 priv->uri = g_strdup (uri);
- priv->n_pages = _ev_document_get_n_pages (document);
 
+ priv->n_pages = _ev_document_get_n_pages (document);
+ 
 for (i = 0; i < priv->n_pages; i++) {
+
+ /*
+ * Since there is no sense of paging in an ePub,it makes no sense to have pages sizes.
+ * We are however geeneralising the scenario by considering epub as a type of web document.
+ * FIXME: Labels, or bookmarks though, can be done.
+ */
+ 
 EvPage *page = ev_document_get_page (document, i);
 gdouble page_width = 0;
 gdouble page_height = 0;
 EvPageSize *page_size;
 gchar *page_label;
-
- _ev_document_get_page_size (document, page, &page_width, &page_height);
-
+ 
+ if ( document->iswebdocument == FALSE ) {
+ _ev_document_get_page_size (document, page, &page_width, &page_height);
+ }
+ else {
+ //Fixed page sized to resolve the X-windowing system error.
+ page_width = 800;
+ page_height= 600;
+ }
+ 
 if (i == 0) {
 priv->uniform_width = page_width;
 priv->uniform_height = page_height;
@@ -277,14 +304,21 @@ ev_document_load (EvDocument *document,
 priv->max_height = priv->uniform_height;
 priv->min_width = priv->uniform_width;
 priv->min_height = priv->uniform_height;
+ if (document->iswebdocument == TRUE ) {
+ priv->page_sizes = g_new0 (EvPageSize, 1);
+ priv->page_sizes->width = priv->uniform_width;
+ priv->page_sizes->height = priv->uniform_height;
+ priv->uniform = TRUE ;
+ break;
+ }
 } else if (priv->uniform &&
 (priv->uniform_width != page_width ||
 priv->uniform_height != page_height)) {
 /* It's a different page size. Backfill the array. */
 int j;
-
+ 
 priv->page_sizes = g_new0 (EvPageSize, priv->n_pages);
-
+ 
 for (j = 0; j < i; j++) {
 page_size = &(priv->page_sizes[j]);
 page_size->width = priv->uniform_width;
@@ -511,15 +545,21 @@ ev_document_get_page_size (EvDocument *document,
 {
 g_return_if_fail (EV_IS_DOCUMENT (document));
 g_return_if_fail (page_index >= 0 || page_index < document->priv->n_pages);
-
- if (width)
- *width = document->priv->uniform ?
- document->priv->uniform_width :
- document->priv->page_sizes[page_index].width;
- if (height)
- *height = document->priv->uniform ?
- document->priv->uniform_height :
- document->priv->page_sizes[page_index].height;
+ if (document->iswebdocument == TRUE ) {
+ if (width)
+ *width = document->priv->uniform_width;
+ if (height)
+ *height = document->priv->uniform_height;
+ } else {
+ if (width)
+ *width = document->priv->uniform ?
+ document->priv->uniform_width :
+ document->priv->page_sizes[page_index].width;
+ if (height)
+ *height = document->priv->uniform ?
+ document->priv->uniform_height :
+ document->priv->page_sizes[page_index].height;
+ }
 }
 
 static gchar *
diff --git a/libdocument/ev-document.h b/libdocument/ev-document.h
index d10d261a..24e31912 100644
--- a/libdocument/ev-document.h
+++ b/libdocument/ev-document.h
@@ -85,6 +85,11 @@ struct _EvDocument
 GObject base;
 
 EvDocumentPrivate *priv;
+ /*
+ * Since we can only access the members of this structure from the window frontend,
+ * we need a flag to detemine whether to replace the atril-view with a web-view.
+ */
+ gboolean iswebdocument;
 };
 
 struct _EvDocumentClass
diff --git a/libdocument/ev-link-dest.c b/libdocument/ev-link-dest.c
index 62f2cd47..b9ea0dfd 100644
--- a/libdocument/ev-link-dest.c
+++ b/libdocument/ev-link-dest.c
@@ -509,3 +509,13 @@ ev_link_dest_new_page_label (const gchar *page_label)
 "type", EV_LINK_DEST_TYPE_PAGE_LABEL,
 NULL));
 }
+
+EvLinkDest *
+ev_link_dest_new_hlink(const gchar* hlink,gint page)
+{
+ return EV_LINK_DEST(g_object_new(EV_TYPE_LINK_DEST,
+ "named",hlink,
+ "page",page,
+ "type", EV_LINK_DEST_TYPE_HLINK,
+ NULL));
+}
+\ No newline at end of file
diff --git a/libdocument/ev-link-dest.h b/libdocument/ev-link-dest.h
index a0e2539f..dd1f10a1 100644
--- a/libdocument/ev-link-dest.h
+++ b/libdocument/ev-link-dest.h
@@ -49,6 +49,7 @@ typedef enum {
 EV_LINK_DEST_TYPE_FITR,
 EV_LINK_DEST_TYPE_NAMED,
 EV_LINK_DEST_TYPE_PAGE_LABEL,
+ EV_LINK_DEST_TYPE_HLINK,
 EV_LINK_DEST_TYPE_UNKNOWN
 } EvLinkDestType; 
 
@@ -89,6 +90,7 @@ EvLinkDest *ev_link_dest_new_fitr (gint page,
 gdouble top);
 EvLinkDest *ev_link_dest_new_named (const gchar *named_dest);
 EvLinkDest *ev_link_dest_new_page_label (const gchar *page_label);
+EvLinkDest *ev_link_dest_new_hlink (const gchar* hlink,gint page);
 
 G_END_DECLS