Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--pdf/xpdf/ChangeLog9
-rw-r--r--pdf/xpdf/bonobo-image-x-pdf.cc208
-rw-r--r--pdf/xpdf/gpdf.cc18
-rw-r--r--pdf/xpdf/image-x-pdf.gnorba14
4 files changed, 156 insertions, 93 deletions
diff --git a/pdf/xpdf/ChangeLog b/pdf/xpdf/ChangeLog
index 6800ccc..1e6617c 100644
--- a/pdf/xpdf/ChangeLog
+++ b/pdf/xpdf/ChangeLog
@@ -1,5 +1,14 @@
1999-08-11 Michael Meeks <michael@imaginator.com>
+ * bonobo-image-x-pdf.cc: Fixed innumerable bugs,
+ some in bonobo :-)
+ (load_image_from_stream): Try closing the file to let its
+ contents hit disk before reading from it :-)
+ (configure_size): Don't get scared by configure_size.
+ (redraw_view): Get the parameters in some sort of order.
+
+1999-08-11 Michael Meeks <michael@imaginator.com>
+
* bonobo-image-x-pdf.cc: Added.
* Makefile.am: added bonobo-image-x-pdf.c
diff --git a/pdf/xpdf/bonobo-image-x-pdf.cc b/pdf/xpdf/bonobo-image-x-pdf.cc
index 0b23c1b..be263eb 100644
--- a/pdf/xpdf/bonobo-image-x-pdf.cc
+++ b/pdf/xpdf/bonobo-image-x-pdf.cc
@@ -61,7 +61,7 @@ typedef struct {
double scale;
bonobo_object_data_t *bonobo_object_data;
GtkWidget *drawing_area;
- GtkPixmap *pixmap;
+ GdkPixmap *pixmap;
GOutputDev *out;
GdkColor paper;
gint w, h;
@@ -72,14 +72,10 @@ typedef struct {
static void
redraw_view (view_data_t *view_data, GdkRectangle *rect)
{
- GdkPixmap *pixmap;
- GdkBitmap *dummy;
gint width, height;
bonobo_object_data_t *bonobo_object_data = view_data->bonobo_object_data;
- gtk_pixmap_get (view_data->pixmap, &pixmap, &dummy);
-
- g_return_if_fail (pixmap != NULL);
+ g_return_if_fail (view_data->pixmap != NULL);
/*
* Do not draw outside the region that we know how to display
@@ -104,11 +100,11 @@ redraw_view (view_data_t *view_data, GdkRectangle *rect)
*/
gdk_draw_pixmap (view_data->drawing_area->window,
view_data->drawing_area->style->white_gc,
- pixmap,
+ view_data->pixmap,
+ rect->x, rect->y,
rect->x, rect->y,
rect->width,
- rect->height,
- rect->x, rect->y);
+ rect->height);
}
static void
@@ -120,17 +116,16 @@ configure_size (view_data_t *view_data, GdkRectangle *rect)
pixbuf = view_data->scaled;
else
pixbuf = view_data->bonobo_object_data->image;
-
- gtk_widget_set_usize (
- view_data->drawing_area,
- pixbuf->width,
- pixbuf->height);
-
- rect->x = 0;
- rect->y = 0;
- rect->width = pixbuf->width;
- rect->height = pixbuf->height;*/
- g_warning ("Ahhh run away... scaling !");
+*/
+ gtk_widget_set_usize (
+ view_data->drawing_area,
+ view_data->w,
+ view_data->h);
+
+ rect->x = 0;
+ rect->y = 0;
+ rect->width = view_data->w;
+ rect->height = view_data->h;
}
static void
@@ -155,6 +150,18 @@ save_image (GnomePersistStream *ps, GNOME_Stream stream, void *data)
return -1;
}
+static void
+setup_size (bonobo_object_data_t *doc, view_data_t *view)
+{
+ if (!doc || !view || !doc->pdf) {
+ view->w = 320;
+ view->h = 200;
+ return;
+ }
+ view->w = (int)((doc->pdf->getPageWidth (view->page) * view->zoom) / 72.0);
+ view->h = (int)((doc->pdf->getPageHeight (view->page) * view->zoom) / 72.0);
+}
+
/*
* Loads a PDF from a GNOME_Stream
*/
@@ -165,82 +172,128 @@ load_image_from_stream (GnomePersistStream *ps, GNOME_Stream stream, void *data)
CORBA_Environment ev;
CORBA_long length;
GNOME_Stream_iobuf *buffer;
+ guint lp;
+ #define CHUNK 512
FILE *hack;
char *name;
buffer = GNOME_Stream_iobuf__alloc ();
-
length = GNOME_Stream_length (stream, &ev);
- GNOME_Stream_read (stream, length, &buffer, &ev);
name = tempnam (NULL, "xpdf-hack");
if (!name)
return -1;
- hack = fopen (name, "w+");
+ hack = fopen (name, "wb+");
if (!hack)
return -1;
- fwrite (buffer->_buffer, 1, buffer->_length, hack);
+ while (length > 0) {
+ guint getlen;
+ if (length > 128)
+ getlen = 128;
+ else
+ getlen = length;
+ GNOME_Stream_read (stream, getlen, &buffer, &ev);
+ fwrite (buffer->_buffer, 1, buffer->_length, hack);
+ length -= buffer->_length;
+ }
+
+ fclose (hack);
CORBA_free (buffer);
bonobo_object_data->pdf = new PDFDoc (new GString (name));
+ if (!(bonobo_object_data->pdf->isOk())) {
+ g_warning ("Duff pdf data\n");
+ delete bonobo_object_data->pdf;
+ bonobo_object_data->pdf = NULL;
+ }
+ if (!bonobo_object_data->pdf->getCatalog()) {
+ g_warning ("Duff pdf catalog\n");
+ delete bonobo_object_data->pdf;
+ bonobo_object_data->pdf = NULL;
+ }
redraw_all (bonobo_object_data);
return 0;
}
-static void
-destroy_view (GnomeView *view, view_data_t *view_data)
-{
- view_data->bonobo_object_data->views = g_list_remove (view_data->bonobo_object_data->views, view_data);
- gtk_object_unref (GTK_OBJECT (view_data->drawing_area));
-
- g_free (view_data);
-}
-
-static int
-drawing_area_exposed (GtkWidget *widget, GdkEventExpose *event, view_data_t *view_data)
-{
-/* if (!view_data->bonobo_object_data->image)
- return TRUE;*/
-
- redraw_view (view_data, &event->area);
-
- return TRUE;
+extern "C" {
+ static void
+ destroy_view (GnomeView *view, view_data_t *view_data)
+ {
+ view_data->bonobo_object_data->views = g_list_remove (view_data->bonobo_object_data->views, view_data);
+ gtk_object_unref (GTK_OBJECT (view_data->drawing_area));
+
+ g_free (view_data);
+ }
}
-
-static GtkPixmap *
+static GdkPixmap *
setup_pixmap (bonobo_object_data_t *doc, view_data_t *view, GdkWindow *window)
{
- GdkGCValues gcValues;
- GdkGC *strokeGC;
- PDFDoc *pdf = doc->pdf;
- int w, h;
- GdkPixmap *pixmap = NULL;
-
- w = view->w = (int)((pdf->getPageWidth (view->page) * view->zoom) / 72.0);
- h = view->h = (int)((pdf->getPageHeight (view->page) * view->zoom) / 72.0);
-
- pixmap = gdk_pixmap_new (window, w, h, -1);
-
- gdk_color_white (gtk_widget_get_default_colormap(), &view->paper);
- view->out = new GOutputDev (pixmap, view->paper, window);
-
- gdk_color_white (gtk_widget_get_default_colormap (), &gcValues.foreground);
- gdk_color_black (gtk_widget_get_default_colormap (), &gcValues.background);
- gcValues.line_width = 1;
- gcValues.line_style = GDK_LINE_SOLID;
- strokeGC = gdk_gc_new_with_values (
- pixmap, &gcValues,
- (enum GdkGCValuesMask)(GDK_GC_FOREGROUND | GDK_GC_BACKGROUND | GDK_GC_LINE_WIDTH | GDK_GC_LINE_STYLE));
-
- gdk_draw_rectangle (pixmap, strokeGC,
- TRUE, 0, 0,
- w, h);
+ GdkGCValues gcValues;
+ GdkGC *strokeGC;
+ PDFDoc *pdf;
+ int w, h;
+ GdkPixmap *pixmap = NULL;
+
+ g_return_val_if_fail (doc != NULL, NULL);
+ g_return_val_if_fail (view != NULL, NULL);
+ g_return_val_if_fail (doc->pdf != NULL, NULL);
+
+ pdf = doc->pdf;
+
+ setup_size (doc, view);
+
+ w = view->w;
+ h = view->h;
+
+ pixmap = gdk_pixmap_new (window, w, h, -1);
+
+ gdk_color_white (gtk_widget_get_default_colormap(), &view->paper);
+ view->out = new GOutputDev (pixmap, view->paper, window);
+
+ gdk_color_white (gtk_widget_get_default_colormap (), &gcValues.foreground);
+ gdk_color_black (gtk_widget_get_default_colormap (), &gcValues.background);
+ gcValues.line_width = 1;
+ gcValues.line_style = GDK_LINE_SOLID;
+ strokeGC = gdk_gc_new_with_values (
+ pixmap, &gcValues,
+ (enum GdkGCValuesMask)(GDK_GC_FOREGROUND | GDK_GC_BACKGROUND | GDK_GC_LINE_WIDTH | GDK_GC_LINE_STYLE));
+
+ gdk_draw_rectangle (pixmap, strokeGC,
+ TRUE, 0, 0,
+ w, h);
+
+ return pixmap;
+}
- return GTK_PIXMAP (gtk_pixmap_new (pixmap, NULL));
+extern "C" {
+ static int
+ drawing_area_exposed (GtkWidget *widget, GdkEventExpose *event, view_data_t *view_data)
+ {
+ if (!view_data ||
+ !view_data->bonobo_object_data->pdf)
+ return TRUE;
+
+/* Hoisted from view_factory: ugly */
+ if (!view_data->pixmap) {
+ GdkWindow *win = gtk_widget_get_parent_window (widget);
+ GdkRectangle tmp;
+
+ g_return_val_if_fail (win, TRUE);
+
+ view_data->pixmap = setup_pixmap (view_data->bonobo_object_data, view_data, win);
+ view_data->bonobo_object_data->pdf->displayPage(view_data->out, view_data->page, view_data->zoom, 0, gTrue);
+
+ configure_size (view_data, &tmp);
+ }
+
+ redraw_view (view_data, &event->area);
+
+ return TRUE;
+ }
}
static GnomeView *
@@ -256,11 +309,7 @@ view_factory (GnomeEmbeddable *bonobo_object,
view_data->bonobo_object_data = bonobo_object_data;
view_data->drawing_area = gtk_drawing_area_new ();
view_data->page = 1;
- view_data->zoom = 86.0;
-
- GdkWindow *win = gtk_widget_get_parent_window (GTK_WIDGET (view_data->drawing_area));
- view_data->pixmap = setup_pixmap (bonobo_object_data, view_data, win);
-
+ view_data->zoom = 24.0; /* 86.0; Must be small for demos :-) */
gtk_signal_connect (
GTK_OBJECT (view_data->drawing_area),
@@ -268,6 +317,9 @@ view_factory (GnomeEmbeddable *bonobo_object,
GTK_SIGNAL_FUNC (drawing_area_exposed), view_data);
gtk_widget_show (view_data->drawing_area);
+
+ setup_size (bonobo_object_data, view_data);
+
view = gnome_view_new (view_data->drawing_area);
gtk_signal_connect (
@@ -300,8 +352,6 @@ bonobo_object_factory (GnomeEmbeddableFactory *This, void *data)
return NULL;
}
- /* Does the pdf init stuff */
- initParams (xpdfConfigFile); /* Init font path */
bonobo_object_data->pdf = NULL;
/*
@@ -356,6 +406,10 @@ main (int argc, char *argv [])
init_server_factory (argc, argv);
init_bonobo_image_x_png_factory ();
+ errorInit();
+
+ initParams (xpdfConfigFile); /* Init font path */
+
gtk_widget_set_default_colormap (gdk_rgb_get_cmap ());
gtk_widget_set_default_visual (gdk_rgb_get_visual ());
gtk_main ();
diff --git a/pdf/xpdf/gpdf.cc b/pdf/xpdf/gpdf.cc
index 0df27f6..171b216 100644
--- a/pdf/xpdf/gpdf.cc
+++ b/pdf/xpdf/gpdf.cc
@@ -110,9 +110,9 @@ setup_pixmap (DOC_ROOT *doc, DOC_ROOT *view, GdkWindow *window)
}
static void
-render_page (DOC_ROOT *doc)
+render_page (DOC_ROOT *doc, DOC_ROOT *view)
{
- doc->pdf->displayPage(doc->out, doc->page, doc->zoom, 0, gTrue);
+ doc->pdf->displayPage(doc->out, view->page, view->zoom, 0, gTrue);
}
/*static void displayPage(int page1, int zoom1, int rotate1) {
@@ -199,7 +199,7 @@ doc_root_new (GString *fileName)
doc->scroll = GTK_SCROLLED_WINDOW (gtk_scrolled_window_new (NULL, NULL));
gtk_scrolled_window_set_policy (doc->scroll, GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- render_page (doc);
+ render_page (doc, doc);
gtk_scrolled_window_add_with_viewport (doc->scroll, GTK_WIDGET (doc->pixmap));
gtk_box_pack_start (GTK_BOX (pane), GTK_WIDGET (doc->scroll), TRUE, TRUE, 0);
@@ -257,7 +257,7 @@ extern "C" {
{
if (doc->page < doc->pdf->getNumPages()) {
doc->page++;
- render_page (doc);
+ render_page (doc, doc);
gtk_widget_queue_draw (GTK_WIDGET (doc->scroll));
}
}
@@ -267,7 +267,7 @@ extern "C" {
{
if (doc->page > 1) {
doc->page--;
- render_page (doc);
+ render_page (doc, doc);
gtk_widget_queue_draw (GTK_WIDGET (doc->pixmap));
}
}
@@ -277,7 +277,7 @@ extern "C" {
{
if (doc->page != 1) {
doc->page = 1;
- render_page (doc);
+ render_page (doc, doc);
gtk_widget_queue_draw (GTK_WIDGET (doc->pixmap));
}
}
@@ -287,7 +287,7 @@ extern "C" {
{
if (doc->page != doc->pdf->getNumPages()) {
doc->page = doc->pdf->getNumPages();
- render_page (doc);
+ render_page (doc, doc);
gtk_widget_queue_draw (GTK_WIDGET (doc->pixmap));
}
}
@@ -297,7 +297,7 @@ extern "C" {
{
if (doc->zoom < 200) {
doc->zoom *= 1.2;
- render_page (doc);
+ render_page (doc, doc);
gtk_widget_queue_draw (GTK_WIDGET (doc->pixmap));
}
}
@@ -307,7 +307,7 @@ extern "C" {
{
if (doc->zoom < 200) {
doc->zoom /= 1.2;
- render_page (doc);
+ render_page (doc, doc);
gtk_widget_queue_draw (GTK_WIDGET (doc->pixmap));
}
}
diff --git a/pdf/xpdf/image-x-pdf.gnorba b/pdf/xpdf/image-x-pdf.gnorba
index 82d5372..349cdbf 100644
--- a/pdf/xpdf/image-x-pdf.gnorba
+++ b/pdf/xpdf/image-x-pdf.gnorba
@@ -1,11 +1,11 @@
-[bonobo-object-factory:image-x-png]
+[bonobo-object-factory:image-x-pdf]
type=exe
repo_id=IDL:GNOME/EmbeddableFactory:1.0 IDL:GNOME/GenericFactory:1.0
-description=image/x-png bonobo object factory
-location_info=bonobo-image-x-png
+description=image/x-pdf bonobo object factory
+location_info=bonobo-image-x-pdf
-[bonobo-object:image-x-png]
+[bonobo-object:image-x-pdf]
type=factory
-repo_id=IDL:BonoboObject/image-x-png:1.0 IDL:GNOME/Embeddable:1.0
-description=image/x-png bonobo object
-location_info=bonobo-object-factory:image-x-png
+repo_id=IDL:BonoboObject/image-x-pdf:1.0 IDL:GNOME/Embeddable:1.0
+description=image/x-pdf bonobo object
+location_info=bonobo-object-factory:image-x-pdf
generated by cgit v0.9.1 at 2024-05-24 19:08:57 (GMT)