Changeset 188

Timestamp:

05/21/06 07:23:10 (2 years ago)

Author:

jordi

Message:

The keyboard scrolling now behaves as most users expects thanks to the patch of LoneFox? (#10).

Location:

trunk/src/gtk

Files:

• MainView.cxx (modified) (1 diff)
• PageView.cxx (modified) (5 diffs)

trunk/src/gtk/MainView.cxx

@@ -110 +110 @@
       G_CALLBACK (main_window_go_to_first_page_cb) },
 
-    { "GoToNextPage", GTK_STOCK_GO_FORWARD, N_("_Next Page"), "Page_Down", 
+    { "GoToNextPage", GTK_STOCK_GO_FORWARD, N_("_Next Page"), "<Shift>Page_Down", 
       N_("Go to the next page"), 
       G_CALLBACK (main_window_go_to_next_page_cb) },
 
-    { "GoToPreviousPage", GTK_STOCK_GO_BACK, N_("_Previous Page"), "Page_Up", 
+    { "GoToPreviousPage", GTK_STOCK_GO_BACK, N_("_Previous Page"), "<Shift>Page_Up", 
       N_("Go to the previous page"),
       G_CALLBACK (main_window_go_to_previous_page_cb) },

trunk/src/gtk/PageView.cxx

@@ -19 +19 @@
 #include <gettext.h>
 #include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
 #include <epdfview.h>
 #include "PageView.h"
@@ -34 +35 @@
 static gboolean page_view_mouse_motion_cb (GtkWidget *, GdkEventMotion *,
                                            gpointer);
-static void page_view_get_scrollbars_size (GtkWidget *widget, 
+static void page_view_get_scrollbars_size (GtkWidget *,
                                            gint *width, gint *height);
 static void page_view_resized_cb (GtkWidget *, GtkAllocation *, gpointer);
-static gboolean page_view_scrolled_cb (GtkWidget *widget, GdkEventScroll *,
-                                       gpointer);
+static gboolean page_view_scrolled_cb (GtkWidget *, GdkEventScroll *, gpointer);
+static gboolean page_view_keypress_cb (GtkWidget *, GdkEventKey *, gpointer);
 
 
@@ -217 +218 @@
     g_signal_connect (G_OBJECT (m_PageScroll), "scroll-event",
                       G_CALLBACK (page_view_scrolled_cb), pter);
+    g_signal_connect (G_OBJECT (m_PageScroll), "key-press-event",
+                      G_CALLBACK (page_view_keypress_cb), pter);
 
     // And connect the motion, button press and release events.
@@ -409 +412 @@
     view->getPresenter ()->mouseButtonPressed (event->button, x, y);
 
+    gtk_widget_grab_focus(view->getTopWidget());
+    
     return TRUE;
 }
@@ -524 +529 @@
     return FALSE;
 }
+
+///
+/// @brief A key was pressed.
+///
+static gboolean
+page_view_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+{
+    g_assert ( NULL != data && "The data parameter is NULL.");
+
+    GtkScrollType direction;
+    gboolean horizontal = FALSE;
+    PagePter *pter = (PagePter *)data;
+    
+    GtkAdjustment *adjustment = 
+        gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (widget));
+    gdouble position = gtk_adjustment_get_value (adjustment);
+    
+    if ( event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK) )
+    {
+        return FALSE;
+    }
+    
+    switch ( event->keyval )
+    {
+        case GDK_Left:
+        case GDK_KP_Left:
+            direction = GTK_SCROLL_STEP_LEFT;
+            horizontal = TRUE;
+            break;
+        
+        case GDK_Right:
+        case GDK_KP_Right:
+            horizontal = TRUE;
+            direction = GTK_SCROLL_STEP_RIGHT;
+            break;
+        
+        case GDK_Up:
+        case GDK_KP_Up:
+            direction = GTK_SCROLL_STEP_UP;
+            break;
+        
+        case GDK_Down:
+        case GDK_KP_Down:
+            direction = GTK_SCROLL_STEP_DOWN;
+            break;
+        
+        case GDK_Page_Up:
+        case GDK_KP_Page_Up:
+            if ( position == adjustment->lower )
+            {
+                pter->scrollToPreviousPage ();
+                return TRUE;
+            }
+            direction = GTK_SCROLL_START;
+            break;
+        
+        case GDK_Page_Down:
+        case GDK_KP_Page_Down:
+            if ( position == ( adjustment->upper - adjustment->page_size) )
+            {
+                pter->scrollToNextPage ();
+                return TRUE;
+            }
+            direction = GTK_SCROLL_END;
+            break;
+        
+        default:
+            return FALSE;
+    }
+    
+    g_signal_emit_by_name(G_OBJECT(widget), "scroll-child",
+                          direction, horizontal);
+    return TRUE;
+}