X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=pdf%2Fxpdf%2Fgpdf.cc;h=69c1ab2294951dec91f31e70f11cf0bba324d66d;hb=d8e4dea3c03631ea1b8302d271023afdb3833854;hp=da85e0fc4616514c73b426f4bf28baa05122c799;hpb=bd7dce23fec36adeb1713c164d594bbc0436b346;p=evince.git diff --git a/pdf/xpdf/gpdf.cc b/pdf/xpdf/gpdf.cc index da85e0fc..69c1ab22 100644 --- 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 + * + */ #include #include #include #include +extern "C" { #define GString G_String #include -#include +#include +#include +#include +#include #undef GString +} +#include +#include #include "gtypes.h" #include "GString.h" #include "parseargs.h" @@ -37,30 +41,8 @@ #include "Error.h" #include "config.h" -GBool printCommands = gFalse; -gint gpdf_debug=1; poptContext ctx; - -#define DEV_DEBUG 0 - -#define DOC_ROOT_TAG "xpdf_doc_root" -struct DOC_ROOT { - GString *title; - PDFDoc *pdf; - Catalog *cat; - GtkDrawingArea *area; - GtkPixmap *pixmap; - OutputDev *out; - GdkColor paper; - GtkScrolledWindow *scroll; - GtkWidget *mainframe; - GladeXML *gui; - - double zoom; - gint page; -}; - -GList *documents = NULL; +gint gpdf_debug=0; const struct poptOption gpdf_popt_options [] = { { "debug", '\0', POPT_ARG_INT, &gpdf_debug, 0, @@ -68,322 +50,552 @@ const struct poptOption gpdf_popt_options [] = { { NULL, '\0', 0, NULL, 0 } }; -extern "C" { - static void connect_signals (DOC_ROOT *doc); -} - -//------------------------------------------------------------------------ -// loadFile / displayPage -//------------------------------------------------------------------------ - -static GtkPixmap * -setup_pixmap (DOC_ROOT *doc, GdkWindow *window) -{ - GdkGCValues gcValues; - GdkGC *strokeGC; - PDFDoc *pdf = doc->pdf; - int w, h; - GdkPixmap *pixmap = NULL; - - w = (int)((pdf->getPageWidth (doc->page) * doc->zoom) / 72.0); - h = (int)((pdf->getPageHeight (doc->page) * doc->zoom) / 72.0); - - pixmap = gdk_pixmap_new (window, w, h, -1); - - gdk_color_white (gtk_widget_get_default_colormap(), &doc->paper); - doc->out = new GOutputDev (pixmap, doc->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)); +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; - gdk_draw_rectangle (pixmap, strokeGC, - TRUE, 0, 0, - w, h); - - return GTK_PIXMAP (gtk_pixmap_new (pixmap, NULL)); -} - -static void -render_page (DOC_ROOT *doc) -{ - doc->pdf->displayPage(doc->out, doc->page, doc->zoom, 0, gTrue); -} - -/*static void displayPage(int page1, int zoom1, int rotate1) { - char s[20]; - - // check for document - if (!doc) - return; - - // busy cursor - if (win) - win->setBusyCursor(gTrue); - - // new page/zoom/rotate values - page = page1; - zoom = zoom1; - rotate = rotate1; - - // initialize mouse-related stuff - linkAction = NULL; - win->setDefaultCursor(); - linkLabel->setText(NULL); - selectXMin = selectXMax = 0; - selectYMin = selectYMax = 0; - lastDragLeft = lastDragTop = gTrue; - - // draw the page - doc->displayPage(out, page, zoomDPI[zoom - minZoom], rotate, gTrue); - layoutCbk(win); + GnomeViewFrame *active_view_frame; + + GtkWidget *app; + GtkScrolledWindow *scroll; + GtkWidget *view_widget; + Component *component; +}; - // update page number display - sprintf(s, "%d", page); - pageNumText->setText(s); +struct _Component { + Container *container; - // back to regular cursor - win->setBusyCursor(gFalse); - }*/ + GnomeClientSite *client_site; + GnomeViewFrame *view_frame; + GnomeObjectClient *server; +}; -static PDFDoc * -getPDF (GString *fname) -{ - PDFDoc *pdf; - pdf = new PDFDoc(fname); - if (!pdf->isOk()) { - delete pdf; - return NULL; - } - g_return_val_if_fail (pdf->getCatalog(), NULL); - return pdf; +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 DOC_ROOT * -doc_root_new (GString *fileName) -{ - DOC_ROOT *doc = new DOC_ROOT(); - GtkVBox *pane; - - // open PDF file - doc->pdf = getPDF (fileName); - if (!doc->pdf) { - delete doc; - return NULL; - } - - doc->gui = glade_xml_new (GPDF_GLADE_DIR "/gpdf.glade", NULL); - if (!doc->gui || - !(doc->mainframe = glade_xml_get_widget (doc->gui, "gpdf")) || - !(pane = GTK_VBOX (glade_xml_get_widget (doc->gui, "pane")))) { - printf ("Couldn't find " GPDF_GLADE_DIR "/gpdf.glade\n"); - delete doc->pdf; - delete doc; - return NULL; - } - - doc->zoom = 86.0; - doc->page = 1; - - connect_signals (doc); - - gtk_object_set_data (GTK_OBJECT (doc->mainframe), DOC_ROOT_TAG, doc); - - doc->pixmap = setup_pixmap (doc, gtk_widget_get_parent_window (GTK_WIDGET (pane))); - - 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); - 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); +/* + * 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 +}; - gtk_widget_show_all (doc->mainframe); +static GnomeUIInfo container_help_menu [] = { + GNOMEUIINFO_MENU_ABOUT_ITEM(container_about_cmd, NULL), + GNOMEUIINFO_END +}; - documents = g_list_append (documents, doc); +static GnomeUIInfo container_main_menu [] = { + GNOMEUIINFO_MENU_FILE_TREE (container_file_menu), + GNOMEUIINFO_MENU_HELP_TREE (container_help_menu), + GNOMEUIINFO_END +}; - return doc; -} +static GnomeUIInfo container_toolbar [] = { + GNOMEUIINFO_ITEM_STOCK ( + N_("Open"), N_("Opens an existing workbook"), + container_open_cmd, GNOME_STOCK_PIXMAP_OPEN), -static void -doc_root_destroy (DOC_ROOT *doc) -{ - gtk_widget_destroy (doc->mainframe); - gtk_object_destroy (GTK_OBJECT (doc->gui)); - - documents = g_list_remove (documents, doc); - if (g_list_length (documents) == 0) - gtk_main_quit (); - delete (doc); -} - -//------------------------------------------------------------------------ -// Signal handlers -//------------------------------------------------------------------------ + GNOMEUIINFO_SEPARATOR, + GNOMEUIINFO_END +}; extern "C" { - void - do_close (GtkWidget *menuitem, DOC_ROOT *doc) + static gboolean + open_pdf (Container *container, const char *name) { - doc_root_destroy (doc); - } + 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); - void - do_exit (GtkWidget *menuitem, DOC_ROOT *doc) - { - GList *l; - while ((l=documents)) - doc_root_destroy ((DOC_ROOT *)l->data); - } + GNOME_Unknown_unref (persist, &ev); + CORBA_Object_release (persist, &ev); + CORBA_exception_free (&ev); +/* gnome_view_frame_view_do_verb (comp->view_frame, "ZoomFit"); */ + return TRUE; + } + static void - do_about_box (GtkWidget *w, DOC_ROOT *doc) + set_ok (GtkWidget *widget, gboolean *dialog_result) { - GladeXML *gui = glade_xml_new (GPDF_GLADE_DIR "/about.glade", NULL); - g_return_if_fail (gui); - GtkWidget *wi = glade_xml_get_widget (gui, "about_box"); - g_return_if_fail (wi); - gtk_widget_show (wi); - gtk_object_destroy (GTK_OBJECT (gui)); + *dialog_result = TRUE; + gtk_main_quit (); } - - static void - do_forward_button (GtkWidget *w, DOC_ROOT *doc) + + static guint + file_dialog_delete_event (GtkWidget *widget, GdkEventAny *event) { - if (doc->page < doc->pdf->getNumPages()) { - doc->page++; - render_page (doc); - gtk_widget_queue_draw (GTK_WIDGET (doc->scroll)); - } + gtk_main_quit (); + return TRUE; } - + static void - do_back_button (GtkWidget *w, DOC_ROOT *doc) + container_open_cmd (GtkWidget *widget, Container *container) { - if (doc->page > 1) { - doc->page--; - render_page (doc); - gtk_widget_queue_draw (GTK_WIDGET (doc->pixmap)); + 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 void - do_first_button (GtkWidget *w, DOC_ROOT *doc) + static void + component_destroy (Component *component) { - if (doc->page != 1) { - doc->page = 1; - render_page (doc); - gtk_widget_queue_draw (GTK_WIDGET (doc->pixmap)); - } + CORBA_Environment ev; + g_return_if_fail (component != NULL); + + CORBA_exception_init (&ev); + + if (component->server) + GNOME_Unknown_unref ( + gnome_object_corba_objref (GNOME_OBJECT (component->server)), &ev); + component->server = NULL; + + CORBA_exception_free (&ev); } static void - do_last_button (GtkWidget *w, DOC_ROOT *doc) + container_destroy (Container *cont) { - if (doc->page != doc->pdf->getNumPages()) { - doc->page = doc->pdf->getNumPages(); - render_page (doc); - gtk_widget_queue_draw (GTK_WIDGET (doc->pixmap)); - } + 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 - do_larger_button (GtkWidget *w, DOC_ROOT *doc) + container_close_cmd (GtkWidget *widget, Container *cont) { - if (doc->zoom < 200) { - doc->zoom *= 1.2; - render_page (doc); - gtk_widget_queue_draw (GTK_WIDGET (doc->pixmap)); - } + container_destroy (cont); } - + static void - do_smaller_button (GtkWidget *w, DOC_ROOT *doc) + container_exit_cmd (void) { - if (doc->zoom < 200) { - doc->zoom /= 1.2; - render_page (doc); - gtk_widget_queue_draw (GTK_WIDGET (doc->pixmap)); - } + while (containers) + container_destroy ((Container *)containers->data); } + + +static void +container_about_cmd (GtkWidget *widget, Container *container) +{ + GtkWidget *about; + int i; + + const gchar *authors[] = { + N_("Derek B. Noonburg, main author"), + N_("Michael Meeks, GNOME port maintainer."), + N_("Miguel de Icaza."), + N_("Nat Friedman."), + NULL + }; - static void - simple_menu_connect (DOC_ROOT *doc, const char *name, GtkSignalFunc func) +#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 void +container_set_view (Container *container, Component *component) +{ + 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 GnomeObjectClient * +container_launch_component (GnomeClientSite *client_site, + GnomeContainer *container, + char *component_goad_id) +{ + 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; +} + +extern "C" { + static Component * + container_activate_component (Container *container, char *component_goad_id) { - GtkWidget *w; - w = glade_xml_get_widget (doc->gui, name); - g_return_if_fail (w); - gtk_signal_connect (GTK_OBJECT (w), "activate", func, doc); + 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 - simple_button_connect (DOC_ROOT *doc, const char *name, GtkSignalFunc func) + filenames_dropped (GtkWidget * widget, + GdkDragContext *context, + gint x, + gint y, + GtkSelectionData *selection_data, + guint info, + guint time, + Container *container) { - GtkWidget *w; - w = glade_xml_get_widget (doc->gui, name); - g_return_if_fail (w); - gtk_signal_connect (GTK_OBJECT (w), "clicked", func, doc); + 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; + + if (fname) { + if (container->view_widget) + container = container_new (fname); + else + open_pdf (container, fname); + } + + tmp_list = g_list_next (tmp_list); + } } +} - static void - connect_signals (DOC_ROOT *doc) - { - GtkWidget *w; - - simple_menu_connect (doc, "about_menu", GTK_SIGNAL_FUNC (do_about_box)); - simple_menu_connect (doc, "close_menu", GTK_SIGNAL_FUNC (do_close)); - simple_menu_connect (doc, "exit_menu", GTK_SIGNAL_FUNC (do_exit)); - - simple_button_connect (doc, "forward", GTK_SIGNAL_FUNC (do_forward_button)); - simple_button_connect (doc, "back", GTK_SIGNAL_FUNC (do_back_button)); - simple_button_connect (doc, "first", GTK_SIGNAL_FUNC (do_first_button)); - simple_button_connect (doc, "last", GTK_SIGNAL_FUNC (do_last_button)); -/* simple_button_connect (doc, "larger", GTK_SIGNAL_FUNC (do_larger_button)); need to resize the gtkpixmap... - simple_button_connect (doc, "smaller", GTK_SIGNAL_FUNC (do_smaller_button)); but bed first. */ - - gtk_signal_connect (GTK_OBJECT (doc->mainframe), "destroy", - GTK_SIGNAL_FUNC (do_close), doc); - } +static void +container_create_menus (Container *container) +{ + GnomeUIHandlerMenuItem *menu_list; + + gnome_ui_handler_create_menubar (container->uih); + + /* + * 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); +} + +static void +container_create_toolbar (Container *container) +{ + GnomeUIHandlerToolbarItem *toolbar; + + 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); +} + +static Container * +container_new (const char *fname) +{ + 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"); + + 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; } int -main (int argc, char *argv []) +main (int argc, char **argv) { - char **view_files = NULL; - int i; + CORBA_Environment ev; + CORBA_ORB orb; + char **view_files = NULL; + gboolean loaded; + int i; - gnome_init_with_popt_table ( - "gpdf", "0.1", argc, argv, - gpdf_popt_options, 0, &ctx); - - errorInit(); + CORBA_exception_init (&ev); - initParams (xpdfConfigFile); /* Init font path */ + 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 (); - glade_gnome_init (); + if (bonobo_init (orb, NULL, NULL) == FALSE) + g_error (_("Could not initialize Bonobo!\n")); + bonobo_activate (); view_files = poptGetArgs (ctx); + /* Load files */ + i = 0; + loaded = FALSE; if (view_files) { - for (i = 0; view_files[i]; i++) { - GString *name = new GString (view_files[i]); - if (!name || !doc_root_new (name)) - printf ("Error loading '%s'\n", view_files[i]); - } - } 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 (); - - freeParams(); - - /* Destroy files */ + + return 0; }