![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/inkview.cpp b/src/inkview.cpp
index 95af5b73432b4596d485d4ae6ab720978e05b965..ade2b6d427d39f43ead661870e785dbd7f98e6a3 100644 (file)
--- a/src/inkview.cpp
+++ b/src/inkview.cpp
#include <gtk/gtktable.h>
#include <gtk/gtkbutton.h>
+#include <gtkmm/main.h>
+
#include "gc-core.h"
#include "preferences.h"
int current;
SPDocument *doc;
GtkWidget *view;
- GtkWindow *window;
+ GtkWidget *window;
bool fullscreen;
int timer;
};
int sp_main_console (int, char const**) { return 0; }
static int
-sp_svgview_main_delete (GtkWidget *widget, GdkEvent *event, struct SPSlideShow *ss)
+sp_svgview_main_delete (GtkWidget */*widget*/, GdkEvent */*event*/, struct SPSlideShow */*ss*/)
{
gtk_main_quit ();
return FALSE;
}
static int
-sp_svgview_main_key_press (GtkWidget *widget, GdkEventKey *event, struct SPSlideShow *ss)
+sp_svgview_main_key_press (GtkWidget */*widget*/, GdkEventKey *event, struct SPSlideShow *ss)
{
switch (event->keyval) {
case GDK_Up:
+ case GDK_Home:
sp_svgview_goto_first(ss);
break;
case GDK_Down:
+ case GDK_End:
sp_svgview_goto_last(ss);
break;
case GDK_F11:
#ifdef HAVE_GTK_WINDOW_FULLSCREEN
if (ss->fullscreen) {
- gtk_window_unfullscreen ((GtkWindow *) widget);
+ gtk_window_unfullscreen (GTK_WINDOW(ss->window));
ss->fullscreen = false;
} else {
- gtk_window_fullscreen ((GtkWindow *) widget);
+ gtk_window_fullscreen (GTK_WINDOW(ss->window));
ss->fullscreen = true;
}
#else
@@ -152,6 +156,7 @@ sp_svgview_main_key_press (GtkWidget *widget, GdkEventKey *event, struct SPSlide
case GDK_KP_Page_Up:
case GDK_Page_Up:
case GDK_Left:
+ case GDK_BackSpace:
sp_svgview_show_prev (ss);
break;
case GDK_Escape:
@@ -162,8 +167,8 @@ sp_svgview_main_key_press (GtkWidget *widget, GdkEventKey *event, struct SPSlide
default:
break;
}
- gtk_window_set_title(GTK_WINDOW(widget), SP_DOCUMENT_NAME(ss->doc));
- return FALSE;
+ gtk_window_set_title(GTK_WINDOW(ss->window), SP_DOCUMENT_NAME(ss->doc));
+ return TRUE;
}
int
usage();
}
+ Gtk::Main main_instance (&argc, const_cast<char ***>(&argv));
+
struct SPSlideShow ss;
int option,
}
ss.slides[ss.length++] = strdup (argv[i]);
- ss.doc = sp_document_new (ss.slides[ss.current], TRUE, false);
- if (!ss.doc && ++ss.current >= ss.length) {
- /* No loadable documents */
- return 1;
+ if (!ss.doc) {
+ ss.doc = sp_document_new (ss.slides[ss.current], TRUE, false);
+ if (!ss.doc)
+ ++ss.current;
}
#ifdef WITH_INKJAR
}
MIN ((int)sp_document_width (ss.doc), (int)gdk_screen_width () - 64),
MIN ((int)sp_document_height (ss.doc), (int)gdk_screen_height () - 64));
gtk_window_set_policy (GTK_WINDOW (w), TRUE, TRUE, FALSE);
+ 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.view = sp_svg_view_widget_new (ss.doc);
- sp_svg_view_widget_set_resize (SP_SVG_VIEW_WIDGET (ss.view), FALSE, sp_document_width (ss.doc), sp_document_height (ss.doc));
sp_document_ensure_up_to_date (ss.doc);
+ ss.view = sp_svg_view_widget_new (ss.doc);
sp_document_unref (ss.doc);
+ sp_svg_view_widget_set_resize (SP_SVG_VIEW_WIDGET (ss.view), FALSE,
+ sp_document_width (ss.doc), sp_document_height (ss.doc));
gtk_widget_show (ss.view);
gtk_container_add (GTK_CONTAINER (w), ss.view);
}
static int
-sp_svgview_ctrlwin_delete (GtkWidget *widget, GdkEvent *event, void *data)
+sp_svgview_ctrlwin_delete (GtkWidget */*widget*/, GdkEvent */*event*/, void */*data*/)
{
ctrlwin = NULL;
return FALSE;
if (!ctrlwin) {
GtkWidget *t, *b;
ctrlwin = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ 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);
t = gtk_table_new (1, 4, TRUE);
gtk_container_add ((GtkContainer *) ctrlwin, t);
}
static int
-sp_svgview_show_next_cb (GtkWidget *widget, void *data)
+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_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_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)
+sp_svgview_goto_last_cb (GtkWidget */*widget*/, void *data)
{
sp_svgview_goto_last(static_cast<struct SPSlideShow *>(data));
return FALSE;
}
static void
-sp_svgview_show_next (struct SPSlideShow *ss)
+sp_svgview_waiting_cursor(struct SPSlideShow *ss)
{
- SPDocument *doc;
- int current;
- doc = NULL;
- current = ss->current;
- while (!doc && (current < ss->length - 1)) {
- doc = sp_document_new (ss->slides[++current], TRUE, false);
+ GdkCursor *waiting = gdk_cursor_new(GDK_WATCH);
+ gdk_window_set_cursor(GTK_WIDGET(ss->window)->window, waiting);
+ gdk_cursor_unref(waiting);
+ if (ctrlwin) {
+ GdkCursor *waiting = gdk_cursor_new(GDK_WATCH);
+ gdk_window_set_cursor(GTK_WIDGET(ctrlwin)->window, waiting);
+ gdk_cursor_unref(waiting);
+ }
+ while(gtk_events_pending())
+ gtk_main_iteration();
+}
+
+static void
+sp_svgview_normal_cursor(struct SPSlideShow *ss)
+{
+ gdk_window_set_cursor(GTK_WIDGET(ss->window)->window, NULL);
+ if (ctrlwin) {
+ gdk_window_set_cursor(GTK_WIDGET(ctrlwin)->window, NULL);
}
- if (doc) {
- reinterpret_cast<SPSVGView*>(SP_VIEW_WIDGET_VIEW (ss->view))->setDocument (doc);
- sp_document_ensure_up_to_date (doc);
- ss->doc = doc;
- ss->current = current;
+}
+
+static void
+sp_svgview_set_document(struct SPSlideShow *ss, SPDocument *doc, int current)
+{
+ if (doc && doc != ss->doc) {
+ sp_document_ensure_up_to_date (doc);
+ reinterpret_cast<SPSVGView*>(SP_VIEW_WIDGET_VIEW (ss->view))->setDocument (doc);
+ if (ss->doc) {
+ delete ss->doc;
+ }
+ ss->doc = doc;
+ ss->current = current;
}
}
+static void
+sp_svgview_show_next (struct SPSlideShow *ss)
+{
+ sp_svgview_waiting_cursor(ss);
+
+ SPDocument *doc = NULL;
+ int current = ss->current;
+ while (!doc && (current < ss->length - 1)) {
+ doc = sp_document_new (ss->slides[++current], TRUE, false);
+ }
+
+ sp_svgview_set_document(ss, doc, current);
+
+ sp_svgview_normal_cursor(ss);
+}
+
static void
sp_svgview_show_prev (struct SPSlideShow *ss)
{
- SPDocument *doc;
- int current;
- doc = NULL;
- current = ss->current;
+ sp_svgview_waiting_cursor(ss);
+
+ SPDocument *doc = NULL;
+ int current = ss->current;
while (!doc && (current > 0)) {
- doc = sp_document_new (ss->slides[--current], TRUE, false);
- }
- if (doc) {
- reinterpret_cast<SPSVGView*>(SP_VIEW_WIDGET_VIEW (ss->view))->setDocument (doc);
- sp_document_ensure_up_to_date (doc);
- ss->doc = doc;
- ss->current = current;
+ doc = sp_document_new (ss->slides[--current], TRUE, false);
}
+
+ sp_svgview_set_document(ss, doc, current);
+
+ sp_svgview_normal_cursor(ss);
}
static void
sp_svgview_goto_first (struct SPSlideShow *ss)
{
+ sp_svgview_waiting_cursor(ss);
+
SPDocument *doc = NULL;
int current = 0;
- for ( ; !doc && (current < ss->length); current++) {
- doc = sp_document_new (ss->slides[current], TRUE, false);
- }
- if (doc) {
- reinterpret_cast<SPSVGView*>(SP_VIEW_WIDGET_VIEW (ss->view))->setDocument (doc);
- sp_document_ensure_up_to_date (doc);
- ss->doc = doc;
- ss->current = current;
+ while ( !doc && (current < ss->length - 1)) {
+ if (current == ss->current)
+ break;
+ doc = sp_document_new (ss->slides[current++], TRUE, false);
}
+
+ sp_svgview_set_document(ss, doc, current - 1);
+
+ sp_svgview_normal_cursor(ss);
}
static void
sp_svgview_goto_last (struct SPSlideShow *ss)
{
+ sp_svgview_waiting_cursor(ss);
+
SPDocument *doc = NULL;
int current = ss->length - 1;
- for ( ; !doc && (current >= 0); current--) {
- doc = sp_document_new (ss->slides[current], TRUE, false);
- }
- if (doc) {
- reinterpret_cast<SPSVGView*>(SP_VIEW_WIDGET_VIEW (ss->view))->setDocument (doc);
- sp_document_ensure_up_to_date (doc);
- ss->doc = doc;
- ss->current = current;
+ while (!doc && (current >= 0)) {
+ if (current == ss->current)
+ break;
+ doc = sp_document_new (ss->slides[current--], TRUE, false);
}
+
+ sp_svgview_set_document(ss, doc, current + 1);
+
+ sp_svgview_normal_cursor(ss);
}
#ifdef WITH_INKJAR
#ifdef WITH_INKJAR
" or archives of SVGs (.sxw, .jar)"
#endif
- "\n\n"
- "Available options:\n"
- "\t-t\t\tTimer for automatically changing slides in seconds.\n"
"\n");
exit(1);
}