X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fpager.c;h=652a70dd411fe7948bd35a76623eefc795937f91;hb=0cc686dee7c3d71457b409a097fbc7435709429a;hp=f9a0a32c69fa0b670ba01162603ec988e401513e;hpb=015eeb821228b1e0fa06cddf0db9cc5469465db6;p=projects%2Fchimara%2Fchimara.git diff --git a/libchimara/pager.c b/libchimara/pager.c index f9a0a32..652a70d 100644 --- a/libchimara/pager.c +++ b/libchimara/pager.c @@ -5,8 +5,8 @@ /* Helper function: move the pager to the last visible position in the buffer, and return the distance between the pager and the end of the buffer in buffer coordinates */ -static gint -move_pager_and_get_scroll_distance(GtkTextView *textview) +static void +move_pager_and_get_scroll_distance(GtkTextView *textview, gint *view_height, gint *scroll_distance, gboolean move ) { GdkRectangle pagerpos, endpos, visiblerect; GtkTextIter oldpager, newpager, end; @@ -15,21 +15,30 @@ move_pager_and_get_scroll_distance(GtkTextView *textview) /* Get an iter at the lower right corner of the visible part of the buffer */ gtk_text_view_get_visible_rect(textview, &visiblerect); - gtk_text_view_get_iter_at_location(textview, &newpager, visiblerect.x + visiblerect.width, visiblerect.y + visiblerect.height); + gtk_text_view_get_iter_at_location( + textview, + &newpager, + visiblerect.x + visiblerect.width, + visiblerect.y + visiblerect.height + ); gtk_text_buffer_get_iter_at_mark(buffer, &oldpager, pager); - gtk_text_buffer_move_mark(buffer, pager, &newpager); + if(move) + gtk_text_buffer_move_mark(buffer, pager, &newpager); /* Get the buffer coordinates of the pager and the end iter */ gtk_text_buffer_get_end_iter(buffer, &end); gtk_text_buffer_get_iter_at_mark(buffer, &newpager, pager); gtk_text_view_get_iter_location(textview, &newpager, &pagerpos); gtk_text_view_get_iter_location(textview, &end, &endpos); + + /* + g_printerr("View height = %d\n", visiblerect.height); + g_printerr("End - Pager = %d - %d = %d\n", endpos.y, pagerpos.y, endpos.y - pagerpos.y); + */ - //g_printerr("View height = %d\n", visiblerect.height); - //g_printerr("End - Pager = %d\n", endpos.y - pagerpos.y); - - return endpos.y - pagerpos.y; + *view_height = visiblerect.height; + *scroll_distance = endpos.y - pagerpos.y; } /* Helper function: turn on paging for this textview */ @@ -37,7 +46,7 @@ static void start_paging(winid_t win) { win->currently_paging = TRUE; - g_signal_handler_unblock(win->widget, win->pager_expose_handler); + gtk_widget_show(win->pager); g_signal_handler_unblock(win->widget, win->pager_keypress_handler); } @@ -46,33 +55,18 @@ static void stop_paging(winid_t win) { win->currently_paging = FALSE; - g_signal_handler_block(win->widget, win->pager_expose_handler); + gtk_widget_hide(win->pager); g_signal_handler_block(win->widget, win->pager_keypress_handler); } -/* Update the pager position after new text is inserted in the buffer */ -void -pager_after_insert_text(GtkTextBuffer *buffer, GtkTextIter *location, gchar *text, gint len, winid_t win) -{ - while(gtk_events_pending()) - gtk_main_iteration(); - - /* Move the pager to the last visible character in the buffer */ - gint scroll_distance = move_pager_and_get_scroll_distance( GTK_TEXT_VIEW(win->widget) ); - - if(scroll_distance > 0 && !win->currently_paging) - start_paging(win); -} - +/* When the user scrolls up in a textbuffer, start paging. */ void pager_after_adjustment_changed(GtkAdjustment *adj, winid_t win) { - while(gtk_events_pending()) - gtk_main_iteration(); - /* Move the pager, etc. */ - gint scroll_distance = move_pager_and_get_scroll_distance( GTK_TEXT_VIEW(win->widget) ); - + gint scroll_distance, view_height; + move_pager_and_get_scroll_distance( GTK_TEXT_VIEW(win->widget), &view_height, &scroll_distance, TRUE ); + if(scroll_distance > 0 && !win->currently_paging) start_paging(win); else if(scroll_distance == 0 && win->currently_paging) @@ -86,61 +80,77 @@ pager_after_adjustment_changed(GtkAdjustment *adj, winid_t win) gboolean pager_on_key_press_event(GtkTextView *textview, GdkEventKey *event, winid_t win) { - /*** ALTERNATIVE, POSSIBLY INFERIOR, METHOD OF SCROLLING *** - GtkTextMark *pagermark = gtk_text_buffer_get_mark(buffer, "pager_position"); - gtk_text_view_scroll_to_mark(textview, pagermark, 0.0, TRUE, 0.0, 0.0); - */ - - GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(win->frame) ); - gdouble step_increment, page_size, upper, lower, value; + GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(win->scrolledwindow) ); + 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 */ } return FALSE; /* if the key wasn't handled here, pass it to other handlers */ } -/* Draw the "more" prompt on top of the buffer, after the regular expose event has run */ -gboolean -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_allocate(GtkTextView *textview, GdkRectangle *allocation, winid_t win) { - /* Calculate the position of the 'more' tag */ - gint promptwidth, promptheight; - pango_layout_get_pixel_size(win->pager_layout, &promptwidth, &promptheight); + /* 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 winx, winy, winwidth, winheight; - gdk_window_get_position(event->window, &winx, &winy); - gdk_drawable_get_size(GDK_DRAWABLE(event->window), &winwidth, &winheight); + if(view_height <= 1) + /* Paging is unusable when window is too small */ + return; - /* Draw the 'more' tag */ - GdkGC *context = gdk_gc_new(GDK_DRAWABLE(event->window)); - /* - gdk_draw_layout_with_colors(event->window, context, - winx + winwidth - promptwidth, - winy + winheight - promptheight, - prompt, &white, &red); - */ - gdk_draw_layout(event->window, context, - winx + winwidth - promptwidth, - winy + winheight - promptheight, - win->pager_layout); + /* 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. */ + GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(win->scrolledwindow)); + g_signal_handler_block(adj, win->pager_adjustment_handler); + GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(win->widget)); + GtkTextMark *pager_position = gtk_text_buffer_get_mark(buffer, "pager_position"); + gtk_text_view_scroll_to_mark(GTK_TEXT_VIEW(win->widget), pager_position, 0.0, TRUE, 0.0, 0.0); + g_signal_handler_unblock(adj, win->pager_adjustment_handler); + + if(!win->currently_paging) { + if(scroll_distance > view_height) { + start_paging(win); + gdk_window_invalidate_rect(gtk_widget_get_window(win->widget), NULL, TRUE); + } + } +} - return FALSE; /* Propagate event further */ +void +pager_update(winid_t win) +{ + GtkTextIter input_iter; + GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(win->widget)); + GtkTextMark *input_position = gtk_text_buffer_get_mark(buffer, "input_position"); + GtkTextMark *pager_position = gtk_text_buffer_get_mark(buffer, "pager_position"); + gtk_text_buffer_get_iter_at_mark(buffer, &input_iter, input_position); + gtk_text_buffer_move_mark(buffer, pager_position, &input_iter); }