DeforaOS/PDFViewer
DeforaOS/PDFViewer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some cleanup

Browse Source
This commit is contained in:
Pierre Pronchery 2011-05-14 19:39:32 +00:00
parent 16b88ab8d9
commit 819bc4d570
10 changed files with 43 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1,4 +1,4 @@
PACKAGE = PDFviewer PACKAGE = PDFViewer
VERSION = 0.0.0 VERSION = 0.0.0
SUBDIRS = src SUBDIRS = src
RM = rm -f RM = rm -f
@ -34,7 +34,7 @@ dist:
$(PACKAGE)-$(VERSION)/project.conf $(PACKAGE)-$(VERSION)/project.conf
$(RM) -- $(PACKAGE)-$(VERSION) $(RM) -- $(PACKAGE)-$(VERSION)
install: all install:
@for i in $(SUBDIRS); do (cd $$i && $(MAKE) install) || exit; done @for i in $(SUBDIRS); do (cd $$i && $(MAKE) install) || exit; done
uninstall: uninstall:

2
config.h
View File

@ -1,4 +1,4 @@
#define PACKAGE "PDFviewer" #define PACKAGE "PDFViewer"
#define VERSION "0.0.0" #define VERSION "0.0.0"
#ifndef PREFIX #ifndef PREFIX

2
project.conf
View File

@ -1,4 +1,4 @@
package=PDFviewer package=PDFViewer
version=0.0.0 version=0.0.0
config=h config=h

18
src/Makefile
View File

@ -4,11 +4,11 @@ DESTDIR =
BINDIR = $(PREFIX)/bin BINDIR = $(PREFIX)/bin
CC = cc CC = cc
CPPFLAGSF= -I $(PREFIX)/include CPPFLAGSF= -I $(PREFIX)/include
CPPFLAGS= -D EMBEDDED -D DEBUG CPPFLAGS=
CFLAGSF = -W `pkg-config --cflags gtk+-2.0 poppler-glib` CFLAGSF = -W `pkg-config --cflags libDesktop poppler-glib`
CFLAGS = -Wall -g -O2 -pedantic CFLAGS = -Wall -g -O2 -pedantic
LDFLAGSF= `pkg-config --libs gtk+-2.0 poppler-glib` -lDesktop LDFLAGSF= `pkg-config --libs libDesktop poppler-glib` -lm
LDFLAGS = -L $(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib LDFLAGS =
RM = rm -f RM = rm -f
LN = ln -f LN = ln -f
MKDIR = mkdir -p MKDIR = mkdir -p
@ -34,16 +34,16 @@ main.o: main.c
$(CC) $(pdfviewer_CFLAGS) -c main.c $(CC) $(pdfviewer_CFLAGS) -c main.c
clean: clean:
$(RM) $(pdfviewer_OBJS) $(RM) -- $(pdfviewer_OBJS)
distclean: clean distclean: clean
$(RM) $(TARGETS) $(RM) -- $(TARGETS)
install: all install: $(TARGETS)
$(MKDIR) $(DESTDIR)$(BINDIR) $(MKDIR) $(DESTDIR)$(BINDIR)
$(INSTALL) -m 0755 pdfviewer $(DESTDIR)$(BINDIR)/pdfviewer $(INSTALL) -m 0755 -- pdfviewer $(DESTDIR)$(BINDIR)/pdfviewer
uninstall: uninstall:
$(RM) $(DESTDIR)$(BINDIR)/pdfviewer $(RM) -- $(DESTDIR)$(BINDIR)/pdfviewer
.PHONY: all clean distclean install uninstall .PHONY: all clean distclean install uninstall

1
src/callbacks.c
View File

@ -1,3 +1,4 @@
/* $Id$ */
/* Copyright (c) 2010 Sébastien Bocahu <zecrazytux@zecrazytux.net> */ /* Copyright (c) 2010 Sébastien Bocahu <zecrazytux@zecrazytux.net> */
/* This program is free software; you can redistribute it and/or modify /* 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 * it under the terms of the GNU General Public License as published by

1
src/callbacks.h
View File

@ -1,3 +1,4 @@
/* $Id$ */
/* Copyright (c) 2010 Sébastien Bocahu <zecrazytux@zecrazytux.net> */ /* Copyright (c) 2010 Sébastien Bocahu <zecrazytux@zecrazytux.net> */
/* This program is free software; you can redistribute it and/or modify /* 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 * it under the terms of the GNU General Public License as published by

2
src/main.c
View File

@ -1,3 +1,4 @@
/* $Id$ */
/* Copyright (c) 2010 Sébastien Bocahu <zecrazytux@zecrazytux.net> */ /* Copyright (c) 2010 Sébastien Bocahu <zecrazytux@zecrazytux.net> */
/* This program is free software; you can redistribute it and/or modify /* 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 * it under the terms of the GNU General Public License as published by
@ -16,7 +17,6 @@
#include "pdfviewer.h" #include "pdfviewer.h"
#include "../config.h" #include "../config.h"
// FIXME
/* constants */ /* constants */
#ifndef PREFIX #ifndef PREFIX
# define PREFIX "/usr/local" # define PREFIX "/usr/local"

28
src/pdfviewer.c
View File

@ -1,3 +1,4 @@
/* $Id$ */
static char const _copyright[] = static char const _copyright[] =
"Copyright (c) 2010 Sébastien Bocahu <zecrazytux@zecrazytux.net>"; "Copyright (c) 2010 Sébastien Bocahu <zecrazytux@zecrazytux.net>";
static char const _license[] = static char const _license[] =
@ -19,6 +20,7 @@ static char const _license[] =
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <math.h>
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include <poppler.h> #include <poppler.h>
#include <Desktop.h> #include <Desktop.h>
@ -128,10 +130,6 @@ static DesktopToolbar _pdfviewer_toolbar[] =
{ "FarAfter", G_CALLBACK(on_far_after), GTK_STOCK_MEDIA_NEXT, 0, 0, NULL }, { "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 }, { "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 }, { "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 } { 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 - ", snprintf(buf, sizeof(buf), "%s%s", "PDF viewer - ",
(pdfviewer->pdf == NULL) ? "(Untitled)" (pdfviewer->pdf == NULL) ? "(Untitled)"
: "FIXME"); // FIXME : "FIXME"); /* FIXME */
gtk_window_set_title(GTK_WINDOW(pdfviewer->window), buf); gtk_window_set_title(GTK_WINDOW(pdfviewer->window), buf);
} }
/* pdfviewer_delete */ /* pdfviewer_delete */
void pdfviewer_delete(PDFviewer * pdfviewer) void pdfviewer_delete(PDFviewer * pdfviewer)
{ {
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "DEBUG: %s()\n", __func__); fprintf(stderr, "DEBUG: %s()\n", __func__);
#endif #endif
#if 0 /* FIXME */
if(pdfviewer->pdf != NULL) if(pdfviewer->pdf != NULL)
//FIXME pdf_delete(pdfviewer->pdf); pdf_delete(pdfviewer->pdf);
#endif
free(pdfviewer); free(pdfviewer);
} }
@ -392,10 +393,14 @@ void pdf_load_page(PDFviewer * pdfviewer)
if(!pdfviewer->pdf->scale) { if(!pdfviewer->pdf->scale) {
/* gdk_drawable_get_size(gtk_widget_get_window(pdfviewer->view), &w, &h); */ /* gdk_drawable_get_size(gtk_widget_get_window(pdfviewer->view), &w, &h); */
fprintf(stderr, "scale not set !\n"); #ifdef DEBUG
fprintf(stderr, "DEBUG: %s() scale not set!\n", __func__);
#endif
gtk_widget_get_allocation(pdfviewer->view, &view_allocation); gtk_widget_get_allocation(pdfviewer->view, &view_allocation);
pdfviewer->pdf->scale = ((view_allocation.width - 20) / width); 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) if (!page)
@ -411,7 +416,10 @@ fprintf(stderr, "scale not set !\n");
cairo_surface_destroy (pdfviewer->pdf->surface); cairo_surface_destroy (pdfviewer->pdf->surface);
pdfviewer->pdf->surface = NULL; 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( pdfviewer->pdf->surface = cairo_image_surface_create(
CAIRO_FORMAT_ARGB32, ceil(pdfviewer->pdf->scale * width), CAIRO_FORMAT_ARGB32, ceil(pdfviewer->pdf->scale * width),
ceil(pdfviewer->pdf->scale * height)); ceil(pdfviewer->pdf->scale * height));
@ -423,7 +431,7 @@ fprintf(stderr, "scale: %f\n", pdfviewer->pdf->scale);
cairo_destroy(cr); cairo_destroy(cr);
g_object_unref(page); 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), G_CALLBACK(pdf_render_area),
(gpointer) pdfviewer->pdf); (gpointer) pdfviewer->pdf);

6
src/pdfviewer.h
View File

@ -1,3 +1,4 @@
/* $Id$ */
/* Copyright (c) 2010 Sébastien Bocahu <zecrazytux@zecrazytux.net> */ /* Copyright (c) 2010 Sébastien Bocahu <zecrazytux@zecrazytux.net> */
/* This program is free software; you can redistribute it and/or modify /* 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 * it under the terms of the GNU General Public License as published by
@ -20,9 +21,8 @@
# include <poppler.h> # include <poppler.h>
/* Editor */ /* PDFviewer */
/* types */ /* types */
typedef struct _PDF PDF; typedef struct _PDF PDF;
typedef struct _PDFviewer PDFviewer; typedef struct _PDFviewer PDFviewer;
@ -47,7 +47,7 @@ gboolean pdfviewer_close(PDFviewer * pdfviewer);
void pdfviewer_open(PDFviewer * pdfviewer, char const * filename); void pdfviewer_open(PDFviewer * pdfviewer, char const * filename);
void pdfviewer_open_dialog(PDFviewer * pdfviewer); void pdfviewer_open_dialog(PDFviewer * pdfviewer);
/* FIXME noy implemented */ /* FIXME not implemented */
void pdfviewer_find(PDFviewer * pdfviewer, char const * text); void pdfviewer_find(PDFviewer * pdfviewer, char const * text);
#endif /* !PDFVIEWER_PDFVIEWER_H */ #endif /* !PDFVIEWER_PDFVIEWER_H */

8
src/project.conf
View File

@ -1,10 +1,10 @@
targets=pdfviewer targets=pdfviewer
cppflags_force=-I $(PREFIX)/include cppflags_force=-I $(PREFIX)/include
cppflags=-D EMBEDDED -D DEBUG #cppflags=-D EMBEDDED
cflags_force=-W `pkg-config --cflags gtk+-2.0 poppler-glib` cflags_force=-W `pkg-config --cflags libDesktop poppler-glib`
cflags=-Wall -g -O2 -pedantic cflags=-Wall -g -O2 -pedantic
ldflags_force=`pkg-config --libs gtk+-2.0 poppler-glib` -lDesktop ldflags_force=`pkg-config --libs libDesktop poppler-glib` -lm
ldflags=-L $(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib ldflags=
dist=Makefile,callbacks.h,pdfviewer.h dist=Makefile,callbacks.h,pdfviewer.h
[pdfviewer] [pdfviewer]