From ce4063914caf0d28b807ecefa0a6be137b178d49 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Wed, 26 Nov 2014 08:46:56 +0100 Subject: Restore page up/page down in slide window --- src/sc_editor.c | 10 ---------- src/slide_window.c | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/sc_editor.c b/src/sc_editor.c index b1a01f2..c7ebb26 100644 --- a/src/sc_editor.c +++ b/src/sc_editor.c @@ -1006,16 +1006,6 @@ static gboolean key_press_sig(GtkWidget *da, GdkEventKey *event, switch ( event->keyval ) { - case GDK_KEY_Page_Up : - //prev_slide_sig(NULL, p); - claim = 1; - break; - - case GDK_KEY_Page_Down : - //next_slide_sig(NULL, p); FIXME! - claim = 1; - break; - case GDK_KEY_Escape : e->selection = NULL; redraw_editor(e); diff --git a/src/slide_window.c b/src/slide_window.c index 4269a23..2c06de3 100644 --- a/src/slide_window.c +++ b/src/slide_window.c @@ -608,6 +608,24 @@ void update_titlebar(struct presentation *p) } +static gboolean key_press_sig(GtkWidget *da, GdkEventKey *event, + SlideWindow *sw) +{ + switch ( event->keyval ) { + + case GDK_KEY_Page_Up : + change_slide_backwards(sw); + break; + + case GDK_KEY_Page_Down : + change_slide_forwards(sw); + break; + } + + return FALSE; +} + + SlideWindow *slide_window_open(struct presentation *p, GApplication *app) { GtkWidget *window; @@ -644,6 +662,9 @@ SlideWindow *slide_window_open(struct presentation *p, GApplication *app) GTK_WIDGET(sw->sceditor)); /* Size of SCEditor surface in pixels */ + g_signal_connect(G_OBJECT(sw->sceditor), "key-press-event", + G_CALLBACK(key_press_sig), sw); + /* FIXME: Somewhat arbitrary. Should come from slide itself */ sc_editor_set_size(sw->sceditor, 1024, 768); sc_editor_set_logical_size(sw->sceditor, 1024.0, 768.0); -- cgit v1.2.3