Update to trunk and some fixes

(bzr r14865.1.14)

1 files changed, 269 insertions, 358 deletions

diff --git a/src/inkview.cpp b/src/inkview.cpp
index db4b1aeb0..7acaa83dd 100644
--- a/src/inkview.cpp
+++ b/src/inkview.cpp
@@ -34,14 +34,16 @@
 #include <sys/stat.h>
 #include <locale.h>
 
-#include <gtkmm/main.h>
-#include <glib.h>
+#include <glibmm/optionentry.h>
 
-// #include <stropts.h>
+#include <gtkmm/applicationwindow.h>
+#include <gtkmm/button.h>
+#include <gtkmm/buttonbox.h>
+#include <gtkmm/image.h>
+#include <gtkmm/main.h>
 
 #include <libxml/tree.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
 
 #include "inkgc/gc-core.h"
 #include "preferences.h"
@@ -52,51 +54,97 @@
 #include "svg-view-widget.h"
 #include "util/units.h"
 
-#ifdef WITH_INKJAR
-#include "io/inkjar.h"
-#endif
-
 #include "inkscape.h"
 
-#include <iostream>
-
 #ifndef HAVE_BIND_TEXTDOMAIN_CODESET
 #define bind_textdomain_codeset(p,c)
 #endif
 
 #include "ui/icon-names.h"
 
-extern char *optarg;
-extern int  optind, opterr;
-
-struct SPSlideShow {
-    char **slides;
-    int size;
-    int length;
-    int current;
-    SPDocument *doc;
-    GtkWidget *view;
-    GtkWidget *window;
-    bool fullscreen;
-    int timer;
+class SPSlideShow;
+
+static int sp_svgview_main_delete (GtkWidget *widget,
+                                   GdkEvent *event,
+                                   struct SPSlideShow *ss);
+
+static int sp_svgview_main_key_press (GtkWidget *widget, 
+                                      GdkEventKey *event,
+                                      struct SPSlideShow *ss);
+
+/**
+ * The main application window for the slideshow
+ */
+class SPSlideShow : public Gtk::ApplicationWindow {
+private:
+    std::vector<Glib::ustring>  _slides;  ///< List of filenames for each slide
+    int                         _current; ///< Index of the currently displayed slide
+    SPDocument                 *_doc;     ///< The currently displayed slide
+    int                         _timer;
+    GtkWidget                  *_view;
+    Gtk::Window                *_ctrlwin; ///< Window containing slideshow control buttons
+
+public:
+    /// Current state of application (full-screen or windowed)
+    bool is_fullscreen;
+
+    /// Update the window title with current document name
+    void update_title()
+    {
+        set_title(_doc->getName());
+    }
+
+    SPSlideShow(std::vector<Glib::ustring> const &slides);
+    
+    void set_timer(int timer) {_timer = timer;}
+    void control_show();
+    void show_next();
+    void show_prev();
+    void goto_first();
+    void goto_last();
+
+    static int ctrlwin_delete (GtkWidget *widget,
+                               GdkEvent  *event,
+                               void      *data);
+protected:
+    void waiting_cursor();
+    void normal_cursor();
+    void set_document(SPDocument *doc,
+                      int         current);
 };
 
-static GtkWidget *sp_svgview_control_show (struct SPSlideShow *ss);
-static void sp_svgview_show_next (struct SPSlideShow *ss);
-static void sp_svgview_show_prev (struct SPSlideShow *ss);
-static void sp_svgview_goto_first (struct SPSlideShow *ss);
-static void sp_svgview_goto_last (struct SPSlideShow *ss);
-
-static int sp_svgview_show_next_cb (GtkWidget *widget, void *data);
-static int sp_svgview_show_prev_cb (GtkWidget *widget, void *data);
-static int sp_svgview_goto_first_cb (GtkWidget *widget, void *data);
-static int sp_svgview_goto_last_cb (GtkWidget *widget, void *data);
-#ifdef WITH_INKJAR
-static bool is_jar(char const *filename);
-#endif
+SPSlideShow::SPSlideShow(std::vector<Glib::ustring> const &slides)
+    :
+        _slides(slides),
+        _current(0),
+        _doc(SPDocument::createNewDoc(_slides[0].c_str(), true, false)),
+        _view(NULL),
+        is_fullscreen(false),
+        _timer(0),
+        _ctrlwin(NULL)
+{
+    update_title();
+
+    auto default_screen = Gdk::Screen::get_default();
+
+    set_default_size(MIN ((int)_doc->getWidth().value("px"),  default_screen->get_width()  - 64),
+            MIN ((int)_doc->getHeight().value("px"), default_screen->get_height() - 64));
+
+    g_signal_connect (G_OBJECT (gobj()), "delete_event",    (GCallback) sp_svgview_main_delete,    this);
+    g_signal_connect (G_OBJECT (gobj()), "key_press_event", (GCallback) sp_svgview_main_key_press, this);
+
+    _doc->ensureUpToDate();
+    _view = sp_svg_view_widget_new (_doc);
+    _doc->doUnref ();
+    SP_SVG_VIEW_WIDGET(_view)->setResize( false, _doc->getWidth().value("px"), _doc->getHeight().value("px") );
+    gtk_widget_show (_view);
+    add(*Glib::wrap(_view));
+
+    show();
+}
+
 static void usage();
 
-static GtkWidget *ctrlwin = NULL;
 
 // Dummy functions to keep linker happy
 int sp_main_gui (int, char const**) { return 0; }
@@ -106,7 +154,7 @@ static int sp_svgview_main_delete (GtkWidget */*widget*/,
                                    GdkEvent */*event*/,
                                    struct SPSlideShow */*ss*/)
 {
-    gtk_main_quit ();
+    Gtk::Main::quit();
     return FALSE;
 }
 
@@ -117,85 +165,96 @@ static int sp_svgview_main_key_press (GtkWidget */*widget*/,
     switch (event->keyval) {
         case GDK_KEY_Up:
         case GDK_KEY_Home:
-            sp_svgview_goto_first(ss);
+            ss->goto_first();
             break;
         case GDK_KEY_Down:
         case GDK_KEY_End:
-            sp_svgview_goto_last(ss);
+            ss->goto_last();
             break;
         case GDK_KEY_F11:
-            if (ss->fullscreen) {
-                gtk_window_unfullscreen (GTK_WINDOW(ss->window));
-                ss->fullscreen = false;
+            if (ss->is_fullscreen) {
+                ss->unfullscreen();
+                ss->is_fullscreen = false;
             } else {
-                gtk_window_fullscreen (GTK_WINDOW(ss->window));
-                ss->fullscreen = true;
+                ss->fullscreen();
+                ss->is_fullscreen = true;
             }
             break;
         case GDK_KEY_Return:
-            sp_svgview_control_show (ss);
+            ss->control_show();
         break;
         case GDK_KEY_KP_Page_Down:
         case GDK_KEY_Page_Down:
         case GDK_KEY_Right:
         case GDK_KEY_space:
-            sp_svgview_show_next (ss);
+            ss->show_next();
         break;
         case GDK_KEY_KP_Page_Up:
         case GDK_KEY_Page_Up:
         case GDK_KEY_Left:
         case GDK_KEY_BackSpace:
-            sp_svgview_show_prev (ss);
+            ss->show_prev();
             break;
         case GDK_KEY_Escape:
         case GDK_KEY_q:
         case GDK_KEY_Q:
-            gtk_main_quit();
+            Gtk::Main::quit();
             break;
         default:
             break;
     }
-    gtk_window_set_title(GTK_WINDOW(ss->window), ss->doc->getName());
+
+    ss->update_title();
     return TRUE;
 }
 
-int main (int argc, const char **argv)
+/// List of all input filenames
+static Glib::OptionGroup::vecustrings filenames;
+
+/// Input timer option
+static int timer = 0;
+
+/**
+ * \brief Set of command-line options for Inkview
+ */
+class InkviewOptionsGroup : public Glib::OptionGroup
 {
-    if (argc == 1) {
-        usage();
+public:
+    InkviewOptionsGroup()
+        :
+            Glib::OptionGroup(_("Inkscape Options"),
+                              _("Default program options")),
+            _entry_timer(),
+            _entry_args()
+    {
+        // Entry for the "timer" option
+        _entry_timer.set_short_name('t');
+        _entry_timer.set_long_name("timer");
+        _entry_timer.set_arg_description(_("NUM"));
+        add_entry(_entry_timer, timer);
+
+        // Entry for the remaining non-option arguments
+        _entry_args.set_short_name('\0');
+        _entry_args.set_long_name(G_OPTION_REMAINING);
+        _entry_args.set_arg_description(_("FILES..."));
+
+        add_entry(_entry_args, filenames);
     }
 
+private:
+    Glib::OptionEntry _entry_timer;
+    Glib::OptionEntry _entry_args;
+};
+
+int main (int argc, char **argv)
+{
+    Glib::OptionContext opt(_("Open SVG files"));
+    InkviewOptionsGroup grp;
+    opt.set_main_group(grp);
+    
     // Prevents errors like "Unable to wrap GdkPixbuf..." (in nr-filter-image.cpp for example)
     Gtk::Main::init_gtkmm_internals();
-
-    Gtk::Main main_instance (&argc, const_cast<char ***>(&argv));
-
-    struct SPSlideShow ss;
-
-    int num_parsed_options = 0;
-
-    // the list of arguments is in the net line
-    for (int i = 1; i < argc; i++) {
-        if ((argv[i][0] == '-')) {
-            if (!strcmp(argv[i], "--")) {
-                break;
-            }
-            else if ((!strcmp(argv[i], "-t"))) {
-                if (i + 1 >= argc) {
-                    usage();
-                }
-                ss.timer = atoi(argv[i+1]);
-                num_parsed_options = i+1;
-                i++;
-            }
-            else {
-                usage();
-            }
-        }
-    }
-
-    GtkWidget *w;
-    int i;
+    Gtk::Main main_instance (argc, argv, opt);
 
     bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
     bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@@ -206,8 +265,6 @@ int main (int argc, const char **argv)
     Inkscape::GC::init();
     Inkscape::Preferences::get(); // ensure preferences are initialized
 
-    gtk_init (&argc, (char ***) &argv);
-
 #ifdef lalaWITH_MODULES
     g_warning ("Have to autoinit modules (lauris)");
     sp_modulesys_init();
@@ -218,349 +275,203 @@ int main (int argc, const char **argv)
 
     setlocale (LC_NUMERIC, "C");
 
-    ss.size = 32;
-    ss.length = 0;
-    ss.current = 0;
-    ss.slides = g_new (char *, ss.size);
-    ss.current = 0;
-    ss.doc = NULL;
-    ss.view = NULL;
-    ss.fullscreen = false;
-
     Inkscape::Application::create(argv[0], true);
-    //Inkscape::Application &inkscape = Inkscape::Application::instance();
 
-    // starting at where the commandline options stopped parsing because
-    // we want all the files to be in the list
-    for (i = num_parsed_options + 1 ; i < argc; i++) {
-        struct stat st;
-        if (stat (argv[i], &st)
-              || !S_ISREG (st.st_mode)
-              || (st.st_size < 64)) {
-            fprintf(stderr, "could not open file %s\n", argv[i]);
-        } else {
+    if(filenames.empty())
+    {
+        std::cout << opt.get_help();
+        exit(EXIT_FAILURE);
+    }
 
-    #ifdef WITH_INKJAR
-            if (is_jar(argv[i])) {
-                Inkjar::JarFileReader jar_file_reader(argv[i]);
-                for (;;) {
-                    GByteArray *gba = jar_file_reader.get_next_file();
-                    if (gba == NULL) {
-                        char *c_ptr;
-                        gchar *last_filename = jar_file_reader.get_last_filename();
-                        if (last_filename == NULL)
-                            break;
-                        if ((c_ptr = std::strrchr(last_filename, '/')) != NULL) {
-                            if (*(++c_ptr) == '\0') {
-                                g_free(last_filename);
-                                continue;
-                            }
-                        }
-                    } else if (gba->len > 0) {
-                        //::write(1, gba->data, gba->len);
-                        /* Append to list */
-                        if (ss.length >= ss.size) {
-                            /* Expand */
-                            ss.size <<= 1;
-                            ss.slides = g_renew (char *, ss.slides, ss.size);
-                        }
-
-                        ss.doc = SPDocument::createNewDocFromMem ((const gchar *)gba->data,
-                                           gba->len,
-                                           TRUE);
-                        gchar *last_filename = jar_file_reader.get_last_filename();
-                        if (ss.doc) {
-                            ss.slides[ss.length++] = strdup (last_filename);
-                            (ss.doc)->setUri (last_filename);
-                        }
-                        g_byte_array_free(gba, TRUE);
-                        g_free(last_filename);
-                    } else {
-                        break;
-                    }
-                }
-            } else {
-    #endif /* WITH_INKJAR */
-            /* Append to list */
-            if (ss.length >= ss.size) {
-                /* Expand */
-                ss.size <<= 1;
-                ss.slides = g_renew (char *, ss.slides, ss.size);
-            }
+    std::vector<Glib::ustring> valid_files;
 
-            ss.slides[ss.length++] = strdup (argv[i]);
+    for(auto file : filenames)
+    {
+        struct stat st;
+        if (stat(file.c_str(), &st)
+                || !S_ISREG (st.st_mode)
+                || (st.st_size < 64)) {
+            std::cerr << "could not open file " << file << std::endl;
+        } else {
+            auto doc = SPDocument::createNewDoc(file.c_str(), TRUE, false);
 
-            if (!ss.doc) {
-                ss.doc = SPDocument::createNewDoc (ss.slides[ss.current], TRUE, false);
-                if (!ss.doc) {
-                    ++ss.current;
-                }
-            }
-    #ifdef WITH_INKJAR
+            if(doc)
+            {
+                /* Append to list */
+                valid_files.push_back(file);
             }
-    #endif
         }
     }
 
-    if(!ss.doc) {
+    if(valid_files.empty()) {
        return 1; /* none of the slides loadable */
     }
     
-    w = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-    gtk_window_set_title( GTK_WINDOW(w), ss.doc->getName() );
-    gtk_window_set_default_size (GTK_WINDOW (w),
-                MIN ((int)(ss.doc)->getWidth().value("px"), (int)gdk_screen_width() - 64),
-                MIN ((int)(ss.doc)->getHeight().value("px"), (int)gdk_screen_height() - 64));
-    ss.window = w;
-
-    g_signal_connect (G_OBJECT (w), "delete_event", (GCallback) sp_svgview_main_delete, &ss);
-    g_signal_connect (G_OBJECT (w), "key_press_event", (GCallback) sp_svgview_main_key_press, &ss);
-
-    (ss.doc)->ensureUpToDate();
-    ss.view = sp_svg_view_widget_new (ss.doc);
-    (ss.doc)->doUnref ();
-    SP_SVG_VIEW_WIDGET(ss.view)->setResize( false, ss.doc->getWidth().value("px"), ss.doc->getHeight().value("px") );
-    gtk_widget_show (ss.view);
-    gtk_container_add (GTK_CONTAINER (w), ss.view);
-
-    gtk_widget_show (w);
-
-    gtk_main ();
+    SPSlideShow ss(valid_files);
+    ss.set_timer(timer);
+    main_instance.run();
 
     return 0;
 }
 
-static int sp_svgview_ctrlwin_delete (GtkWidget */*widget*/,
-                                      GdkEvent */*event*/,
-                                      void */*data*/)
+int SPSlideShow::ctrlwin_delete (GtkWidget */*widget*/,
+                                 GdkEvent  */*event*/,
+                                 void      *data)
 {
-    ctrlwin = NULL;
+    auto ss = reinterpret_cast<SPSlideShow *>(data);
+    if(ss->_ctrlwin) delete ss->_ctrlwin;
+
+    ss->_ctrlwin = NULL;
     return FALSE;
 }
 
-static GtkWidget* sp_svgview_control_show(struct SPSlideShow *ss)
+/**
+ * @brief Show the control buttons (next, previous etc) for the application
+ */
+void SPSlideShow::control_show()
 {
-    if (!ctrlwin) {
-        ctrlwin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-        gtk_window_set_resizable(GTK_WINDOW(ctrlwin), FALSE);
-        gtk_window_set_transient_for(GTK_WINDOW(ctrlwin), GTK_WINDOW(ss->window));
-        g_signal_connect(G_OBJECT (ctrlwin), "key_press_event", (GCallback) sp_svgview_main_key_press, ss);
-        g_signal_connect(G_OBJECT (ctrlwin), "delete_event", (GCallback) sp_svgview_ctrlwin_delete, NULL);
-
-#if GTK_CHECK_VERSION(3,0,0)
-        GtkWidget *t = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
-#else
-        GtkWidget *t = gtk_hbutton_box_new();
-#endif
-
-        gtk_container_add(GTK_CONTAINER(ctrlwin), t);
-
-#if GTK_CHECK_VERSION(3,10,0)
-        GtkWidget *b = gtk_button_new_from_icon_name(INKSCAPE_ICON("go-first"), GTK_ICON_SIZE_BUTTON);
-#else
-        GtkWidget *b   = gtk_button_new();
-        GtkWidget *img = gtk_image_new_from_icon_name(INKSCAPE_ICON("go-first"), GTK_ICON_SIZE_BUTTON);
-        gtk_button_set_image(GTK_BUTTON(b), img);
-#endif
-        gtk_container_add(GTK_CONTAINER(t), b);
-
-        g_signal_connect(G_OBJECT(b), "clicked", (GCallback) sp_svgview_goto_first_cb, ss);
-#if GTK_CHECK_VERSION(3,10,0)
-        b = gtk_button_new_from_icon_name(INKSCAPE_ICON("go-previous"), GTK_ICON_SIZE_BUTTON);
-#else
-        b = gtk_button_new();
-        img = gtk_image_new_from_icon_name(INKSCAPE_ICON("go-previous"), GTK_ICON_SIZE_BUTTON);
-        gtk_button_set_image(GTK_BUTTON(b), img);
-#endif
-        gtk_container_add(GTK_CONTAINER(t), b);
-
-        g_signal_connect(G_OBJECT(b), "clicked", (GCallback) sp_svgview_show_prev_cb, ss);
-#if GTK_CHECK_VERSION(3,10,0)
-        b = gtk_button_new_from_icon_name(INKSCAPE_ICON("go-next"), GTK_ICON_SIZE_BUTTON);
-#else
-        b = gtk_button_new();
-        img = gtk_image_new_from_icon_name(INKSCAPE_ICON("go-next"), GTK_ICON_SIZE_BUTTON);
-        gtk_button_set_image(GTK_BUTTON(b), img);
-#endif
-        gtk_container_add(GTK_CONTAINER(t), b);
-
-        g_signal_connect(G_OBJECT(b), "clicked", (GCallback) sp_svgview_show_next_cb, ss);
-#if GTK_CHECK_VERSION(3,10,0)
-        b = gtk_button_new_from_icon_name(INKSCAPE_ICON("go-last"), GTK_ICON_SIZE_BUTTON);
-#else
-        b = gtk_button_new();
-        img = gtk_image_new_from_icon_name(INKSCAPE_ICON("go-last"), GTK_ICON_SIZE_BUTTON);
-        gtk_button_set_image(GTK_BUTTON(b), img);
-#endif
-        gtk_container_add(GTK_CONTAINER(t), b);
-        g_signal_connect(G_OBJECT(b), "clicked", (GCallback) sp_svgview_goto_last_cb, ss);
-        gtk_widget_show_all(ctrlwin);
+    if (!_ctrlwin) {
+        _ctrlwin = new Gtk::Window();
+        _ctrlwin->set_resizable(false);
+        _ctrlwin->set_transient_for(*this);
+        g_signal_connect(G_OBJECT (_ctrlwin->gobj()), "key_press_event", (GCallback) sp_svgview_main_key_press, this);
+        g_signal_connect(G_OBJECT (_ctrlwin->gobj()), "delete_event",    (GCallback) SPSlideShow::ctrlwin_delete, this);
+        auto t = Gtk::manage(new Gtk::ButtonBox());
+        _ctrlwin->add(*t);
+
+        auto btn_go_first = Gtk::manage(new Gtk::Button());
+        auto img_go_first = Gtk::manage(new Gtk::Image());
+        img_go_first->set_from_icon_name(INKSCAPE_ICON("go-first"), Gtk::ICON_SIZE_BUTTON);
+        btn_go_first->set_image(*img_go_first);
+        t->add(*btn_go_first);
+        btn_go_first->signal_clicked().connect(sigc::mem_fun(*this, &SPSlideShow::goto_first));
+        
+        auto btn_go_prev = Gtk::manage(new Gtk::Button());
+        auto img_go_prev = Gtk::manage(new Gtk::Image());
+        img_go_prev->set_from_icon_name(INKSCAPE_ICON("go-previous"), Gtk::ICON_SIZE_BUTTON);
+        btn_go_prev->set_image(*img_go_prev);
+        t->add(*btn_go_prev);
+        btn_go_prev->signal_clicked().connect(sigc::mem_fun(*this, &SPSlideShow::show_prev));
+        
+        auto btn_go_next = Gtk::manage(new Gtk::Button());
+        auto img_go_next = Gtk::manage(new Gtk::Image());
+        img_go_next->set_from_icon_name(INKSCAPE_ICON("go-next"), Gtk::ICON_SIZE_BUTTON);
+        btn_go_next->set_image(*img_go_next);
+        t->add(*btn_go_next);
+        btn_go_next->signal_clicked().connect(sigc::mem_fun(*this, &SPSlideShow::show_next));
+        
+        auto btn_go_last = Gtk::manage(new Gtk::Button());
+        auto img_go_last = Gtk::manage(new Gtk::Image());
+        img_go_last->set_from_icon_name(INKSCAPE_ICON("go-last"), Gtk::ICON_SIZE_BUTTON);
+        btn_go_last->set_image(*img_go_last);
+        t->add(*btn_go_last);
+        btn_go_last->signal_clicked().connect(sigc::mem_fun(*this, &SPSlideShow::goto_last));
+
+        _ctrlwin->show_all();
     } else {
-        gtk_window_present(GTK_WINDOW(ctrlwin));
+        _ctrlwin->present();
     }
-
-    return NULL;
-}
-
-static int sp_svgview_show_next_cb (GtkWidget */*widget*/, void *data)
-{
-    sp_svgview_show_next(static_cast<struct SPSlideShow *>(data));
-    return FALSE;
-}
-
-static int sp_svgview_show_prev_cb (GtkWidget */*widget*/, void *data)
-{
-    sp_svgview_show_prev(static_cast<struct SPSlideShow *>(data));
-    return FALSE;
-}
-
-static int sp_svgview_goto_first_cb (GtkWidget */*widget*/, void *data)
-{
-    sp_svgview_goto_first(static_cast<struct SPSlideShow *>(data));
-    return FALSE;
 }
 
-static int sp_svgview_goto_last_cb (GtkWidget */*widget*/, void *data)
+void SPSlideShow::waiting_cursor()
 {
-    sp_svgview_goto_last(static_cast<struct SPSlideShow *>(data));
-    return FALSE;
-}
-
-static void sp_svgview_waiting_cursor(struct SPSlideShow *ss)
-{
-    GdkDisplay *display = gdk_display_get_default();
-    GdkCursor  *waiting = gdk_cursor_new_for_display(display, GDK_WATCH);
-    gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(ss->window)), waiting);
-#if GTK_CHECK_VERSION(3,0,0)
-    g_object_unref(waiting);
-#else
-    gdk_cursor_unref(waiting);
-#endif
-    if (ctrlwin) {
-        GdkCursor *waiting = gdk_cursor_new_for_display(display, GDK_WATCH);
-        gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(ctrlwin)), waiting);
-#if GTK_CHECK_VERSION(3,0,0)
-        g_object_unref(waiting);
-#else
-        gdk_cursor_unref(waiting);
-#endif
+    auto display = Gdk::Display::get_default();
+    auto waiting = Gdk::Cursor::create(display, Gdk::WATCH);
+    get_window()->set_cursor(waiting);
+    
+    if (_ctrlwin) {
+        _ctrlwin->get_window()->set_cursor(waiting);
     }
-    while(gtk_events_pending()) {
-       gtk_main_iteration();
+    while(Gtk::Main::events_pending()) {
+        Gtk::Main::iteration();
     }
 }
 
-static void sp_svgview_normal_cursor(struct SPSlideShow *ss)
+void SPSlideShow::normal_cursor()
 {
-   gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(ss->window)), NULL);
-    if (ctrlwin) {
-        gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(ctrlwin)), NULL);
+    get_window()->set_cursor();
+    if (_ctrlwin) {
+        _ctrlwin->get_window()->set_cursor();
     }
 }
 
-static void sp_svgview_set_document(struct SPSlideShow *ss,
-                                    SPDocument *doc,
-                                    int current)
+void SPSlideShow::set_document(SPDocument *doc,
+                               int         current)
 {
-    if (doc && doc != ss->doc) {
+    if (doc && doc != _doc) {
         doc->ensureUpToDate();
-        reinterpret_cast<SPSVGView*>(SP_VIEW_WIDGET_VIEW (ss->view))->setDocument (doc);
-        ss->doc = doc;
-        ss->current = current;
+        reinterpret_cast<SPSVGView*>(SP_VIEW_WIDGET_VIEW (_view))->setDocument (doc);
+        _doc = doc;
+        _current = current;
     }
 }
 
-static void sp_svgview_show_next (struct SPSlideShow *ss)
+/**
+ * @brief Show the next file in the slideshow
+ */
+void SPSlideShow::show_next()
 {
-    sp_svgview_waiting_cursor(ss);
+    waiting_cursor();
 
     SPDocument *doc = NULL;
-    int current = ss->current;
-    while (!doc && (current < ss->length - 1)) {
-        doc = SPDocument::createNewDoc (ss->slides[++current], TRUE, false);
+    while (!doc && (_current < _slides.size() - 1)) {
+        doc = SPDocument::createNewDoc ((_slides[++_current]).c_str(), TRUE, false);
     }
 
-    sp_svgview_set_document(ss, doc, current);
-
-    sp_svgview_normal_cursor(ss);
+    set_document(doc, _current);
+    normal_cursor();
 }
 
-static void sp_svgview_show_prev (struct SPSlideShow *ss)
+/**
+ * @brief Show the previous file in the slideshow
+ */
+void SPSlideShow::show_prev()
 {
-    sp_svgview_waiting_cursor(ss);
+    waiting_cursor();
 
     SPDocument *doc = NULL;
-    int current = ss->current;
-    while (!doc && (current > 0)) {
-        doc = SPDocument::createNewDoc (ss->slides[--current], TRUE, false);
+    while (!doc && (_current > 0)) {
+        doc = SPDocument::createNewDoc ((_slides[--_current]).c_str(), TRUE, false);
     }
 
-    sp_svgview_set_document(ss, doc, current);
-
-    sp_svgview_normal_cursor(ss);
+    set_document(doc, _current);
+    normal_cursor();
 }
 
-static void sp_svgview_goto_first (struct SPSlideShow *ss)
+/**
+ * @brief Switch to first slide in slideshow
+ */
+void SPSlideShow::goto_first()
 {
-    sp_svgview_waiting_cursor(ss);
+    waiting_cursor();
 
     SPDocument *doc = NULL;
     int current = 0;
-    while ( !doc && (current < ss->length - 1)) {
-        if (current == ss->current) {
-            break;
-        }
-        doc = SPDocument::createNewDoc (ss->slides[current++], TRUE, false);
+    while ( !doc && (current < _slides.size() - 1)) {
+        doc = SPDocument::createNewDoc((_slides[current++]).c_str(), TRUE, false);
     }
 
-    sp_svgview_set_document(ss, doc, current - 1);
+    set_document(doc, current - 1);
 
-    sp_svgview_normal_cursor(ss);
+    normal_cursor();
 }
 
-static void sp_svgview_goto_last (struct SPSlideShow *ss)
+/**
+ * @brief Switch to last slide in slideshow
+ */
+void SPSlideShow::goto_last()
 {
-    sp_svgview_waiting_cursor(ss);
+    waiting_cursor();
 
     SPDocument *doc = NULL;
-    int current = ss->length - 1;
+    int current = _slides.size() - 1;
     while (!doc && (current >= 0)) {
-        if (current == ss->current) {
-            break;
-        }
-        doc = SPDocument::createNewDoc (ss->slides[current--], TRUE, false);
+        doc = SPDocument::createNewDoc((_slides[current--]).c_str(), TRUE, false);
     }
 
-    sp_svgview_set_document(ss, doc, current + 1);
-
-    sp_svgview_normal_cursor(ss);
-}
-
-#ifdef WITH_INKJAR
-static bool is_jar(char const *filename)
-{
-    /* fixme: Check MIME type or something.  /usr/share/misc/file/magic suggests that checking for
-       initial string "PK\003\004" in content should suffice. */
-    size_t const filename_len = strlen(filename);
-    if (filename_len < 5) {
-        return false;
-    }
-    char const *extension = filename + filename_len - 4;
-    return ((memcmp(extension, ".jar", 4) == 0) ||
-            (memcmp(extension, ".sxw", 4) == 0)   );
-}
-#endif /* WITH_INKJAR */
+    set_document(doc, current + 1);
 
-static void usage()
-{
-    fprintf(stderr,
-        "Usage: inkview [OPTIONS...] [FILES ...]\n"
-        "\twhere FILES are SVG (.svg or .svgz)"
-#ifdef WITH_INKJAR
-        " or archives of SVGs (.sxw, .jar)"
-#endif
-        "\n");
-    exit(1);
+    normal_cursor();
 }
 
 /*