Attempts at cleaning up component destruction - failed :-(

[evince.git] / pdf / xpdf / gpdf.cc

diff --git a/pdf/xpdf/gpdf.cc b/pdf/xpdf/gpdf.cc
index 5eff140135117bc259a96d241574dffde11de882..0db774b6caf3e07ecad4c60bb626f90409501478 100644 (file)
--- a/pdf/xpdf/gpdf.cc
+++ b/pdf/xpdf/gpdf.cc
@@ -1,21 +1,25 @@
-//========================================================================
-//
-// gpdf.cc
-//
-// Copyright 1996 Derek B. Noonburg
-// Copyright 1999 Michael Meeks.
-// Copyright 1999 Miguel de Icaza
-//
-//========================================================================
-
-
+/*
+ * PDF viewer Bonobo container.
+ *
+ * Author:
+ *   Michael Meeks <michael@imaginator.com>
+ *
+ */

 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>

+extern "C" {

 #define GString G_String
 #include <gnome.h>
 #define GString G_String
 #include <gnome.h>

+#include <libgnorba/gnorba.h>
+#include <gdk/gdkprivate.h>
+#include <gdk/gdkx.h>
+#include <bonobo/gnome-bonobo.h>

 #undef  GString 
 #undef  GString 

+}
+#include <sys/stat.h>
+#include <unistd.h>

 #include "gtypes.h"
 #include "GString.h"
 #include "parseargs.h"
 #include "gtypes.h"
 #include "GString.h"
 #include "parseargs.h"


@@ -37,220 +41,636 @@
 #include "Error.h"
 #include "config.h"
 
 #include "Error.h"
 #include "config.h"
 

-GBool printCommands = gFalse;
-gint  gpdf_debug;

 poptContext ctx;
 poptContext ctx;

+gint  gpdf_debug=0;

 
 

-#define DOC_ROOT_MAGIC 0xad3f556d
-struct DOC_ROOT {
-  guint32        magic;
-  GString        *title;
-  PDFDoc         *pdf;
-  GtkWidget      *toplevel;
-  GtkWidget      *table;
-  GnomeAppBar    *appbar;
-  GtkDrawingArea *area;
-  GdkPixmap      *pixmap;
-  OutputDev      *out;
-  GdkColor        paper;
+const struct poptOption gpdf_popt_options [] = {
+  { "debug", '\0', POPT_ARG_INT, &gpdf_debug, 0,
+    N_("Enables some debugging functions"), N_("LEVEL") },
+  { NULL, '\0', 0, NULL, 0 }

 };
 
 };
 

-DOC_ROOT *hack_global = NULL;
+typedef struct _Component Component;
+typedef struct _Container Container;
+/* NB. there is a 1 to 1 Container -> Component mapping, this
+   is due to how much MDI sucks; unutterably */
+struct _Container {
+  GnomeContainer    *container;
+  GnomeUIHandler    *uih;
+  
+  GnomeViewFrame    *active_view_frame;
+  
+  GtkWidget        *app;
+  GtkScrolledWindow *scroll;
+  GtkWidget        *view_widget;
+  Component         *component;
+  gdouble zoom;
+};

 
 

-static void
-crummy_cmd (GtkWidget *widget, DOC_ROOT *tmp)
-{
-  printf ("Crummy\n");
+struct  _Component {
+       Container         *container;
+
+       GnomeClientSite   *client_site;
+       GnomeViewFrame    *view_frame;
+       GnomeObjectClient *server;
+};
+
+GList *containers = NULL;
+/*
+ * Static prototypes.
+ */
+extern "C" {
+  static Container *container_new       (const char *fname);
+  static void       container_destroy   (Container *cont);
+  static void       container_open_cmd  (GtkWidget *widget, Container *container);
+  static void       container_close_cmd (GtkWidget *widget, Container *container);
+  static void       container_exit_cmd  (void);
+  static void       container_about_cmd (GtkWidget *widget, Container *container);
+  static Component *container_activate_component (Container *container, char *component_goad_id);
+  static void       zoom_in_cmd         (GtkWidget *widget, Container *container);
+  static void       zoom_out_cmd        (GtkWidget *widget, Container *container);
+  static void       zoom_set            (Container *container);

 }
 
 }
 

+/*
+ * The menus.
+ */
+static GnomeUIInfo container_file_menu [] = {
+       GNOMEUIINFO_MENU_OPEN_ITEM (container_open_cmd, NULL),
+       GNOMEUIINFO_SEPARATOR,
+       GNOMEUIINFO_MENU_CLOSE_ITEM(container_close_cmd, NULL),
+       GNOMEUIINFO_SEPARATOR,
+       GNOMEUIINFO_MENU_EXIT_ITEM (container_exit_cmd, NULL),
+       GNOMEUIINFO_END
+};

 
 

-const struct poptOption gpdf_popt_options [] = {
-  { "debug", '\0', POPT_ARG_INT, &gpdf_debug, 0,
-    N_("Enables some debugging functions"), N_("LEVEL") },
-  { NULL, '\0', 0, NULL, 0 }
+static GnomeUIInfo container_menu_zoom [] = {
+       { GNOME_APP_UI_ITEM, N_("_Zoom in"),
+         N_("Increase the size of objects in the PDF"),
+         zoom_in_cmd },
+       { GNOME_APP_UI_ITEM, N_("_Zoom out"),
+         N_("Decrease the size of objects in the PDF"),
+         zoom_out_cmd },
+       GNOMEUIINFO_END

 };
 
 };
 

+static GnomeUIInfo container_help_menu [] = {
+        GNOMEUIINFO_MENU_ABOUT_ITEM(container_about_cmd, NULL),
+       GNOMEUIINFO_END
+};

 
 

-static GnomeUIInfo dummy_menu [] = {
-       { GNOME_APP_UI_ITEM, N_("_dummy"),
-         N_("What a dummy!"), crummy_cmd },
+static GnomeUIInfo container_main_menu [] = {
+       GNOMEUIINFO_MENU_FILE_TREE (container_file_menu),
+       { GNOME_APP_UI_SUBTREE, N_("_Zoom"), NULL, container_menu_zoom },
+       GNOMEUIINFO_MENU_HELP_TREE (container_help_menu),

        GNOMEUIINFO_END
 };
 
        GNOMEUIINFO_END
 };
 

-static GnomeUIInfo main_menu [] = {
-       { GNOME_APP_UI_SUBTREE, N_("_Dummy"), NULL, dummy_menu },
+static GnomeUIInfo container_toolbar [] = {
+       GNOMEUIINFO_ITEM_STOCK (
+               N_("Open"), N_("Opens an existing workbook"),
+               container_open_cmd, GNOME_STOCK_PIXMAP_OPEN),
+
+       GNOMEUIINFO_SEPARATOR,

        GNOMEUIINFO_END
 };
 
        GNOMEUIINFO_END
 };
 

-//------------------------------------------------------------------------
-// loadFile / displayPage
-//------------------------------------------------------------------------
+extern "C" {
+  static gboolean
+  open_pdf (Container *container, const char *name)
+  {
+    GnomeObjectClient *object;
+    GnomeStream *stream;
+    GNOME_PersistStream persist;
+    Component *comp;
+    CORBA_Environment ev;
+
+    g_return_val_if_fail (container != NULL, FALSE);
+    g_return_val_if_fail (container->view_widget == NULL, FALSE);
+
+    comp = container_activate_component (container, "bonobo-object:application-x-pdf");
+    if (!comp || !(object = comp->server)) {
+      gnome_error_dialog (_("Could not launch bonobo object."));
+      return FALSE;
+    }
+    
+    CORBA_exception_init (&ev);
+    persist = GNOME_Unknown_query_interface (
+      gnome_object_corba_objref (GNOME_OBJECT (object)),
+      "IDL:GNOME/PersistStream:1.0", &ev);
+    
+    if (ev._major != CORBA_NO_EXCEPTION ||
+       persist == CORBA_OBJECT_NIL) {
+      gnome_error_dialog ("Panic: component is well broken.");
+      return FALSE;
+    }
+    
+    stream = gnome_stream_fs_open (name, GNOME_Storage_READ);
+    
+    if (stream == NULL) {
+      char *err = g_strconcat (_("Could not open "), name, NULL);
+      gnome_error_dialog_parented (err, GTK_WINDOW(container->app));
+      g_free (err);
+      return FALSE;
+    }
+    
+    GNOME_PersistStream_load (persist,
+                             (GNOME_Stream) gnome_object_corba_objref (GNOME_OBJECT (stream)), &ev);
+
+    zoom_set (container);
+        
+    GNOME_Unknown_unref (persist, &ev);
+    CORBA_Object_release (persist, &ev);
+    CORBA_exception_free (&ev);
+    return TRUE;
+  }
+  
+  static void
+  set_ok (GtkWidget *widget, gboolean *dialog_result)
+  {
+    *dialog_result = TRUE;
+    gtk_main_quit ();
+  }
+  
+  static guint
+  file_dialog_delete_event (GtkWidget *widget, GdkEventAny *event)
+  {
+    gtk_main_quit ();
+    return TRUE;
+  }
+  
+  static void
+  container_open_cmd (GtkWidget *widget, Container *container)
+  {
+    GtkFileSelection *fsel;
+    gboolean accepted = FALSE;
+    
+    fsel = GTK_FILE_SELECTION (gtk_file_selection_new (_("Load file")));
+    gtk_window_set_modal (GTK_WINDOW (fsel), TRUE);
+    
+    gtk_window_set_transient_for (GTK_WINDOW (fsel),
+                                 GTK_WINDOW (container->app));
+    
+    /* Connect the signals for Ok and Cancel */
+    gtk_signal_connect (GTK_OBJECT (fsel->ok_button), "clicked",
+                       GTK_SIGNAL_FUNC (set_ok), &accepted);
+    gtk_signal_connect (GTK_OBJECT (fsel->cancel_button), "clicked",
+                       GTK_SIGNAL_FUNC (gtk_main_quit), NULL);
+    gtk_window_set_position (GTK_WINDOW (fsel), GTK_WIN_POS_MOUSE);
+    
+    /*
+     * Make sure that we quit the main loop if the window is destroyed 
+     */
+    gtk_signal_connect (GTK_OBJECT (fsel), "delete_event",
+                       GTK_SIGNAL_FUNC (file_dialog_delete_event), NULL);
+    
+    /* Run the dialog */
+    gtk_widget_show (GTK_WIDGET (fsel));
+    gtk_grab_add (GTK_WIDGET (fsel));
+    gtk_main ();
+    
+    if (accepted) {
+      char *name = gtk_file_selection_get_filename (fsel);
+      
+      if (name [strlen (name)-1] != '/') {
+       char *fname = g_strdup (name);
+       if (container->view_widget) /* any sort of MDI sucks :-] */
+         container = container_new (fname);
+       else {
+         if (!open_pdf (container, fname))
+           container_destroy (container);
+       }
+       g_free (fname);
+      } else {
+       GtkWidget *dialog;
+       dialog = gnome_message_box_new ("Can't open a directory",
+                                       GNOME_MESSAGE_BOX_ERROR,
+                                       GNOME_STOCK_BUTTON_OK, NULL);
+       gnome_dialog_set_parent (GNOME_DIALOG (dialog),
+                                GTK_WINDOW (container->app));
+       gnome_dialog_run (GNOME_DIALOG (dialog));
+      }
+    }
+    
+    gtk_widget_destroy (GTK_WIDGET (fsel));
+  }

 
 

-static gint
-doc_config_event (GtkWidget *widget, void *ugly)
-{
-  DOC_ROOT *doc = hack_global;
+  static void 
+  component_destroy (Component *component)
+  {
+    CORBA_Environment ev;
+    g_return_if_fail (component != NULL);

 
 

-  g_return_val_if_fail (doc, FALSE);
-  g_return_val_if_fail (doc->magic == DOC_ROOT_MAGIC, FALSE);
+    CORBA_exception_init (&ev);
+    
+    if (component->server)
+      GNOME_Unknown_unref (
+       gnome_object_corba_objref (GNOME_OBJECT (component->server)), &ev);
+    component->server = NULL;

 
 

-  if (doc->pixmap)
-    gdk_pixmap_unref(doc->pixmap);
+    CORBA_exception_free (&ev);
+  }

 
 

-  doc->pixmap = gdk_pixmap_new(widget->window,
-                               widget->allocation.width,
-                               widget->allocation.height,
-                               -1);
+  static void
+  container_destroy (Container *cont)
+  {
+    containers = g_list_remove (containers, cont);
+    if (cont->app)
+      gtk_widget_destroy (cont->app);
+    
+    if (cont->component)
+      component_destroy (cont->component);
+    cont->component = NULL;
+    
+    cont->app = NULL;
+    
+    g_free (cont);
+    if (!containers)
+      gtk_main_quit ();
+  }
+  
+  static void
+  container_close_cmd (GtkWidget *widget, Container *cont)
+  {
+    container_destroy (cont);
+  }
+  
+  static void
+  container_exit_cmd (void)
+  {
+    while (containers)
+      container_destroy ((Container *)containers->data);
+  }

 
 

-  printf ("Creating pixmap of size %d %d\n",
-         widget->allocation.width, widget->allocation.height);
-  gdk_color_white (gtk_widget_get_default_colormap(), &doc->paper);
-  doc->out    = new GOutputDev (doc->pixmap, doc->paper);

 
 

-  return TRUE;
+static void
+container_about_cmd (GtkWidget *widget, Container *container)
+{
+  GtkWidget *about;
+  int i;
+
+  const gchar *authors[] = {
+    N_("Michael Meeks, GNOME port maintainer."),
+    N_("Miguel de Icaza."),
+    N_("Nat Friedman."),
+    NULL
+  };
+  
+#ifdef ENABLE_NLS
+  for (i = 0; authors[i] != NULL; i++)
+    authors [i] = _(authors [i]);
+#endif
+  
+  about = gnome_about_new (_("GPDF"), VERSION,
+                          _("(C) 1996-1999 Derek B. Noonburg."),
+                          authors, NULL, NULL);
+  
+  gnome_dialog_set_parent (GNOME_DIALOG (about), GTK_WINDOW (container->app));
+  gnome_dialog_set_close (GNOME_DIALOG (about), TRUE);
+  gtk_widget_show (about);

 }
 
 }
 

-static gint
-doc_redraw_event (GtkWidget *widget, void *ugly)
+  /*
+   * Enforces the containers zoom factor.
+   */
+  static void
+  zoom_set (Container *container)
+  {
+    g_return_if_fail (container != NULL);
+    g_return_if_fail (container->component != NULL);
+
+    gnome_view_frame_set_zoom_factor (container->component->view_frame,
+                                     container->zoom);
+  }
+
+  static void
+  zoom_in_cmd (GtkWidget *widget, Container *container)
+  {
+    g_return_if_fail (container != NULL);
+    if (container->zoom < 180.0) {
+      container->zoom *= 1.4;
+      zoom_set (container);
+    }
+  }
+
+  static void
+  zoom_out_cmd (GtkWidget *widget, Container *container)
+  {
+    g_return_if_fail (container != NULL);
+    if (container->zoom > 10.0) {
+      container->zoom /= 1.4;
+      zoom_set (container);
+    }
+  }
+}
+
+static void
+container_set_view (Container *container, Component *component)

 {
 {

-  DOC_ROOT *doc = hack_global;
-
-  g_return_val_if_fail (doc, FALSE);
-  g_return_val_if_fail (doc->magic == DOC_ROOT_MAGIC, FALSE);
-
-  if (doc->out && doc->pdf) {
-    printf ("There are %d pages\n", doc->pdf->getNumPages());
-
-    doc->pdf->displayPage(doc->out, 1, 72, 0, gTrue);
-    gdk_draw_pixmap (widget->window,
-                    widget->style->white_gc,
-                    doc->pixmap,
-                    0, 0,
-                    0, 0,
-                    widget->allocation.width,
-                    widget->allocation.height);
-    
-  } else
-    printf ("Null pointer error %p %p\n", doc->out, doc->pdf);
-  
-  return FALSE;
+       GnomeViewFrame *view_frame;
+       GtkWidget *view_widget;
+
+       /*
+        * Create the remote view and the local ViewFrame.
+        */
+       view_frame = gnome_client_site_new_view (component->client_site);
+       component->view_frame = view_frame;
+
+       /*
+        * Set the GnomeUIHandler for this ViewFrame.  That way, the
+        * embedded component can get access to our UIHandler server
+        * so that it can merge menu and toolbar items when it gets
+        * activated.
+        */
+       gnome_view_frame_set_ui_handler (view_frame, container->uih);
+
+       /*
+        * Embed the view frame into the application.
+        */
+       view_widget = gnome_view_frame_get_wrapper (view_frame);
+       container->view_widget = view_widget;
+       container->component   = component;
+
+       /*
+        * Show the component.
+        */
+       gtk_scrolled_window_add_with_viewport (container->scroll, view_widget);
+
+       /*
+        * Activate it ( get it to merge menus etc. )
+        */
+       gnome_view_frame_view_activate (view_frame);
+
+       gtk_widget_show_all (GTK_WIDGET (container->scroll));

 }
 
 }
 

-static GBool
-loadFile(GString *fileName)
+static GnomeObjectClient *
+container_launch_component (GnomeClientSite *client_site,
+                           GnomeContainer *container,
+                           char *component_goad_id)

 {
 {

-  DOC_ROOT *doc = new DOC_ROOT();
-  char s[20];
-  char *p;
-
-  hack_global = doc;
-
-  doc->magic = DOC_ROOT_MAGIC;
-  // open PDF file
-  doc->pdf = new PDFDoc(fileName);
-  if (!doc->pdf->isOk()) {
-    delete doc->pdf;
-    delete doc;
-    return gFalse;
-  }
+       GnomeObjectClient *object_server;
+
+       /*
+        * Launch the component.
+        */
+       object_server = gnome_object_activate_with_goad_id (
+               NULL, component_goad_id, GOAD_ACTIVATE_SHLIB, NULL);
+
+       if (object_server == NULL)
+               return NULL;
+
+       /*
+        * Bind it to the local ClientSite.  Every embedded component
+        * has a local GnomeClientSite object which serves as a
+        * container-side point of contact for the embeddable.  The
+        * container talks to the embeddable through its ClientSite
+        */
+       if (!gnome_client_site_bind_embeddable (client_site, object_server)) {
+               gnome_object_unref (GNOME_OBJECT (object_server));
+               return NULL;
+       }
+
+       /*
+        * The GnomeContainer object maintains a list of the
+        * ClientSites which it manages.  Here we add the new
+        * ClientSite to that list.
+        */
+       gnome_container_add (container, GNOME_OBJECT (client_site));
+
+       return object_server;
+}
+
+/*
+ * Use query_interface to see if `obj' has `interface'.
+ */
+static gboolean
+gnome_object_has_interface (GnomeObject *obj, char *interface)
+{
+       CORBA_Environment ev;
+       CORBA_Object requested_interface;
+
+       CORBA_exception_init (&ev);

 
 

-  g_assert (doc->pdf->getCatalog());
-
-  doc->toplevel = gnome_app_new ("gpdf", "gpdf");
-  gtk_window_set_policy(GTK_WINDOW(doc->toplevel), 1, 1, 0);
-  gtk_window_set_default_size (GTK_WINDOW(doc->toplevel), 600, 400);
-  doc->table  = GTK_WIDGET (gtk_table_new (0, 0, 0));
-  doc->appbar = GNOME_APPBAR (gnome_appbar_new (FALSE, TRUE,
-                                               GNOME_PREFERENCES_USER));
-  gnome_app_set_statusbar (GNOME_APP (doc->toplevel),
-                          GTK_WIDGET (doc->appbar));
-  gnome_app_set_contents (GNOME_APP (doc->toplevel), doc->table);
-  gnome_app_create_menus_with_data (GNOME_APP (doc->toplevel), main_menu, doc);
-  gnome_app_install_menu_hints(GNOME_APP (doc->toplevel), main_menu);
-
-  doc->pixmap = NULL;
-  doc->area   = GTK_DRAWING_AREA (gtk_drawing_area_new ());
-  gtk_signal_connect (GTK_OBJECT(doc->area),"configure_event",
-                     (GtkSignalFunc) doc_config_event, doc);
-  gtk_signal_connect (GTK_OBJECT (doc->area), "expose_event",
-                     (GtkSignalFunc) doc_redraw_event, doc);
-
-  gtk_table_attach (GTK_TABLE (doc->table), GTK_WIDGET (doc->area),
-                   0, 1, 1, 2,
-                   GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND,
-                   0, 0);
-
-  gtk_widget_show_all (doc->toplevel);
-
-  return gTrue;
+       requested_interface = GNOME_Unknown_query_interface (
+               gnome_object_corba_objref (obj), interface, &ev);
+
+       CORBA_exception_free (&ev);
+
+       if (!CORBA_Object_is_nil(requested_interface, &ev) &&
+           ev._major == CORBA_NO_EXCEPTION)
+       {
+               /* Get rid of the interface we've been passed */
+               CORBA_Object_release (requested_interface, &ev);
+               return TRUE;
+       }
+
+       return FALSE;

 }
 
 }
 

-/*static void displayPage(int page1, int zoom1, int rotate1) {
-  char s[20];
+extern "C" {
+  static Component *
+  container_activate_component (Container *container, char *component_goad_id)
+  {
+    Component *component;
+    GnomeClientSite *client_site;
+    GnomeObjectClient *server;
+    
+    /*
+     * The ClientSite is the container-side point of contact for
+     * the Embeddable.  So there is a one-to-one correspondence
+     * between GnomeClientSites and GnomeEmbeddables.  */
+    client_site = gnome_client_site_new (container->container);
+    
+    /*
+     * A GnomeObjectClient is a simple wrapper for a remote
+     * GnomeObject (a server supporting GNOME::Unknown).
+     */
+    server = container_launch_component (client_site, container->container,
+                                        component_goad_id);
+    if (server == NULL) {
+      char *error_msg;
+      
+      error_msg = g_strdup_printf (_("Could not launch Embeddable %s!"),
+                                  component_goad_id);
+      gnome_warning_dialog (error_msg);
+      g_free (error_msg);
+      
+      return NULL;
+    }
+    
+    /*
+     * Create the internal data structure which we will use to
+     * keep track of this component.
+     */
+    component = g_new0 (Component, 1);
+    component->container = container;
+    component->client_site = client_site;
+    component->server = server;
+    
+    container_set_view (container, component);
+
+    return component;
+  }
+  
+  static void
+  filenames_dropped (GtkWidget * widget,
+                    GdkDragContext   *context,
+                    gint              x,
+                    gint              y,
+                    GtkSelectionData *selection_data,
+                    guint             info,
+                    guint             time,
+                    Container        *container)
+  {
+    GList *names, *tmp_list;
+    
+    names = gnome_uri_list_extract_filenames ((char *)selection_data->data);
+    tmp_list = names;
+    
+    while (tmp_list) {
+      const char *fname = (const char *)tmp_list->data;

 
 

-  // check for document
-  if (!doc)
-    return;
+      if (fname) {
+       if (container->view_widget)
+         container = container_new (fname);
+       else
+         open_pdf (container, fname);
+      }

 
 

-  // busy cursor
-  if (win)
-    win->setBusyCursor(gTrue);
+      tmp_list = g_list_next (tmp_list);
+    }
+  }
+}

 
 

-  // new page/zoom/rotate values
-  page = page1;
-  zoom = zoom1;
-  rotate = rotate1;
+static void
+container_create_menus (Container *container)
+{
+       GnomeUIHandlerMenuItem *menu_list;

 
 

-  // initialize mouse-related stuff
-  linkAction = NULL;
-  win->setDefaultCursor();
-  linkLabel->setText(NULL);
-  selectXMin = selectXMax = 0;
-  selectYMin = selectYMax = 0;
-  lastDragLeft = lastDragTop = gTrue;
+       gnome_ui_handler_create_menubar (container->uih);

 
 

-  // draw the page
-  doc->displayPage(out, page, zoomDPI[zoom - minZoom], rotate, gTrue);
-  layoutCbk(win);
+       /*
+        * Create the basic menus out of UIInfo structures.
+        */
+       menu_list = gnome_ui_handler_menu_parse_uiinfo_list_with_data (container_main_menu, container);
+       gnome_ui_handler_menu_add_list (container->uih, "/", menu_list);
+       gnome_ui_handler_menu_free_list (menu_list);
+}

 
 

-  // update page number display
-  sprintf(s, "%d", page);
-  pageNumText->setText(s);
+static void
+container_create_toolbar (Container *container)
+{
+       GnomeUIHandlerToolbarItem *toolbar;

 
 

-  // back to regular cursor
-  win->setBusyCursor(gFalse);
-  }*/
+       gnome_ui_handler_create_toolbar (container->uih, "pdf");
+       toolbar = gnome_ui_handler_toolbar_parse_uiinfo_list_with_data (container_toolbar, container);
+       gnome_ui_handler_toolbar_add_list (container->uih, "/", toolbar);
+       gnome_ui_handler_toolbar_free_list (toolbar);
+}

 
 

-int
-main (int argc, char *argv [])
+static Container *
+container_new (const char *fname)

 {
 {

-  char **view_files = NULL;
-  int lp;
+       Container *container;
+       static GtkTargetEntry drag_types[] =
+       {
+         { "text/uri-list", 0, 0 },
+       };
+       static gint n_drag_types = sizeof (drag_types) / sizeof (drag_types [0]);
+       
+       container = g_new0 (Container, 1);
+
+       container->app  = gnome_app_new ("pdf-viewer",
+                                        "GNOME PDF viewer");
+       container->zoom = 86.0;
+
+       gtk_drag_dest_set (container->app,
+                          GTK_DEST_DEFAULT_ALL,
+                          drag_types, n_drag_types,
+                          GDK_ACTION_COPY);
+
+       gtk_signal_connect (GTK_OBJECT(container->app),
+                           "drag_data_received",
+                           GTK_SIGNAL_FUNC(filenames_dropped), (gpointer)container);
+
+       gtk_window_set_default_size (GTK_WINDOW (container->app), 600, 600);
+       gtk_window_set_policy (GTK_WINDOW (container->app), TRUE, TRUE, FALSE);
+
+       container->container   = gnome_container_new ();
+       container->view_widget = NULL;
+       container->scroll = GTK_SCROLLED_WINDOW (gtk_scrolled_window_new (NULL, NULL));
+       gtk_scrolled_window_set_policy (container->scroll, GTK_POLICY_AUTOMATIC,
+                                       GTK_POLICY_AUTOMATIC);
+       gnome_app_set_contents (GNOME_APP (container->app), GTK_WIDGET (container->scroll));
+
+       /*
+        * Create the GnomeUIHandler object which will be used to
+        * create the container's menus and toolbars.  The UIHandler
+        * also creates a CORBA server which embedded components use
+        * to do menu/toolbar merging.
+        */
+       container->uih = gnome_ui_handler_new ();
+       gnome_ui_handler_set_app (container->uih, GNOME_APP (container->app));
+
+       container_create_menus   (container);
+       container_create_toolbar (container);
+
+       gtk_widget_show_all (container->app);
+
+       if (fname)
+         if (!open_pdf (container, fname)) {
+           container_destroy (container);
+           return NULL;
+         }
+
+       containers = g_list_append (containers, container);
+
+       gtk_widget_show_all (container->app);
+
+       return container;
+}

 
 

-  gnome_init_with_popt_table (
-    "gpdf", "0.1", argc, argv,
-    gpdf_popt_options, 0, &ctx);
+int
+main (int argc, char **argv)
+{
+  CORBA_Environment ev;
+  CORBA_ORB         orb;
+  char            **view_files = NULL;
+  gboolean          loaded;
+  int               i;

   
   

-  initParams (xpdfConfigFile); /* Init font path */
+  CORBA_exception_init (&ev);
+  
+  gnome_CORBA_init_with_popt_table ("PDFViewer", "0.0.1",
+                                   &argc, argv,
+                                   gpdf_popt_options, 0, &ctx,
+                                   GNORBA_INIT_SERVER_FUNC, &ev);
+
+  CORBA_exception_free (&ev);
+
+  orb = gnome_CORBA_ORB ();
+
+  if (bonobo_init (orb, NULL, NULL) == FALSE)
+    g_error (_("Could not initialize Bonobo!\n"));
+  bonobo_activate ();

 
   view_files = poptGetArgs (ctx);
 
   view_files = poptGetArgs (ctx);

+

   /* Load files */
   /* Load files */

+  i = 0;
+  loaded = FALSE;

   if (view_files) {
   if (view_files) {

-    for (lp=0;view_files[lp];lp++) {
-      GString *name = new GString (view_files[lp]);
-      if (!name || !loadFile(name))
-       printf ("Error loading '%s'\n", view_files[lp]);
-    }
-  } else {
-    printf ("Need filenames...\n");
-    exit (0);
+    for (i = 0; view_files[i]; i++)
+      if (container_new (view_files[i]))
+       loaded = TRUE;

   }
   }

-
+  if ((i == 0) || !loaded)
+    container_new (NULL);
+  

   poptFreeContext (ctx);
 
   gtk_main ();
   poptFreeContext (ctx);
 
   gtk_main ();

-
-  freeParams();
-
-  /* Destroy files */
+       
+  return 0;

 }
 }