X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fpager.c;h=2ab27554c955518fcce4ba89a9631f2482709b3a;hb=b80c7c9358f022e5e99f7fcd0ccb048b0ce7b7d3;hp=8fa8031a1ccc08ab4ecbe8f6b15ed626c6492cd1;hpb=02dacdfeec2bb204aff8dae862ece880c58f5e0c;p=rodin%2Fchimara.git diff --git a/libchimara/pager.c b/libchimara/pager.c index 8fa8031..2ab2755 100644 --- a/libchimara/pager.c +++ b/libchimara/pager.c @@ -6,12 +6,8 @@ and return the distance between the pager and the end of the buffer in buffer coordinates */ static void -move_pager_and_get_scroll_distance(GtkTextView *textview, gint *view_height, gint *scroll_distance) +move_pager_and_get_scroll_distance(GtkTextView *textview, gint *view_height, gint *scroll_distance, gboolean move ) { - while( gtk_events_pending() ) { - gtk_main_iteration(); - } - GdkRectangle pagerpos, endpos, visiblerect; GtkTextIter oldpager, newpager, end; GtkTextBuffer *buffer = gtk_text_view_get_buffer(textview); @@ -19,10 +15,16 @@ move_pager_and_get_scroll_distance(GtkTextView *textview, gint *view_height, gin /* 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); @@ -30,8 +32,10 @@ move_pager_and_get_scroll_distance(GtkTextView *textview, gint *view_height, gin 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\n", endpos.y - pagerpos.y); + */ *view_height = visiblerect.height; *scroll_distance = endpos.y - pagerpos.y; @@ -55,44 +59,59 @@ stop_paging(winid_t win) g_signal_handler_block(win->widget, win->pager_keypress_handler); } -/* Update the pager position after new text is inserted in the buffer and the -text view has calculated where it is */ -void -pager_after_size_allocate(GtkTextView *view, GtkAllocation *allocation, winid_t win) +/* Check whether paging should be done. This function is called inside the + * idle handler, after the textview has finished updating. */ +gboolean +pager_check(gpointer data) { - while(gtk_events_pending()) - gtk_main_iteration(); - + + winid_t win = (winid_t) data; + /* 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 ); + move_pager_and_get_scroll_distance( GTK_TEXT_VIEW(win->widget), &view_height, &scroll_distance, FALSE ); + + gdk_threads_enter(); + + if(view_height <= 1) + /* Paging is unusable when window is too small */ + return FALSE; + + /* 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->frame)); + 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); /* Seriously... */ + /* COMPAT: */ +#if GTK_CHECK_VERSION(2,14,0) gdk_window_invalidate_rect(gtk_widget_get_window(win->widget), NULL, TRUE); - } - else if(scroll_distance > 0) { - GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(win->widget)); - gtk_text_view_scroll_mark_onscreen(GTK_TEXT_VIEW(win->widget), gtk_text_buffer_get_mark(buffer, "end_position")); - while( gtk_events_pending() ) { - gtk_main_iteration(); - } +#else + gdk_window_invalidate_rect(win->widget->window, NULL, TRUE); +#endif } } + gdk_threads_leave(); + + /* Returning FALSE to prevent this function from being called multiple times */ + return FALSE; } +/* 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, view_height; - move_pager_and_get_scroll_distance( GTK_TEXT_VIEW(win->widget), &view_height, &scroll_distance ); - + 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) @@ -153,3 +172,27 @@ pager_on_expose(GtkTextView *textview, GdkEventExpose *event, winid_t win) return FALSE; /* Propagate event further */ } + +gboolean +pager_after_expose_event(GtkTextView *textview, GdkEventExpose *event, winid_t win) +{ + g_idle_add(pager_check, win); + return FALSE; +} + +void +pager_after_size_request(GtkTextView *textview, GtkRequisition *requisition, winid_t win) +{ + g_idle_add(pager_check, win); +} + +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); +}