Added lock round XPDF global variable 'xref',

Fixed up some broken global CORBA things.
Added thread support to autogen glib stuff.

diff --git a/pdf/xpdf/ChangeLog b/pdf/xpdf/ChangeLog
index 5d23055e3cc7e17697ea9a30956c7b540b2cc689..cdf7bcd655381ae254e8dbb6565fde62a0e00d12 100644 (file)
--- a/pdf/xpdf/ChangeLog
+++ b/pdf/xpdf/ChangeLog
@@ -1,3 +1,10 @@
+1999-08-24  Michael Meeks  <michael@imaginator.com>
+
+       * Makefile.am: Cleaned + added thread bits.
+
+       * bonobo-image-x-pdf.cc: Add locking round 'xref' global.
+       Remove CORBA_Environment global.
+
 1999-08-24  Michael Meeks  <michael@imaginator.com>
 
        * bonobo-image-x-pdf.cc (bed_free_data): Rationalised Stream

diff --git a/pdf/xpdf/Makefile.am b/pdf/xpdf/Makefile.am
index b72a32ab3536191821ebfde33aa4dfc62f53fd79..f9cd91811eb648f92c7f4f40c0b750cdbe2f9d70 100644 (file)
--- a/pdf/xpdf/Makefile.am
+++ b/pdf/xpdf/Makefile.am
@@ -1,8 +1,8 @@
-
-INCLUDES =     \
-       -I$(top_srcdir)/goo     \
-       -I$(top_srcdir)/ltk     \
+INCLUDES =                                     \
+       -I$(top_srcdir)/goo                     \
+       -I$(top_srcdir)/ltk                     \
        -DGPDF_GLADE_DIR=\""$(gladedir)"\"      \
+       $(EXTRA_GLIB_CFLAGS)                    \
        $(EXTRA_GNOME_CFLAGS)
 
 if WITH_GNOME
@@ -53,7 +53,6 @@ gpdf_LDADD =                  \
        $(EXTRA_GNOME_LIBS)     \
        $(INTLLIBS)
 
-
 bonobo_image_x_pdf_SOURCES =   \
        $(common_sources)       \
        BonoboStream.h          \
@@ -61,15 +60,13 @@ bonobo_image_x_pdf_SOURCES =        \
        GOutputDev.cc           \
        bonobo-image-x-pdf.cc
 
-bonobo_image_x_pdf_CFLAGS  =   \
-       -DBONOBO_IO
-
 bonobo_image_x_pdf_LDADD =     \
        ../goo/libgoo.a         \
        $(GTK_LIBS)             \
        $(GNOME_LIBDIR)         \
        -lbonobo                \
        $(GNOMEGNORBA_LIBS)     \
+       $(EXTRA_GLIB_LIBS)      \
        $(INTLLIBS)
 
 xpdf_SOURCES =                 \

diff --git a/pdf/xpdf/bonobo-image-x-pdf.cc b/pdf/xpdf/bonobo-image-x-pdf.cc
index caa65fcddf1d9496841f057311804b6b6f7d821e..c4f2ead593751803edd1539a8f02bb94bc4cb24a 100644 (file)
--- a/pdf/xpdf/bonobo-image-x-pdf.cc
+++ b/pdf/xpdf/bonobo-image-x-pdf.cc
@@ -43,9 +43,6 @@ extern "C" {
 
 GBool printCommands = gFalse;
 
-CORBA_Environment ev;
-CORBA_ORB orb;
-
 /*
  * Number of servers running on the system
  * when the count reaches zero, we unregister from the
@@ -58,6 +55,8 @@ static int embeddable_servers = 0;
  */
 static GnomeEmbeddableFactory *factory;
        
+/* This lock protects the global PDF 'xref' variable */
+GMutex       *xref_lock;
 
 /*
  * BonoboObject data
@@ -67,6 +66,7 @@ typedef struct {
 
   PDFDoc       *pdf;
   XRef         *xref; /* Ugly global XRef hack fix */
+
   BonoboStream *pdf_stream;
   GNOME_Stream  bonobo_stream;
 
@@ -91,6 +91,23 @@ typedef struct {
   gint                  page;
 } view_data_t;
 
+static inline void
+xref_do_lock (bed_t *bed)
+{
+  g_return_if_fail (bed != NULL);
+
+  g_mutex_lock (xref_lock);
+  xref = bed->xref; /* Ugly global XRef hack fix */
+}
+
+static inline void
+xref_do_unlock (bed_t *bed)
+{
+  xref = NULL;
+  g_mutex_unlock (xref_lock);
+}
+
+
 extern "C" {
   static void realize_drawing_areas (bed_t *bed);
   static void setup_pixmap (bed_t *doc, view_data_t *view, GdkWindow *window);
@@ -148,13 +165,13 @@ render_page (view_data_t *view_data)
 {
   setup_pixmap (view_data->bed, view_data,
                view_data->win);
-  xref = view_data->bed->xref; /* Ugly global XRef hack fix */
+
+  xref_do_lock (view_data->bed);
   view_data->out->startDoc();
-  view_data->bed->pdf->displayPage(view_data->out,
-                                  view_data->page, view_data->zoom,
-                                  0, gTrue);
-  view_data->bed->xref = xref;
-  xref = NULL;
+  view_data->bed->pdf->displayPage (view_data->out,
+                                   view_data->page, view_data->zoom,
+                                   0, gTrue);
+  xref_do_unlock (view_data->bed);
 }
 
 static void
@@ -198,24 +215,29 @@ save_image (GnomePersistStream *ps, GNOME_Stream stream, void *data)
  * different size ?
  */
 static gboolean
-setup_size (bed_t *doc, view_data_t *view)
+setup_size (bed_t *doc, view_data_t *view_data)
 {
   int      w, h;
   gboolean same;
 
-  if (!doc || !view || !doc->pdf) {
-    view->w = 320;
-    view->h = 200;
+  if (!doc || !view_data || !doc->pdf) {
+    view_data->w = 320;
+    view_data->h = 200;
     return FALSE;
   }
-  w = (int)((doc->pdf->getPageWidth  (view->page) * view->zoom) / 72.0);
-  h = (int)((doc->pdf->getPageHeight (view->page) * view->zoom) / 72.0);
-  if (view->w == w && view->h == h)
+  xref_do_lock (view_data->bed);
+  w = (int)((doc->pdf->getPageWidth  (view_data->page)
+            * view_data->zoom) / 72.0);
+  h = (int)((doc->pdf->getPageHeight (view_data->page)
+            * view_data->zoom) / 72.0);
+  xref_do_unlock (view_data->bed);
+  
+  if (view_data->w == w && view_data->h == h)
     same = TRUE;
   else
     same = FALSE;
-  view->w = w;
-  view->h = h;
+  view_data->w = w;
+  view_data->h = h;
 
   return same;
 }
@@ -225,14 +247,18 @@ bed_free_data (bed_t *bed)
 {
   g_return_if_fail (bed != NULL);
 
+  xref_do_lock (bed);
   if (bed->pdf)
     delete bed->pdf;
   bed->pdf = NULL;
+  xref_do_unlock (bed);
+
   if (bed->pdf_stream)
     delete (bed->pdf_stream);
   bed->pdf_stream = NULL;
   
   if (bed->bonobo_stream) {
+    CORBA_Environment ev;
     CORBA_exception_init (&ev);
     CORBA_Object_release (bed->bonobo_stream, &ev);
     bed->bonobo_stream = NULL;
@@ -249,6 +275,7 @@ load_image_from_stream (GnomePersistStream *ps, GNOME_Stream stream, void *data)
        bed_t *bed = (bed_t *)data;
        CORBA_long length;
        GNOME_Stream_iobuf *buffer;
+       CORBA_Environment ev;
        guint lp;
        #define CHUNK 512
        FILE *hack;
@@ -260,6 +287,7 @@ load_image_from_stream (GnomePersistStream *ps, GNOME_Stream stream, void *data)
          g_warning ("Won't overwrite pre-existing stream: you wierdo");
          return 0;
        }
+       CORBA_exception_init (&ev);
 
        /* We need this for later */
        CORBA_Object_duplicate (stream, &ev);
@@ -269,6 +297,7 @@ load_image_from_stream (GnomePersistStream *ps, GNOME_Stream stream, void *data)
 #if PDF_DEBUG > 0
        printf ("Loading PDF from persiststream\n");
 #endif
+       xref_do_lock (bed);
        obj.initNull();
        bed->pdf_stream = new BonoboStream (stream, 0, -1, &obj);
        bed->pdf = new PDFDoc (bed->pdf_stream);
@@ -286,9 +315,12 @@ load_image_from_stream (GnomePersistStream *ps, GNOME_Stream stream, void *data)
          g_warning ("Duff pdf catalog\n");
          bed_free_data (bed);
        }
+       xref_do_unlock (bed);
 
        realize_drawing_areas (bed);
        redraw_all (bed);
+
+       CORBA_exception_free (&ev);
        return 0;
 }
 
@@ -805,18 +837,25 @@ init_bonobo_image_x_pdf_factory (void)
 static void
 init_server_factory (int argc, char **argv)
 {
-       gnome_CORBA_init_with_popt_table (
-               "bonobo-image-x-pdf", "1.0",
-               &argc, argv, NULL, 0, NULL, GNORBA_INIT_SERVER_FUNC, &ev);
+  CORBA_Environment ev;
+
+  CORBA_exception_init (&ev);
 
-       if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-               g_error (_("I could not initialize Bonobo"));
+  gnome_CORBA_init_with_popt_table (
+    "bonobo-image-x-pdf", "1.0",
+    &argc, argv, NULL, 0, NULL, GNORBA_INIT_SERVER_FUNC, &ev);
+  
+  if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
+    g_error (_("I could not initialize Bonobo"));
+
+  CORBA_exception_free (&ev);
 }
 
 int
 main (int argc, char *argv [])
 {
-  CORBA_exception_init (&ev);
+  g_thread_init (NULL);
+  xref_lock = g_mutex_new ();
   
   init_server_factory (argc, argv);
   if (!init_bonobo_image_x_pdf_factory ()) {
@@ -835,7 +874,8 @@ main (int argc, char *argv [])
   bonobo_main ();
 
   freeParams ();
-  CORBA_exception_free (&ev);
+  g_mutex_free (xref_lock);
   
   return 0;
 }
+