+2007-01-08 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
+
+ * Makefile.am:
+ * backend/Makefile.am:
+ * backend/comics/Makefile.am:
+ * backend/djvu/Makefile.am:
+ * backend/dvi/Makefile.am:
+ * backend/ev-async-renderer.c:
+ * backend/ev-async-renderer.h:
+ * backend/ev-attachment.c:
+ * backend/ev-attachment.h:
+ * backend/ev-backend-marshal.c:
+ * backend/ev-document-factory.c:
+ * backend/ev-document-factory.h:
+ * backend/ev-document-find.c:
+ * backend/ev-document-find.h:
+ * backend/ev-document-fonts.c:
+ * backend/ev-document-fonts.h:
+ * backend/ev-document-images.c:
+ * backend/ev-document-images.h:
+ * backend/ev-document-info.h:
+ * backend/ev-document-links.c:
+ * backend/ev-document-links.h:
+ * backend/ev-document-misc.c:
+ * backend/ev-document-misc.h:
+ * backend/ev-document-security.c:
+ * backend/ev-document-security.h:
+ * backend/ev-document-thumbnails.c:
+ * backend/ev-document-thumbnails.h:
+ * backend/ev-document-transition.c:
+ * backend/ev-document-transition.h:
+ * backend/ev-document.c:
+ * backend/ev-document.h:
+ * backend/ev-file-exporter.c:
+ * backend/ev-file-exporter.h:
+ * backend/ev-image.c:
+ * backend/ev-image.h:
+ * backend/ev-link-action.c:
+ * backend/ev-link-action.h:
+ * backend/ev-link-dest.c:
+ * backend/ev-link-dest.h:
+ * backend/ev-link.c:
+ * backend/ev-link.h:
+ * backend/ev-render-context.c:
+ * backend/ev-render-context.h:
+ * backend/ev-selection.c:
+ * backend/ev-selection.h:
+ * backend/impress/Makefile.am:
+ * backend/pdf/Makefile.am:
+ * backend/pixbuf/Makefile.am:
+ * backend/ps/Makefile.am:
+ * backend/ps/ps-document.c: (push_pixbuf), (interpreter_failed),
+ (ps_document_widget_event), (setup_pixmap), (setup_page), (input),
+ (start_interpreter), (stop_interpreter), (document_load),
+ (ps_document_next_page), (render_page):
+ * backend/tiff/Makefile.am:
+ * comics/Makefile.am:
+ * comics/comics-document.c:
+ * comics/comics-document.h:
+ * configure.ac:
+ * cut-n-paste/zoom-control/ephy-zoom-control.c:
+ * djvu/Makefile.am:
+ * djvu/djvu-document-private.h:
+ * djvu/djvu-document.c:
+ * djvu/djvu-document.h:
+ * djvu/djvu-links.c:
+ * djvu/djvu-links.h:
+ * djvu/djvu-text-page.c:
+ * djvu/djvu-text-page.h:
+ * djvu/djvu-text.c:
+ * djvu/djvu-text.h:
+ * dvi/Makefile.am:
+ * dvi/dvi-document.c:
+ * dvi/dvi-document.h:
+ * dvi/fonts.c:
+ * dvi/fonts.h:
+ * dvi/mdvi-lib/Makefile.am:
+ * dvi/mdvi-lib/afmparse.c:
+ * dvi/mdvi-lib/afmparse.h:
+ * dvi/mdvi-lib/bitmap.c:
+ * dvi/mdvi-lib/bitmap.h:
+ * dvi/mdvi-lib/color.c:
+ * dvi/mdvi-lib/color.h:
+ * dvi/mdvi-lib/common.c:
+ * dvi/mdvi-lib/common.h:
+ * dvi/mdvi-lib/defaults.h:
+ * dvi/mdvi-lib/dvimisc.c:
+ * dvi/mdvi-lib/dviopcodes.h:
+ * dvi/mdvi-lib/dviread.c:
+ * dvi/mdvi-lib/files.c:
+ * dvi/mdvi-lib/font.c:
+ * dvi/mdvi-lib/fontmap.c:
+ * dvi/mdvi-lib/fontmap.h:
+ * dvi/mdvi-lib/fontsrch.c:
+ * dvi/mdvi-lib/gf.c:
+ * dvi/mdvi-lib/hash.c:
+ * dvi/mdvi-lib/hash.h:
+ * dvi/mdvi-lib/list.c:
+ * dvi/mdvi-lib/mdvi.h:
+ * dvi/mdvi-lib/pagesel.c:
+ * dvi/mdvi-lib/paper.c:
+ * dvi/mdvi-lib/paper.h:
+ * dvi/mdvi-lib/pk.c:
+ * dvi/mdvi-lib/private.h:
+ * dvi/mdvi-lib/setup.c:
+ * dvi/mdvi-lib/sp-epsf.c:
+ * dvi/mdvi-lib/special.c:
+ * dvi/mdvi-lib/sysdeps.h:
+ * dvi/mdvi-lib/t1.c:
+ * dvi/mdvi-lib/tfm.c:
+ * dvi/mdvi-lib/tfmfile.c:
+ * dvi/mdvi-lib/tt.c:
+ * dvi/mdvi-lib/util.c:
+ * dvi/mdvi-lib/vf.c:
+ * dvi/pixbuf-device.c:
+ * dvi/pixbuf-device.h:
+ * impress/Makefile.am:
+ * impress/common.h:
+ * impress/document.c:
+ * impress/f_oasis.c:
+ * impress/f_oo13.c:
+ * impress/iksemel.c:
+ * impress/iksemel.h:
+ * impress/imposter.h:
+ * impress/impress-document.c:
+ * impress/impress-document.h:
+ * impress/internal.h:
+ * impress/r_back.c:
+ * impress/r_draw.c:
+ * impress/r_geometry.c:
+ * impress/r_gradient.c:
+ * impress/r_style.c:
+ * impress/r_text.c:
+ * impress/render.c:
+ * impress/render.h:
+ * impress/zip.c:
+ * impress/zip.h:
+ * lib/Makefile.am:
+ * lib/ev-debug.c:
+ * lib/ev-debug.h:
+ * lib/ev-file-helpers.c:
+ * lib/ev-file-helpers.h:
+ * lib/ev-gui.c:
+ * lib/ev-gui.h:
+ * lib/ev-tooltip.c:
+ * lib/ev-tooltip.h:
+ * libdocument/Makefile.am:
+ * libdocument/ev-file-helpers.c:
+ * pdf/Makefile.am:
+ * pdf/ev-poppler.cc:
+ * pdf/ev-poppler.h:
+ * pixbuf/Makefile.am:
+ * pixbuf/pixbuf-document.c:
+ * pixbuf/pixbuf-document.h:
+ * properties/Makefile.am:
+ * ps/Makefile.am:
+ * ps/gsdefaults.c:
+ * ps/gsdefaults.h:
+ * ps/gsio.c:
+ * ps/gsio.h:
+ * ps/gstypes.h:
+ * ps/ps-document.c:
+ * ps/ps-document.h:
+ * ps/ps.c:
+ * ps/ps.h:
+ * shell/Makefile.am:
+ * shell/ev-application.h:
+ * shell/ev-sidebar-links.c:
+ * shell/ev-sidebar-links.h:
+ * shell/ev-utils.c: (ev_gui_sanitise_popup_position),
+ (ev_gui_menu_position_tree_selection):
+ * shell/ev-utils.h:
+ * shell/ev-view.c: (ev_view_finalize):
+ * shell/ev-window.c:
+ * shell/main.c: (main):
+ * thumbnailer/Makefile.am:
+ * tiff/Makefile.am:
+ * tiff/tiff-document.c:
+ * tiff/tiff-document.h:
+ * tiff/tiff2ps.c:
+ * tiff/tiff2ps.h:
+
+ Reorganize source tree.
+
2007-01-08 Carlos Garcia Campos <carlosgc@gnome.org>
* backend/ev-document-factory.c:
-SUBDIRS = cut-n-paste po help data test
-
-# Backends
-
-if ENABLE_PDF
-SUBDIRS += pdf
-endif
-
-if ENABLE_PS
-SUBDIRS += ps
-endif
-
-if ENABLE_PIXBUF
-SUBDIRS += pixbuf
-endif
-
-if ENABLE_DJVU
-SUBDIRS += djvu
-endif
-
-if ENABLE_TIFF
-SUBDIRS += tiff
-endif
-
-if ENABLE_DVI
-SUBDIRS += dvi
-endif
-
-if ENABLE_COMICS
- SUBDIRS += comics
-endif
-
-if ENABLE_IMPRESS
- SUBDIRS += impress
-endif
-
-SUBDIRS += backend
-
-# Library
-
-SUBDIRS += lib
-
-# Properties (library and application)
-
-SUBDIRS += properties
+SUBDIRS = \
+ cut-n-paste \
+ po \
+ help \
+ data \
+ test \
+ backend \
+ libdocument \
+ properties \
+ shell \
+ thumbnailer
# Applications
-SUBDIRS += shell thumbnailer
-
intltool_extra = intltool-extract.in intltool-merge.in intltool-update.in
EXTRA_DIST = $(intltool_extra) gnome-doc-utils.make
-INCLUDES= \
- -DEVINCE_UIDIR=\"$(pkgdatadir)\" \
- -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
- -I$(top_srcdir)/lib \
- -I$(top_srcdir)/pdf \
- -I$(top_srcdir)/pixbuf \
- -I$(top_srcdir)/tiff \
- -I$(top_srcdir)/ps \
- -I$(top_srcdir)/djvu \
- -I$(top_srcdir)/dvi \
- -I$(top_srcdir)/impress \
- -I$(top_srcdir)/comics \
- $(BACKEND_CFLAGS) \
- $(WARN_CFLAGS) \
- $(DISABLE_DEPRECATED)
+SUBDIRS =
-noinst_LTLIBRARIES = libevbackend.la
-
-libevbackend_la_SOURCES= \
- ev-async-renderer.c \
- ev-async-renderer.h \
- ev-attachment.c \
- ev-attachment.h \
- ev-backend-marshal.c \
- ev-link.c \
- ev-link.h \
- ev-link-action.c \
- ev-link-action.h \
- ev-link-dest.c \
- ev-link-dest.h \
- ev-image.c \
- ev-image.h \
- ev-document.c \
- ev-document.h \
- ev-document-factory.c \
- ev-document-factory.h \
- ev-document-thumbnails.c \
- ev-document-thumbnails.h \
- ev-document-fonts.c \
- ev-document-fonts.h \
- ev-document-links.c \
- ev-document-links.h \
- ev-document-images.c \
- ev-document-images.h \
- ev-document-security.c \
- ev-document-security.h \
- ev-document-find.c \
- ev-document-find.h \
- ev-document-info.h \
- ev-document-transition.h \
- ev-document-transition.c \
- ev-file-exporter.c \
- ev-file-exporter.h \
- ev-render-context.h \
- ev-render-context.c \
- ev-selection.h \
- ev-selection.c \
- ev-document-misc.h \
- ev-document-misc.c
-
-libevbackend_la_LIBADD =
+# Backends
if ENABLE_PDF
-libevbackend_la_LIBADD += \
- $(top_builddir)/pdf/libpdfdocument.la
+SUBDIRS += pdf
endif
-if ENABLE_PS
-libevbackend_la_LIBADD += \
- $(top_builddir)/ps/libpsdocument.la
+if ENABLE_PS
+SUBDIRS += ps
endif
if ENABLE_PIXBUF
-libevbackend_la_LIBADD += \
- $(top_builddir)/pixbuf/libpixbufdocument.la
+SUBDIRS += pixbuf
endif
if ENABLE_DJVU
-libevbackend_la_LIBADD += \
- $(top_builddir)/djvu/libgtkdjvu.la
+SUBDIRS += djvu
endif
if ENABLE_TIFF
-libevbackend_la_LIBADD += \
- $(top_builddir)/tiff/libtiffdocument.la
+SUBDIRS += tiff
endif
if ENABLE_DVI
-libevbackend_la_LIBADD += \
- $(top_builddir)/dvi/libgtkdvi.la
+SUBDIRS += dvi
endif
if ENABLE_COMICS
-libevbackend_la_LIBADD += \
- $(top_builddir)/comics/libcomicsdocument.la
+ SUBDIRS += comics
endif
if ENABLE_IMPRESS
-libevbackend_la_LIBADD += \
- $(top_builddir)/impress/libimpressdocument.la
+ SUBDIRS += impress
endif
-
-BUILT_SOURCES= \
- ev-backend-marshalers.h \
- ev-backend-marshalers.c
-
-CLEANFILES = $(BUILT_SOURCES)
-
-ev-backend-marshalers.h: ev-backend-marshalers.list
- $(GLIB_GENMARSHAL) --prefix=_ev_backend_marshal $(srcdir)/ev-backend-marshalers.list --header > $@
-
-ev-backend-marshalers.c: ev-backend-marshalers.list
- $(GLIB_GENMARSHAL) --prefix=_ev_backend_marshal $(srcdir)/ev-backend-marshalers.list --body > $@
-
-ev-backend-marshal.c: ev-backend-marshalers.h ev-backend-marshalers.c
-
-noinst_HEADERS = \
- ev-backend-marshalers.h
-
-EXTRA_DIST= \
- ev-backend-marshalers.list
INCLUDES = \
-I$(top_srcdir) \
- -I$(top_srcdir)/backend \
- -I$(top_srcdir)/lib \
+ -I$(top_srcdir)/libdocument \
$(LIB_CFLAGS)
noinst_LTLIBRARIES = libcomicsdocument.la
INCLUDES = \
-I$(top_srcdir) \
- -I$(top_srcdir)/backend \
- -I$(top_srcdir)/lib \
+ -I$(top_srcdir)/libdocument \
-DGNOMEICONDIR=\""${prefix}/${DATADIRNAME}/pixmaps"\" \
$(LIB_CFLAGS) \
$(DJVU_CFLAGS)
SUBDIRS = mdvi-lib
INCLUDES = \
- -I$(top_srcdir) \
- -I$(top_srcdir)/backend \
- -I$(top_srcdir)/lib \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/libdocument \
-I$(srcdir)/mdvi-lib \
$(LIB_CFLAGS)
INCLUDES = \
-I$(top_srcdir) \
- -I$(top_srcdir)/backend \
+ -I$(top_srcdir)/libdocument \
$(SHELL_CFLAGS) \
-DDATADIR=\""$(datadir)"\"
INCLUDES = \
-I$(top_srcdir) \
- -I$(top_srcdir)/backend \
+ -I$(top_srcdir)/libdocument \
$(BACKEND_CFLAGS) \
$(POPPLER_CFLAGS) \
$(WARN_CXXFLAGS) \
INCLUDES = \
-I$(top_srcdir) \
- -I$(top_srcdir)/backend \
+ -I$(top_srcdir)/libdocument \
$(BACKEND_CFLAGS)
noinst_LTLIBRARIES = libpixbufdocument.la
INCLUDES = \
-I$(top_srcdir) \
- -I$(top_srcdir)/backend \
- -I$(top_srcdir)/lib \
+ -I$(top_srcdir)/libdocument \
$(BACKEND_CFLAGS) \
$(WARN_CFLAGS)
#include <math.h>
#include "ps-document.h"
-#include "ev-debug.h"
#include "gsdefaults.h"
#include "ev-file-exporter.h"
#include "ev-async-renderer.h"
cmap = gdk_window_get_colormap (gs->pstarget);
gdk_drawable_get_size (gs->bpixmap, &width, &height);
- LOG ("Get from drawable\n");
pixbuf = gdk_pixbuf_get_from_drawable (NULL, gs->bpixmap, cmap,
0, 0, 0, 0,
width, height);
- LOG ("Get from drawable done\n");
g_signal_emit_by_name (gs, "render_finished", pixbuf);
g_object_unref (pixbuf);
}
static void
interpreter_failed (PSDocument *gs, char *msg)
{
- LOG ("Interpreter failed %s", msg);
-
push_pixbuf (gs);
stop_interpreter (gs);
gs->message_window = event->client.data.l[0];
if (event->client.message_type == gs_class->page_atom) {
- LOG ("GS rendered the document");
gs->busy = FALSE;
push_pixbuf (gs);
- LOG ("Pixbuf pushed");
}
return TRUE;
}
if (!gs->bpixmap) {
- LOG ("Create pixmap");
fill = gdk_gc_new (gs->pstarget);
colormap = gdk_drawable_get_colormap (gs->pstarget);
char scaled_dpi[G_ASCII_DTOSTR_BUF_SIZE];
int urx, ury, llx, lly;
- LOG ("Setup the page");
-
get_page_box (gs, page, &urx, &ury, &llx, &lly);
g_ascii_dtostr (scaled_dpi, G_ASCII_DTOSTR_BUF_SIZE, 72.0 * scale);
0L, rotation, llx, lly, urx, ury,
scaled_dpi, scaled_dpi,
0, 0, 0, 0);
- LOG ("GS property %s", buf);
gdk_property_change (gs->pstarget, gs_class->gs_atom, gs_class->string_atom,
8, GDK_PROP_MODE_REPLACE, (guchar *)buf, strlen(buf));
void (*oldsig) (int);
oldsig = signal(SIGPIPE, catchPipe);
- LOG ("Input");
-
do {
if (gs->buffer_bytes_left == 0) {
/* Get a new section if required */
char **gv_env_vars = NULL;
int argc = 0, i;
- LOG ("Start the interpreter");
-
if(!gs->gs_filename)
return 0;
gdk_x11_drawable_get_xid (gs->pstarget),
gdk_x11_drawable_get_xid (gs->bpixmap),
gdk_display_get_name (gdk_drawable_get_display (gs->pstarget)));
- LOG ("Launching ghostview with env %s", gv_env);
gs->interpreter_pid = fork ();
switch (gs->interpreter_pid) {
{
if (gs->interpreter_pid > 0) {
int status = 0;
- LOG ("Stop the interpreter");
kill (gs->interpreter_pid, SIGTERM);
while ((wait(&status) == -1) && (errno == EINTR));
gs->interpreter_pid = -1;
{
g_return_val_if_fail (PS_IS_DOCUMENT(gs), FALSE);
- LOG ("Load the document");
-
if (fname == NULL) {
gs->gs_status = "";
return FALSE;
GdkDisplay *display;
Display *dpy;
- LOG ("Make ghostscript render next page");
-
g_return_val_if_fail (PS_IS_DOCUMENT(gs), FALSE);
g_return_val_if_fail (gs->interpreter_pid != 0, FALSE);
g_return_val_if_fail (gs->busy != TRUE, FALSE);
}
if (gs->structured_doc && gs->doc) {
- LOG ("It's a structured document, let's send one page to gs");
if (is_interpreter_ready (gs)) {
ps_document_next_page (gs);
* case, ggv restarts GS again and the first page is displayed.
*/
- LOG ("It's an unstructured document, gs will just read the file");
-
if (!is_interpreter_ready (gs)) {
ps_document_enable_interpreter(gs);
}
INCLUDES = \
-I$(top_srcdir) \
- -I$(top_srcdir)/backend \
+ -I$(top_srcdir)/libdocument \
$(BACKEND_CFLAGS)
noinst_LTLIBRARIES = libtiffdocument.la
AC_CONFIG_FILES([
backend/Makefile
-comics/Makefile
+backend/comics/Makefile
+backend/djvu/Makefile
+backend/dvi/Makefile
+backend/dvi/mdvi-lib/Makefile
+backend/impress/Makefile
+backend/pdf/Makefile
+backend/pixbuf/Makefile
+backend/ps/Makefile
+backend/tiff/Makefile
cut-n-paste/Makefile
cut-n-paste/recent-files/Makefile
cut-n-paste/toolbar-editor/Makefile
data/icons/Makefile
data/icons/scalable/Makefile
data/Makefile
-djvu/Makefile
-dvi/Makefile
-dvi/mdvi-lib/Makefile
help/Makefile
-impress/Makefile
-lib/Makefile
+libdocument/Makefile
Makefile
-pdf/Makefile
-pixbuf/Makefile
po/Makefile.in
properties/Makefile
-ps/Makefile
shell/Makefile
test/Makefile
thumbnailer/Makefile
-tiff/Makefile
])
AC_OUTPUT
#include "ephy-zoom-control.h"
#include "ephy-zoom.h"
-#include "ev-debug.h"
#include <gtk/gtk.h>
#include <gtk/gtkcombobox.h>
+++ /dev/null
-INCLUDES = \
- $(LIB_CFLAGS) \
- $(WARN_CFLAGS) \
- $(DISABLE_DEPRECATED)
-
-noinst_LTLIBRARIES = libev.la
-
-libev_la_SOURCES = \
- ev-debug.c \
- ev-debug.h \
- ev-file-helpers.c \
- ev-file-helpers.h \
- ev-gui.c \
- ev-gui.h \
- ev-tooltip.c \
- ev-tooltip.h
-
-libev_la_LIBADD = \
- $(top_builddir)/backend/libevbackend.la
+++ /dev/null
-/*
- * Copyright (C) 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$
- */
-
-#include "config.h"
-
-#include "ev-debug.h"
-
-#ifndef DISABLE_PROFILING
-
-#include <glib/gbacktrace.h>
-#include <string.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef HAVE_EXECINFO_H
-#include <execinfo.h>
-#endif
-
-static GHashTable *ev_profilers_hash = NULL;
-static const char *ev_profile_modules = NULL;
-static const char *ev_debug_break = NULL;
-
-#endif
-
-#ifndef DISABLE_LOGGING
-
-static const char *ev_log_modules;
-
-static void
-log_module (const gchar *log_domain,
- GLogLevelFlags log_level,
- const gchar *message,
- gpointer user_data)
-{
- gboolean should_log = FALSE;
-
- if (!ev_log_modules) return;
-
- if (strcmp (ev_log_modules, "all") != 0)
- {
- char **modules;
- int i;
-
- modules = g_strsplit (ev_log_modules, ":", 100);
-
- for (i = 0; modules[i] != NULL; i++)
- {
- if (strstr (message, modules [i]) != NULL)
- {
- should_log = TRUE;
- break;
- }
- }
-
- g_strfreev (modules);
- }
- else
- {
- should_log = TRUE;
- }
-
- if (should_log)
- {
- g_print ("%s\n", message);
- }
-}
-
-#define MAX_DEPTH 200
-
-static void
-trap_handler (const char *log_domain,
- GLogLevelFlags log_level,
- const char *message,
- gpointer user_data)
-{
- g_log_default_handler (log_domain, log_level, message, user_data);
-
- if (ev_debug_break != NULL &&
- (log_level & (G_LOG_LEVEL_WARNING |
- G_LOG_LEVEL_ERROR |
- G_LOG_LEVEL_CRITICAL |
- G_LOG_FLAG_FATAL)))
- {
- if (strcmp (ev_debug_break, "stack") == 0)
- {
-#ifdef HAVE_EXECINFO_H
- void *array[MAX_DEPTH];
- size_t size;
-
- size = backtrace (array, MAX_DEPTH);
- backtrace_symbols_fd (array, size, 2);
-#else
- g_on_error_stack_trace (g_get_prgname ());
-#endif
- }
- else if (strcmp (ev_debug_break, "trap") == 0)
- {
- G_BREAKPOINT ();
- }
- else if (strcmp (ev_debug_break, "suspend") == 0)
- {
- g_print ("Suspending program; attach with the debugger.\n");
-
- raise (SIGSTOP);
- }
- }
-}
-
-#endif
-
-void
-ev_debug_init (void)
-{
-#ifndef DISABLE_LOGGING
- ev_log_modules = g_getenv ("EV_LOG_MODULES");
- ev_debug_break = g_getenv ("EV_DEBUG_BREAK");
-
- g_log_set_default_handler (trap_handler, NULL);
-
- g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, log_module, NULL);
-
-#endif
-#ifndef DISABLE_PROFILING
- ev_profile_modules = g_getenv ("EV_PROFILE_MODULES");
-#endif
-}
-
-#ifndef DISABLE_PROFILING
-
-static EvProfiler *
-ev_profiler_new (const char *name, const char *module)
-{
- EvProfiler *profiler;
-
- profiler = g_new0 (EvProfiler, 1);
- profiler->timer = g_timer_new ();
- profiler->name = g_strdup (name);
- profiler->module = g_strdup (module);
-
- g_timer_start (profiler->timer);
-
- return profiler;
-}
-
-static gboolean
-ev_should_profile (const char *module)
-{
- char **modules;
- int i;
- gboolean res = FALSE;
-
- if (!ev_profile_modules) return FALSE;
- if (strcmp (ev_profile_modules, "all") == 0) return TRUE;
-
- modules = g_strsplit (ev_profile_modules, ":", 100);
-
- for (i = 0; modules[i] != NULL; i++)
- {
- if (strcmp (module, modules [i]) == 0)
- {
- res = TRUE;
- break;
- }
- }
-
- g_strfreev (modules);
-
- return res;
-}
-
-static void
-ev_profiler_dump (EvProfiler *profiler)
-{
- double seconds;
-
- g_return_if_fail (profiler != NULL);
-
- seconds = g_timer_elapsed (profiler->timer, NULL);
-
- g_print ("[ %s ] %s %f s elapsed\n",
- profiler->module, profiler->name,
- seconds);
-}
-
-static void
-ev_profiler_free (EvProfiler *profiler)
-{
- g_return_if_fail (profiler != NULL);
-
- g_timer_destroy (profiler->timer);
- g_free (profiler->name);
- g_free (profiler->module);
- g_free (profiler);
-}
-
-void
-ev_profiler_start (const char *name, const char *module)
-{
- EvProfiler *profiler;
-
- if (ev_profilers_hash == NULL)
- {
- ev_profilers_hash =
- g_hash_table_new_full (g_str_hash, g_str_equal,
- g_free, NULL);
- }
-
- if (!ev_should_profile (module)) return;
-
- profiler = ev_profiler_new (name, module);
-
- g_hash_table_insert (ev_profilers_hash, g_strdup (name), profiler);
-}
-
-void
-ev_profiler_stop (const char *name)
-{
- EvProfiler *profiler;
-
- profiler = g_hash_table_lookup (ev_profilers_hash, name);
- if (profiler == NULL) return;
- g_hash_table_remove (ev_profilers_hash, name);
-
- ev_profiler_dump (profiler);
- ev_profiler_free (profiler);
-}
-
-#endif
+++ /dev/null
-/*
- * Copyright (C) 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_DEBUG_H
-#define EV_DEBUG_H
-
-#include "config.h"
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-#ifndef GNOME_ENABLE_DEBUG
-#define DISABLE_LOGGING
-#define DISABLE_PROFILING
-#endif
-
-#if defined(G_HAVE_GNUC_VARARGS)
-
-#ifdef DISABLE_LOGGING
-#define LOG(msg, args...) G_STMT_START { } G_STMT_END
-#else
-#define LOG(msg, args...) \
-g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, \
- "[ %s ] " msg, \
- __FILE__ , ## args)
-#endif
-
-#elif defined(G_HAVE_ISO_VARARGS)
-
-#define LOG(...) G_STMT_START { } G_STMT_END
-
-#else /* no varargs macros */
-
-static void LOG(const char *format, ...) {}
-
-#endif
-
-#ifdef DISABLE_PROFILING
-#define START_PROFILER(name)
-#define STOP_PROFILER(name)
-#else
-#define START_PROFILER(name) \
-ev_profiler_start (name, __FILE__);
-#define STOP_PROFILER(name) \
-ev_profiler_stop (name);
-#endif
-
-typedef struct
-{
- GTimer *timer;
- char *name;
- char *module;
-} EvProfiler;
-
-void ev_debug_init (void);
-
-#ifndef DISABLE_PROFILING
-
-void ev_profiler_start (const char *name,
- const char *module);
-
-void ev_profiler_stop (const char *name);
-
-#endif
-
-G_END_DECLS
-
-#endif
+++ /dev/null
-/*
- * Copyright (C) 2002 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$
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-
-#include "ev-gui.h"
-
-static void
-ev_gui_sanitise_popup_position (GtkMenu *menu,
- GtkWidget *widget,
- gint *x,
- gint *y)
-{
- GdkScreen *screen = gtk_widget_get_screen (widget);
- gint monitor_num;
- GdkRectangle monitor;
- GtkRequisition req;
-
- g_return_if_fail (widget != NULL);
-
- gtk_widget_size_request (GTK_WIDGET (menu), &req);
-
- monitor_num = gdk_screen_get_monitor_at_point (screen, *x, *y);
- gtk_menu_set_monitor (menu, monitor_num);
- gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
-
- *x = CLAMP (*x, monitor.x, monitor.x + MAX (0, monitor.width - req.width));
- *y = CLAMP (*y, monitor.y, monitor.y + MAX (0, monitor.height - req.height));
-}
-
-void
-ev_gui_menu_position_tree_selection (GtkMenu *menu,
- gint *x,
- gint *y,
- gboolean *push_in,
- gpointer user_data)
-{
- GtkTreeSelection *selection;
- GList *selected_rows;
- GtkTreeModel *model;
- GtkTreeView *tree_view = GTK_TREE_VIEW (user_data);
- GtkWidget *widget = GTK_WIDGET (user_data);
- GtkRequisition req;
- GdkRectangle visible;
-
- gtk_widget_size_request (GTK_WIDGET (menu), &req);
- gdk_window_get_origin (widget->window, x, y);
-
- *x += (widget->allocation.width - req.width) / 2;
-
- /* Add on height for the treeview title */
- gtk_tree_view_get_visible_rect (tree_view, &visible);
- *y += widget->allocation.height - visible.height;
-
- selection = gtk_tree_view_get_selection (tree_view);
- selected_rows = gtk_tree_selection_get_selected_rows (selection, &model);
- if (selected_rows)
- {
- GdkRectangle cell_rect;
-
- gtk_tree_view_get_cell_area (tree_view, selected_rows->data,
- NULL, &cell_rect);
-
- *y += CLAMP (cell_rect.y + cell_rect.height, 0, visible.height);
-
- g_list_foreach (selected_rows, (GFunc)gtk_tree_path_free, NULL);
- g_list_free (selected_rows);
- }
-
- ev_gui_sanitise_popup_position (menu, widget, x, y);
-}
+++ /dev/null
-/*
- * Copyright (C) 2002 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 EPHY_GUI_H
-#define EPHY_GUI_H
-
-#include <gtk/gtkmenu.h>
-
-G_BEGIN_DECLS
-
-void ev_gui_menu_position_tree_selection (GtkMenu *menu,
- gint *x,
- gint *y,
- gboolean *push_in,
- gpointer user_data);
-G_END_DECLS
-
-#endif
--- /dev/null
+INCLUDES= \
+ -DEVINCE_UIDIR=\"$(pkgdatadir)\" \
+ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
+ -I$(top_srcdir)/backend/pdf \
+ -I$(top_srcdir)/backend/pixbuf \
+ -I$(top_srcdir)/backend/tiff \
+ -I$(top_srcdir)/backend/ps \
+ -I$(top_srcdir)/backend/djvu \
+ -I$(top_srcdir)/backend/dvi \
+ -I$(top_srcdir)/backend/impress \
+ -I$(top_srcdir)/backend/comics \
+ $(BACKEND_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(DISABLE_DEPRECATED)
+
+noinst_LTLIBRARIES = libevbackend.la
+
+libevbackend_la_SOURCES= \
+ ev-async-renderer.c \
+ ev-async-renderer.h \
+ ev-attachment.c \
+ ev-attachment.h \
+ ev-backend-marshal.c \
+ ev-link.c \
+ ev-link.h \
+ ev-link-action.c \
+ ev-link-action.h \
+ ev-link-dest.c \
+ ev-link-dest.h \
+ ev-image.c \
+ ev-image.h \
+ ev-document.c \
+ ev-document.h \
+ ev-document-factory.c \
+ ev-document-factory.h \
+ ev-document-thumbnails.c \
+ ev-document-thumbnails.h \
+ ev-document-fonts.c \
+ ev-document-fonts.h \
+ ev-document-links.c \
+ ev-document-links.h \
+ ev-document-images.c \
+ ev-document-images.h \
+ ev-document-security.c \
+ ev-document-security.h \
+ ev-document-find.c \
+ ev-document-find.h \
+ ev-document-info.h \
+ ev-document-transition.h \
+ ev-document-transition.c \
+ ev-file-exporter.c \
+ ev-file-exporter.h \
+ ev-file-helpers.c \
+ ev-file-helpers.h \
+ ev-render-context.h \
+ ev-render-context.c \
+ ev-selection.h \
+ ev-selection.c \
+ ev-document-misc.h \
+ ev-document-misc.c
+
+libevbackend_la_LIBADD =
+
+if ENABLE_PDF
+libevbackend_la_LIBADD += \
+ $(top_builddir)/backend/pdf/libpdfdocument.la
+endif
+
+if ENABLE_PS
+libevbackend_la_LIBADD += \
+ $(top_builddir)/backend/ps/libpsdocument.la
+endif
+
+if ENABLE_PIXBUF
+libevbackend_la_LIBADD += \
+ $(top_builddir)/backend/pixbuf/libpixbufdocument.la
+endif
+
+if ENABLE_DJVU
+libevbackend_la_LIBADD += \
+ $(top_builddir)/backend/djvu/libgtkdjvu.la
+endif
+
+if ENABLE_TIFF
+libevbackend_la_LIBADD += \
+ $(top_builddir)/backend/tiff/libtiffdocument.la
+endif
+
+if ENABLE_DVI
+libevbackend_la_LIBADD += \
+ $(top_builddir)/backend/dvi/libgtkdvi.la
+endif
+
+if ENABLE_COMICS
+libevbackend_la_LIBADD += \
+ $(top_builddir)/backend/comics/libcomicsdocument.la
+endif
+
+if ENABLE_IMPRESS
+libevbackend_la_LIBADD += \
+ $(top_builddir)/backend/impress/libimpressdocument.la
+endif
+
+BUILT_SOURCES= \
+ ev-backend-marshalers.h \
+ ev-backend-marshalers.c
+
+CLEANFILES = $(BUILT_SOURCES)
+
+ev-backend-marshalers.h: ev-backend-marshalers.list
+ $(GLIB_GENMARSHAL) --prefix=_ev_backend_marshal $(srcdir)/ev-backend-marshalers.list --header > $@
+
+ev-backend-marshalers.c: ev-backend-marshalers.list
+ $(GLIB_GENMARSHAL) --prefix=_ev_backend_marshal $(srcdir)/ev-backend-marshalers.list --body > $@
+
+ev-backend-marshal.c: ev-backend-marshalers.h ev-backend-marshalers.c
+
+noinst_HEADERS = \
+ ev-backend-marshalers.h
+
+EXTRA_DIST= \
+ ev-backend-marshalers.list
#include <string.h>
#include <glib.h>
#include <glib/gstdio.h>
-#include <libgnome/gnome-init.h>
+#include <errno.h>
#include <libgnomevfs/gnome-vfs-uri.h>
#include <libgnomevfs/gnome-vfs-utils.h>
#include <libgnomevfs/gnome-vfs-ops.h>
+2007-01-08 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
+
+ * POTFILES.in:
+
2007-01-08 David Lodge <dave@cirt.net>
* en_GB.po: Updated English (British) translation
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
[encoding: UTF-8]
-backend/ev-attachment.c
-backend/ev-document-factory.c
-comics/comics-document.c
+backend/comics/comics-document.c
+backend/dvi/dvi-document.c
+backend/pdf/ev-poppler.c
+backend/impress/zip.c
+backend/ps/gsdefaults.c
+backend/ps/ps-document.c
+libdocument/ev-attachment.c
+libdocument/ev-document-factory.c
cut-n-paste/recent-files/egg-recent-view-uimanager.c
cut-n-paste/toolbar-editor/egg-editable-toolbar.c
cut-n-paste/toolbar-editor/egg-toolbar-editor.c
data/evince-password.glade
data/evince-properties.glade
data/evince.schemas.in
-dvi/dvi-document.c
-pdf/ev-poppler.cc
-impress/zip.c
properties/ev-properties-main.c
properties/ev-properties-view.c
-ps/gsdefaults.c
-ps/ps-document.c
shell/eggfindbar.c
shell/ev-application.c
shell/ev-history.c
INCLUDES= \
-DDATADIR=\"$(pkgdatadir)\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
- -I$(top_srcdir)/backend \
+ -I$(top_srcdir)/libdocument \
$(FRONTEND_CFLAGS) \
$(NAUTILUS_CFLAGS) \
$(DISABLE_DEPRECATED) \
ev-properties-main.c
libevince_properties_page_la_LIBADD = \
- $(top_builddir)/lib/libev.la \
libevproperties.la \
+ $(top_builddir)/libdocument/libevbackend.la \
$(FRONTEND_LIBS) \
$(NAUTILUS_LIBS)
INCLUDES= \
-DDATADIR=\"$(pkgdatadir)\" \
-DGNOMEDATADIR=\"$(datadir)\" \
- -I$(top_srcdir)/lib \
-I$(top_srcdir)/cut-n-paste/zoom-control/ \
-I$(top_srcdir)/cut-n-paste/toolbar-editor/ \
-I$(top_srcdir)/cut-n-paste/totem-screensaver/ \
- -I$(top_srcdir)/backend \
+ -I$(top_srcdir)/libdocument \
-I$(top_srcdir)/properties \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" \
ev-sidebar-thumbnails.h \
ev-stock-icons.c \
ev-stock-icons.h \
+ ev-tooltip.c \
+ ev-tooltip.h \
main.c
$(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la \
$(top_builddir)/cut-n-paste/totem-screensaver/libtotemscrsaver.la \
$(top_builddir)/properties/libevproperties.la \
- $(top_builddir)/lib/libev.la \
+ $(top_builddir)/libdocument/libevbackend.la \
$(SHELL_LIBS) \
$(GNOME_PRINT_LIBS)
#ifndef EV_APPLICATION_H
#define EV_APPLICATION_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <glib/gerror.h>
#include <glib-object.h>
#include "ev-job-queue.h"
#include "ev-document-links.h"
#include "ev-window.h"
-#include "ev-gui.h"
struct _EvSidebarLinksPrivate {
GtkWidget *tree_view;
#include <gtk/gtkvbox.h>
#include "ev-document.h"
+#include "ev-utils.h"
G_BEGIN_DECLS
}
#endif /* WITH_GNOME_PRINT */
+static void
+ev_gui_sanitise_popup_position (GtkMenu *menu,
+ GtkWidget *widget,
+ gint *x,
+ gint *y)
+{
+ GdkScreen *screen = gtk_widget_get_screen (widget);
+ gint monitor_num;
+ GdkRectangle monitor;
+ GtkRequisition req;
+
+ g_return_if_fail (widget != NULL);
+
+ gtk_widget_size_request (GTK_WIDGET (menu), &req);
+
+ monitor_num = gdk_screen_get_monitor_at_point (screen, *x, *y);
+ gtk_menu_set_monitor (menu, monitor_num);
+ gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
+
+ *x = CLAMP (*x, monitor.x, monitor.x + MAX (0, monitor.width - req.width));
+ *y = CLAMP (*y, monitor.y, monitor.y + MAX (0, monitor.height - req.height));
+}
+
+void
+ev_gui_menu_position_tree_selection (GtkMenu *menu,
+ gint *x,
+ gint *y,
+ gboolean *push_in,
+ gpointer user_data)
+{
+ GtkTreeSelection *selection;
+ GList *selected_rows;
+ GtkTreeModel *model;
+ GtkTreeView *tree_view = GTK_TREE_VIEW (user_data);
+ GtkWidget *widget = GTK_WIDGET (user_data);
+ GtkRequisition req;
+ GdkRectangle visible;
+
+ gtk_widget_size_request (GTK_WIDGET (menu), &req);
+ gdk_window_get_origin (widget->window, x, y);
+
+ *x += (widget->allocation.width - req.width) / 2;
+
+ /* Add on height for the treeview title */
+ gtk_tree_view_get_visible_rect (tree_view, &visible);
+ *y += widget->allocation.height - visible.height;
+
+ selection = gtk_tree_view_get_selection (tree_view);
+ selected_rows = gtk_tree_selection_get_selected_rows (selection, &model);
+ if (selected_rows)
+ {
+ GdkRectangle cell_rect;
+
+ gtk_tree_view_get_cell_area (tree_view, selected_rows->data,
+ NULL, &cell_rect);
+
+ *y += CLAMP (cell_rect.y + cell_rect.height, 0, visible.height);
+
+ g_list_foreach (selected_rows, (GFunc)gtk_tree_path_free, NULL);
+ g_list_free (selected_rows);
+ }
+
+ ev_gui_sanitise_popup_position (menu, widget, x, y);
+}
+
void ev_print_region_contents (GdkRegion *region);
+void ev_gui_menu_position_tree_selection (GtkMenu *menu,
+ gint *x,
+ gint *y,
+ gboolean *push_in,
+ gpointer user_data);
+
#ifdef WITH_GNOME_PRINT
GnomePrintConfig* load_print_config_from_file (void);
void save_print_config_to_file (GnomePrintConfig *config);
#include "ev-document-find.h"
#include "ev-document-transition.h"
#include "ev-document-misc.h"
-#include "ev-debug.h"
#include "ev-job-queue.h"
#include "ev-page-cache.h"
#include "ev-pixbuf-cache.h"
{
EvView *view = EV_VIEW (object);
- LOG ("Finalize");
-
g_free (view->status);
g_free (view->find_status);
#include "ev-metadata-manager.h"
#include "ev-file-helpers.h"
#include "ev-utils.h"
-#include "ev-debug.h"
#include "ev-history.h"
#include "ev-image.h"
#endif
#include "ev-stock-icons.h"
-#include "ev-debug.h"
#include "ev-job-queue.h"
#include "ev-file-helpers.h"
g_set_application_name (_("Evince Document Viewer"));
ev_file_helpers_init ();
- ev_debug_init ();
ev_stock_icons_init ();
gtk_window_set_default_icon_name ("evince");
INCLUDES= \
-DDATADIR=\"$(pkgdatadir)\" \
- -I$(top_srcdir)/lib \
- -I$(top_srcdir)/backend \
+ -I$(top_srcdir)/libdocument \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" \
$(FRONTEND_CFLAGS) \
evince-thumbnailer.c
evince_thumbnailer_LDADD= \
- $(top_builddir)/lib/libev.la \
+ $(top_builddir)/libdocument/libevbackend.la \
$(FRONTEND_LIBS) \
$(DJVU_LIBS)
https://www.fi.muni.cz/~kas/git / evince.git / commitdiff