Backend support for using dynamic styles. See also Ticket #49.

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

diff --git a/libchimara/window.c b/libchimara/window.c
index 56cbd700e6d66f2a5d9b2f496073a18fcf91eb05..826eacd288a146ddeb06a51a2957331af9802d60 100644 (file)
--- a/libchimara/window.c
+++ b/libchimara/window.c
@@ -26,6 +26,7 @@ window_new_common(glui32 rock)
        win->window_stream->type = STREAM_TYPE_WINDOW;
        win->window_stream->window = win;
        win->window_stream->style = "normal";
+       win->window_stream->glk_style = "normal";
 
        win->echo_stream = NULL;
        win->input_request_type = INPUT_REQUEST_NONE;
@@ -552,15 +553,14 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
                        /* Connect signal handlers */
                        
                        /* Pager */
-                       /* "size-allocate"? Really? WTF, GTK? */
-                       g_signal_connect_after( textview, "size-allocate", G_CALLBACK(pager_after_size_allocate), win );
+                       //g_signal_connect_after( textview, "expose-event", G_CALLBACK(pager_after_expose_event), win );
+                       g_signal_connect_after( textview, "size-request", G_CALLBACK(pager_after_size_request), win );
                        win->pager_expose_handler = g_signal_connect_after( textview, "expose-event", G_CALLBACK(pager_on_expose), win );
                        g_signal_handler_block(textview, win->pager_expose_handler);
                        win->pager_keypress_handler = g_signal_connect( textview, "key-press-event", G_CALLBACK(pager_on_key_press_event), win );
                        g_signal_handler_block(textview, win->pager_keypress_handler);
-                       //g_signal_connect_after( textbuffer, "insert-text", G_CALLBACK(pager_after_insert_text), win );
                        GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(scrolledwindow));
-                       g_signal_connect_after(adj, "value-changed", G_CALLBACK(pager_after_adjustment_changed), win);
+                       win->pager_adjustment_handler = g_signal_connect_after(adj, "value-changed", G_CALLBACK(pager_after_adjustment_changed), win);
 
                        /* Char and line input */
                        win->char_input_keypress_handler = g_signal_connect( textview, "key-press-event", G_CALLBACK(on_char_input_key_press_event), win );
@@ -586,7 +586,8 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 
                        /* Create the pager position mark; it stands for the last character in the buffer
                         that has been on-screen */
-                       gtk_text_buffer_create_mark(textbuffer, "pager_position", &end, TRUE);
+                       GtkTextMark *pager_position = gtk_text_buffer_create_mark(textbuffer, "pager_position", &end, TRUE);
+                       gtk_text_mark_set_visible(pager_position, TRUE);
                }
                        break;