diff --git a/Makefile b/Makefile index 318fbdf..2be42d9 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -PACKAGE = PDFviewer +PACKAGE = PDFViewer VERSION = 0.0.0 SUBDIRS = src RM = rm -f @@ -34,7 +34,7 @@ dist: $(PACKAGE)-$(VERSION)/project.conf $(RM) -- $(PACKAGE)-$(VERSION) -install: all +install: @for i in $(SUBDIRS); do (cd $$i && $(MAKE) install) || exit; done uninstall: diff --git a/config.h b/config.h index 57e8d1a..c42d88f 100644 --- a/config.h +++ b/config.h @@ -1,4 +1,4 @@ -#define PACKAGE "PDFviewer" +#define PACKAGE "PDFViewer" #define VERSION "0.0.0" #ifndef PREFIX diff --git a/project.conf b/project.conf index ed963e2..ccfb00a 100644 --- a/project.conf +++ b/project.conf @@ -1,4 +1,4 @@ -package=PDFviewer +package=PDFViewer version=0.0.0 config=h diff --git a/src/Makefile b/src/Makefile index a16d6fe..54e1957 100644 --- a/src/Makefile +++ b/src/Makefile @@ -4,11 +4,11 @@ DESTDIR = BINDIR = $(PREFIX)/bin CC = cc CPPFLAGSF= -I $(PREFIX)/include -CPPFLAGS= -D EMBEDDED -D DEBUG -CFLAGSF = -W `pkg-config --cflags gtk+-2.0 poppler-glib` +CPPFLAGS= +CFLAGSF = -W `pkg-config --cflags libDesktop poppler-glib` CFLAGS = -Wall -g -O2 -pedantic -LDFLAGSF= `pkg-config --libs gtk+-2.0 poppler-glib` -lDesktop -LDFLAGS = -L $(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib +LDFLAGSF= `pkg-config --libs libDesktop poppler-glib` -lm +LDFLAGS = RM = rm -f LN = ln -f MKDIR = mkdir -p @@ -34,16 +34,16 @@ main.o: main.c $(CC) $(pdfviewer_CFLAGS) -c main.c clean: - $(RM) $(pdfviewer_OBJS) + $(RM) -- $(pdfviewer_OBJS) distclean: clean - $(RM) $(TARGETS) + $(RM) -- $(TARGETS) -install: all +install: $(TARGETS) $(MKDIR) $(DESTDIR)$(BINDIR) - $(INSTALL) -m 0755 pdfviewer $(DESTDIR)$(BINDIR)/pdfviewer + $(INSTALL) -m 0755 -- pdfviewer $(DESTDIR)$(BINDIR)/pdfviewer uninstall: - $(RM) $(DESTDIR)$(BINDIR)/pdfviewer + $(RM) -- $(DESTDIR)$(BINDIR)/pdfviewer .PHONY: all clean distclean install uninstall diff --git a/src/callbacks.c b/src/callbacks.c index 376047e..d34d101 100644 --- a/src/callbacks.c +++ b/src/callbacks.c @@ -1,3 +1,4 @@ +/* $Id$ */ /* Copyright (c) 2010 Sébastien Bocahu */ /* 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 diff --git a/src/callbacks.h b/src/callbacks.h index 5322d71..94e435a 100644 --- a/src/callbacks.h +++ b/src/callbacks.h @@ -1,3 +1,4 @@ +/* $Id$ */ /* Copyright (c) 2010 Sébastien Bocahu */ /* 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 diff --git a/src/main.c b/src/main.c index 8eaa008..05c7200 100644 --- a/src/main.c +++ b/src/main.c @@ -1,3 +1,4 @@ +/* $Id$ */ /* Copyright (c) 2010 Sébastien Bocahu */ /* 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 @@ -16,7 +17,6 @@ #include "pdfviewer.h" #include "../config.h" -// FIXME /* constants */ #ifndef PREFIX # define PREFIX "/usr/local" diff --git a/src/pdfviewer.c b/src/pdfviewer.c index 7457865..855908c 100644 --- a/src/pdfviewer.c +++ b/src/pdfviewer.c @@ -1,3 +1,4 @@ +/* $Id$ */ static char const _copyright[] = "Copyright (c) 2010 Sébastien Bocahu "; static char const _license[] = @@ -19,6 +20,7 @@ static char const _license[] = #include #include #include +#include #include #include #include @@ -128,10 +130,6 @@ static DesktopToolbar _pdfviewer_toolbar[] = { "FarAfter", G_CALLBACK(on_far_after), GTK_STOCK_MEDIA_NEXT, 0, 0, NULL }, { "ZoomIn", G_CALLBACK(on_zoom_in), GTK_STOCK_ZOOM_IN, 0, 0, NULL }, { "ZoomOut", G_CALLBACK(on_zoom_out), GTK_STOCK_ZOOM_OUT, 0, 0, NULL }, - { "", NULL, NULL, 0, 0, NULL }, -#ifdef EMBEDDED - { "", NULL, NULL, 0, 0, NULL }, -#endif { NULL, NULL, NULL, 0, 0, NULL } }; @@ -206,18 +204,21 @@ static void _new_set_title(PDFviewer * pdfviewer) snprintf(buf, sizeof(buf), "%s%s", "PDF viewer - ", (pdfviewer->pdf == NULL) ? "(Untitled)" - : "FIXME"); // FIXME + : "FIXME"); /* FIXME */ gtk_window_set_title(GTK_WINDOW(pdfviewer->window), buf); } + /* pdfviewer_delete */ void pdfviewer_delete(PDFviewer * pdfviewer) { #ifdef DEBUG fprintf(stderr, "DEBUG: %s()\n", __func__); #endif +#if 0 /* FIXME */ if(pdfviewer->pdf != NULL) - //FIXME pdf_delete(pdfviewer->pdf); + pdf_delete(pdfviewer->pdf); +#endif free(pdfviewer); } @@ -391,11 +392,15 @@ void pdf_load_page(PDFviewer * pdfviewer) poppler_page_get_size(page, &width, &height); if(!pdfviewer->pdf->scale) { - /*gdk_drawable_get_size(gtk_widget_get_window(pdfviewer->view), &w, &h);*/ -fprintf(stderr, "scale not set !\n"); + /* gdk_drawable_get_size(gtk_widget_get_window(pdfviewer->view), &w, &h); */ +#ifdef DEBUG + fprintf(stderr, "DEBUG: %s() scale not set!\n", __func__); +#endif gtk_widget_get_allocation(pdfviewer->view, &view_allocation); pdfviewer->pdf->scale = ((view_allocation.width - 20) / width); - //pdfviewer->pdf->scale = (view_allocation.height / height); // wiew whole page +#if 0 + pdfviewer->pdf->scale = (view_allocation.height / height); /* view whole page */ +#endif } if (!page) @@ -405,13 +410,16 @@ fprintf(stderr, "scale not set !\n"); gtk_statusbar_get_context_id( GTK_STATUSBAR(pdfviewer->statusbar), "read-page"), g_strdup_printf("Page %d/%d", - pdfviewer->pdf->current+1, pdfviewer->pdf->pages)); + pdfviewer->pdf->current + 1, pdfviewer->pdf->pages)); if (pdfviewer->pdf->surface) cairo_surface_destroy (pdfviewer->pdf->surface); pdfviewer->pdf->surface = NULL; -fprintf(stderr, "scale: %f\n", pdfviewer->pdf->scale); +#ifdef DEBUG + fprintf(stderr, "DEBUG: %s() scale: %f\n", __func__, + pdfviewer->pdf->scale); +#endif pdfviewer->pdf->surface = cairo_image_surface_create( CAIRO_FORMAT_ARGB32, ceil(pdfviewer->pdf->scale * width), ceil(pdfviewer->pdf->scale * height)); @@ -423,7 +431,7 @@ fprintf(stderr, "scale: %f\n", pdfviewer->pdf->scale); cairo_destroy(cr); g_object_unref(page); - g_signal_connect(G_OBJECT(pdfviewer->view), "expose_event", + g_signal_connect(G_OBJECT(pdfviewer->view), "expose-event", G_CALLBACK(pdf_render_area), (gpointer) pdfviewer->pdf); diff --git a/src/pdfviewer.h b/src/pdfviewer.h index 855d6e4..602fb82 100644 --- a/src/pdfviewer.h +++ b/src/pdfviewer.h @@ -1,3 +1,4 @@ +/* $Id$ */ /* Copyright (c) 2010 Sébastien Bocahu */ /* 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 @@ -20,9 +21,8 @@ # include -/* Editor */ +/* PDFviewer */ /* types */ - typedef struct _PDF PDF; typedef struct _PDFviewer PDFviewer; @@ -47,7 +47,7 @@ gboolean pdfviewer_close(PDFviewer * pdfviewer); void pdfviewer_open(PDFviewer * pdfviewer, char const * filename); void pdfviewer_open_dialog(PDFviewer * pdfviewer); -/* FIXME noy implemented */ +/* FIXME not implemented */ void pdfviewer_find(PDFviewer * pdfviewer, char const * text); #endif /* !PDFVIEWER_PDFVIEWER_H */ diff --git a/src/project.conf b/src/project.conf index 29ba189..7348f97 100644 --- a/src/project.conf +++ b/src/project.conf @@ -1,10 +1,10 @@ targets=pdfviewer cppflags_force=-I $(PREFIX)/include -cppflags=-D EMBEDDED -D DEBUG -cflags_force=-W `pkg-config --cflags gtk+-2.0 poppler-glib` +#cppflags=-D EMBEDDED +cflags_force=-W `pkg-config --cflags libDesktop poppler-glib` cflags=-Wall -g -O2 -pedantic -ldflags_force=`pkg-config --libs gtk+-2.0 poppler-glib` -lDesktop -ldflags=-L $(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib +ldflags_force=`pkg-config --libs libDesktop poppler-glib` -lm +ldflags= dist=Makefile,callbacks.h,pdfviewer.h [pdfviewer]