Change GDK_ key constants

[projects/chimara/chimara.git] / libchimara / pager.c

diff --git a/libchimara/pager.c b/libchimara/pager.c
index c51dbd75e0c43574fd52d35a3a4af9125b0767b2..c620bacaaf24bba76a0049b39e1fdd85c0ab56cb 100644 (file)
--- a/libchimara/pager.c
+++ b/libchimara/pager.c
@@ -34,7 +34,7 @@ move_pager_and_get_scroll_distance(GtkTextView *textview, gint *view_height, gin
 
        /*
        g_printerr("View height = %d\n", visiblerect.height);
-       g_printerr("End - Pager = %d\n", endpos.y - pagerpos.y);
+       g_printerr("End - Pager = %d - %d = %d\n", endpos.y, pagerpos.y, endpos.y - pagerpos.y);
        */
        
        *view_height = visiblerect.height;
@@ -81,25 +81,23 @@ gboolean
 pager_on_key_press_event(GtkTextView *textview, GdkEventKey *event, winid_t win)
 {
        GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(win->frame) );
-       gdouble step_increment, page_size, upper, lower, value;
+       gdouble page_size, upper, lower, value;
        g_object_get(adj, 
                "page-size", &page_size,
-               "step-increment", &step_increment,
                "upper", &upper,
                "lower", &lower,
                "value", &value,
                NULL);
        
        switch (event->keyval) {
-               case GDK_space: case GDK_KP_Space: case GDK_Page_Down: case GDK_KP_Page_Down:
+               case GDK_KEY_space: case GDK_KEY_KP_Space:
+               case GDK_KEY_Page_Down: case GDK_KEY_KP_Page_Down:
+               case GDK_KEY_Return: case GDK_KEY_KP_Enter:
                        gtk_adjustment_set_value(adj, CLAMP(value + page_size, lower, upper - page_size));
                        return TRUE;
-               case GDK_Page_Up: case GDK_KP_Page_Up:
+               case GDK_KEY_Page_Up: case GDK_KEY_KP_Page_Up:
                        gtk_adjustment_set_value(adj, CLAMP(value - page_size, lower, upper - page_size));
                        return TRUE;
-               case GDK_Return: case GDK_KP_Enter:
-                       gtk_adjustment_set_value(adj, CLAMP(value + step_increment, lower, upper - page_size));
-                       return TRUE;
                        /* don't handle "up" and "down", they're used for input history */
        }
        
@@ -130,16 +128,26 @@ pager_on_expose(GtkTextView *textview, GdkEventExpose *event, winid_t win)
 
 /* Check whether paging should be done. This function is called after the
  * textview has finished validating text positions. */
-void pager_after_size_request(GtkTextView *textview, GtkRequisition
-               *requisition, winid_t win) {
+void 
+pager_after_size_request(GtkTextView *textview, GtkRequisition *requisition, winid_t win) 
+{
        /* Move the pager to the last visible character in the buffer */
-       gint view_height, scroll_distance; move_pager_and_get_scroll_distance(
-                       GTK_TEXT_VIEW(win->widget), &view_height, &scroll_distance, FALSE
-                       );
+       gint view_height, scroll_distance; 
+       move_pager_and_get_scroll_distance(GTK_TEXT_VIEW(win->widget), &view_height, &scroll_distance, FALSE);
 
        if(view_height <= 1)
                /* Paging is unusable when window is too small */
                return;
+
+       /* If not in interactive mode, then just scroll to the bottom. */
+       ChimaraGlk *glk = CHIMARA_GLK(gtk_widget_get_ancestor(GTK_WIDGET(textview), CHIMARA_TYPE_GLK));
+       g_assert(glk);
+       if(!chimara_glk_get_interactive(glk)) {
+               GtkTextIter end;
+               gtk_text_buffer_get_end_iter(gtk_text_view_get_buffer(textview), &end);
+               gtk_text_view_scroll_to_iter(textview, &end, 0.0, TRUE, 0.0, 0.0);
+               return;
+       }
        
        /* Scroll past text already read by user. This is automatic scrolling, so disable the pager_ajustment_handler
         * first, that acts on the belief the scolling is performed by the user. */