Fixed ordering of the application of the styles

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

diff --git a/libchimara/pager.c b/libchimara/pager.c
index a8904cf2a9cf2bb4bcc808ce1e25779301cf9596..c51dbd75e0c43574fd52d35a3a4af9125b0767b2 100644 (file)
--- a/libchimara/pager.c
+++ b/libchimara/pager.c
@@ -6,7 +6,7 @@
  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 )
 {
        GdkRectangle pagerpos, endpos, visiblerect;
        GtkTextIter oldpager, newpager, end;
@@ -23,7 +23,8 @@ move_pager_and_get_scroll_distance(GtkTextView *textview, gint *view_height, gin
        );
        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);
@@ -31,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;
@@ -56,57 +59,14 @@ stop_paging(winid_t win)
        g_signal_handler_block(win->widget, win->pager_keypress_handler);
 }
 
-/* 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)
-{
-
-       printf("pager check...\n");
-       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 );
-
-       if(view_height <= 1)
-               /* Paging is unusable when window is too small */
-               return FALSE;
-       
-       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
-                       gdk_window_invalidate_rect(win->widget->window, NULL, TRUE);
-#endif
-               }
-               else if(scroll_distance > 0) {
-                       GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(win->widget));
-                       GtkTextMark *end = gtk_text_buffer_get_mark(buffer, "end_position");
-
-                       gdk_threads_enter();
-                       gtk_text_view_scroll_mark_onscreen(GTK_TEXT_VIEW(win->widget), end);
-                       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)
 {
        /* 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)
@@ -168,3 +128,49 @@ pager_on_expose(GtkTextView *textview, GdkEventExpose *event, winid_t win)
        return FALSE; /* Propagate event further */
 }
 
+/* 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) {
+       /* 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
+                       );
+
+       if(view_height <= 1)
+               /* Paging is unusable when window is too small */
+               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->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
+                       gdk_window_invalidate_rect(win->widget->window, NULL, TRUE);
+#endif
+               }
+       }
+}
+
+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);
+}