diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | backend/.cvsignore | 2 | ||||
| -rw-r--r-- | backend/Makefile.am (renamed from viewer/Makefile.am) | 8 | ||||
| -rw-r--r-- | backend/ev-document.c | 105 | ||||
| -rw-r--r-- | backend/ev-document.h | 87 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | viewer/ev-viewer.c | 58 | ||||
| -rw-r--r-- | viewer/ev-viewer.h | 55 |
9 files changed, 205 insertions, 119 deletions
@@ -1,3 +1,8 @@ +Tue Dec 21 18:20:40 2004 Owen Taylor <otaylor@redhat.com> + + * viewer/* backend/* configure.ac Makefile.am: Move viewer directory + to backend/ directory, rename EvViewer to EvDocument. + 2004-12-21 Havoc Pennington <hp@redhat.com> * shell/ev-window.c: hook up the find bar widget; now we just need diff --git a/Makefile.am b/Makefile.am index 4421758..cc9ee09 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = cut-n-paste data shell viewer po pdf +SUBDIRS = cut-n-paste data backend shell po pdf intltool_extra = intltool-extract.in intltool-merge.in intltool-update.in diff --git a/backend/.cvsignore b/backend/.cvsignore new file mode 100644 index 0000000..282522d --- /dev/null +++ b/backend/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/viewer/Makefile.am b/backend/Makefile.am index 0416b8b..1a2547e 100644 --- a/viewer/Makefile.am +++ b/backend/Makefile.am @@ -7,9 +7,9 @@ INCLUDES= \ $(EVINCE_DISABLE_DEPRECATED) \ $(NULL) -noinst_LTLIBRARIES = libevviewer.la +noinst_LTLIBRARIES = liblibevbackend.la -libevviewer_la_SOURCES= \ - ev-viewer.c \ - ev-viewer.h \ +liblibevbackend_la_SOURCES= \ + ev-document.c \ + ev-document.h \ $(NULL) diff --git a/backend/ev-document.c b/backend/ev-document.c new file mode 100644 index 0000000..b2a5c8d --- /dev/null +++ b/backend/ev-document.c @@ -0,0 +1,105 @@ +/* + * Copyright (C) 2004 Marco Pesenti Gritti + * + * This program 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, or (at your option) + * any later version. + * + * This program 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. + * + */ + +#include "config.h" + +#include "ev-document.h" + +static void ev_document_base_init (gpointer g_class); + +GType +ev_document_get_type (void) +{ + static GType type = 0; + + if (G_UNLIKELY (type == 0)) + { + static const GTypeInfo our_info = + { + sizeof (EvDocumentIface), + ev_document_base_init, + NULL, + }; + + type = g_type_register_static (G_TYPE_INTERFACE, + "EvDocument", + &our_info, (GTypeFlags)0); + } + + return type; +} + +static void +ev_document_base_init (gpointer g_class) +{ +} + +void +ev_document_load (EvDocument *document, + const char *uri, + GError *error) +{ + EvDocumentIface *iface = EV_DOCUMENT_GET_IFACE (document); + iface->load (document, uri); +} + +int +ev_document_get_n_pages (EvDocument *document) +{ + EvDocumentIface *iface = EV_DOCUMENT_GET_IFACE (document); + return iface->get_n_pages (document); +} + +void +ev_document_set_page (EvDocument *document, + int page) +{ + EvDocumentIface *iface = EV_DOCUMENT_GET_IFACE (document); + iface->set_page (document, page); +} + +void +ev_document_set_target (EvDocument *document, + GdkDrawable *target) +{ + EvDocumentIface *iface = EV_DOCUMENT_GET_IFACE (document); + iface->set_target (document, target); +} + +void +ev_document_set_page_rect (EvDocument *document, + int x, + int y, + int width, + int height) +{ + EvDocumentIface *iface = EV_DOCUMENT_GET_IFACE (document); + iface->set_page_rect (document, x, y, width, height); +} + +void +ev_document_render (EvDocument *document, + int clip_x, + int clip_y, + int clip_width, + int clip_height) +{ + EvDocumentIface *iface = EV_DOCUMENT_GET_IFACE (document); + iface->render (document, clip_x, clip_y, clip_width, clip_height); +} diff --git a/backend/ev-document.h b/backend/ev-document.h new file mode 100644 index 0000000..9d8b662 --- /dev/null +++ b/backend/ev-document.h @@ -0,0 +1,87 @@ +/* + * Copyright (C) 2000-2003 Marco Pesenti Gritti + * + * This program 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, or (at your option) + * any later version. + * + * This program 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. + * + * $Id$ + */ + +#ifndef EV_DOCUMENT_H +#define EV_DOCUMENT_H + +#include <glib-object.h> +#include <glib.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)) +#define EV_IS_DOCUMENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EV_TYPE_DOCUMENT)) +#define EV_IS_DOCUMENT_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EV_TYPE_DOCUMENT)) +#define EV_DOCUMENT_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_DOCUMENT, EvDocumentIface)) + +typedef struct _EvDocument EvDocument; +typedef struct _EvDocumentIface EvDocumentIface; + +struct _EvDocumentIface +{ + GTypeInterface base_iface; + + /* Methods */ + void (* load) (EvDocument *document, + const char *uri, + GError *error); + int (* get_n_pages) (EvDocument *document); + void (* set_page) (EvDocument *document, + int page); + void (* set_target) (EvDocument *document, + GdkDrawable *target); + void (* set_page_rect) (EvDocument *document, + int x, + int y, + int width, + int height); + void (* render) (EvDocument *document, + int clip_x, + int clip_y, + int clip_width, + int clip_height); +}; + +GType ev_document_get_type (void); + +void ev_document_load (EvDocument *document, + const char *uri, + GError *error); +int ev_document_get_n_pages (EvDocument *document); +void ev_document_set_page (EvDocument *document, + int page); +void ev_document_set_target (EvDocument *document, + GdkDrawable *target); +void ev_document_set_page_rect (EvDocument *document, + int x, + int y, + int width, + int height); +void ev_document_render (EvDocument *document, + int clip_x, + int clip_y, + int clip_width, + int clip_height); + +G_END_DECLS + +#endif diff --git a/configure.ac b/configure.ac index 97517c5..b4fd125 100644 --- a/configure.ac +++ b/configure.ac @@ -334,6 +334,6 @@ pdf/fofi/Makefile pdf/splash/Makefile pdf/xpdf/Makefile po/Makefile.in +backend/Makefile shell/Makefile -viewer/Makefile ]) diff --git a/viewer/ev-viewer.c b/viewer/ev-viewer.c deleted file mode 100644 index 3a91183..0000000 --- a/viewer/ev-viewer.c +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2004 Marco Pesenti Gritti - * - * This program 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, or (at your option) - * any later version. - * - * This program 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. - * - */ - -#include "config.h" - -#include "ev-viewer.h" - -static void ev_viewer_base_init (gpointer g_class); - -GType -ev_viewer_get_type (void) -{ - static GType type = 0; - - if (G_UNLIKELY (type == 0)) - { - static const GTypeInfo our_info = - { - sizeof (EvViewerIface), - ev_viewer_base_init, - NULL, - }; - - type = g_type_register_static (G_TYPE_INTERFACE, - "EvViewer", - &our_info, (GTypeFlags)0); - } - - return type; -} - -static void -ev_viewer_base_init (gpointer g_class) -{ -} - -void -ev_viewer_load (EvViewer *embed, const char *uri) -{ - EvViewerIface *iface = EV_VIEWER_GET_IFACE (embed); - iface->load (embed, uri); -} diff --git a/viewer/ev-viewer.h b/viewer/ev-viewer.h deleted file mode 100644 index 1b52c63..0000000 --- a/viewer/ev-viewer.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2000-2003 Marco Pesenti Gritti - * - * This program 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, or (at your option) - * any later version. - * - * This program 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. - * - * $Id$ - */ - -#ifndef EV_VIEWER_H -#define EV_VIEWER_H - -#include <glib-object.h> -#include <glib.h> - -G_BEGIN_DECLS - -#define EV_TYPE_VIEWER (ev_viewer_get_type ()) -#define EV_VIEWER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EV_TYPE_VIEWER, EvViewer)) -#define EV_VIEWER_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_VIEWER, EvViewerIface)) -#define EV_IS_VIEWER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EV_TYPE_VIEWER)) -#define EV_IS_VIEWER_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EV_TYPE_VIEWER)) -#define EV_VIEWER_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_VIEWER, EvViewerIface)) - -typedef struct _EvViewer EvViewer; -typedef struct _EvViewerIface EvViewerIface; - -struct _EvViewerIface -{ - GTypeInterface base_iface; - - /* Methods */ - void (* load) (EvViewer *embed, - const char *uri); -}; - -GType ev_viewer_get_type (void); - -void ev_viewer_load (EvViewer *embed, - const char *uri); - -G_END_DECLS - -#endif |