X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fwindow.c;h=15f8f4b1337059e2d4452a1c338ca019a0f5c8a4;hb=cccf5a5fb76599e4c5dffaae34ec6bda6229f554;hp=02f1e5ceb0e58d47ee8dca4abbf96d4e1e5f4cde;hpb=9e4d74d44d12f977c573c31cab7bcb3819a27976;p=rodin%2Fchimara.git diff --git a/libchimara/window.c b/libchimara/window.c index 02f1e5c..15f8f4b 100644 --- a/libchimara/window.c +++ b/libchimara/window.c @@ -3,6 +3,7 @@ #include "magic.h" #include "chimara-glk-private.h" #include "gi_dispa.h" +#include "pager.h" extern GPrivate *glk_data_key; @@ -25,7 +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->echo_stream = NULL; win->input_request_type = INPUT_REQUEST_NONE; win->line_input_buffer = NULL; @@ -65,6 +66,10 @@ window_close_common(winid_t win, gboolean destroy_node) g_string_free(win->buffer, TRUE); g_hash_table_destroy(win->hyperlinks); g_free(win->current_hyperlink); + + if(win->pager_layout) + g_object_unref(win->pager_layout); + g_free(win); } @@ -525,13 +530,14 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype, gtk_container_add( GTK_CONTAINER(scrolledwindow), textview ); gtk_widget_show_all(scrolledwindow); + win->widget = textview; + win->frame = scrolledwindow; + /* Create the styles available to the window stream */ style_init_textbuffer(textbuffer); + style_init_more_prompt(win); gtk_widget_modify_font( textview, get_current_font(wintype) ); - win->widget = textview; - win->frame = scrolledwindow; - /* Determine the size of a "0" character in pixels */ PangoLayout *zero = gtk_widget_create_pango_layout(textview, "0"); pango_layout_set_font_description( zero, get_current_font(wintype) ); @@ -539,23 +545,43 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype, g_object_unref(zero); /* Connect signal handlers */ + + /* Pager */ + /* "size-allocate"? Really? WTF, GTK? */ + g_signal_connect_after( textview, "size-allocate", G_CALLBACK(pager_after_size_allocate), 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); + + /* 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 ); g_signal_handler_block(textview, win->char_input_keypress_handler); win->line_input_keypress_handler = g_signal_connect( textview, "key-press-event", G_CALLBACK(on_line_input_key_press_event), win ); g_signal_handler_block(textview, win->line_input_keypress_handler); - win->shutdown_keypress_handler = g_signal_connect( textview, "key-press-event", G_CALLBACK(on_shutdown_key_press_event), win ); - g_signal_handler_block(textview, win->shutdown_keypress_handler); win->insert_text_handler = g_signal_connect_after( textbuffer, "insert-text", G_CALLBACK(after_window_insert_text), win ); g_signal_handler_block(textbuffer, win->insert_text_handler); + /* Shutdown key press */ + win->shutdown_keypress_handler = g_signal_connect( textview, "key-press-event", G_CALLBACK(on_shutdown_key_press_event), win ); + g_signal_handler_block(textview, win->shutdown_keypress_handler); + /* Create an editable tag to indicate uneditable parts of the window (for line input) */ gtk_text_buffer_create_tag(textbuffer, "uneditable", "editable", FALSE, "editable-set", TRUE, NULL); - /* Mark the position where the user will input text */ + /* Mark the position where the user will input text and the end mark */ GtkTextIter end; gtk_text_buffer_get_end_iter(textbuffer, &end); gtk_text_buffer_create_mark(textbuffer, "input_position", &end, TRUE); + gtk_text_buffer_create_mark(textbuffer, "end_position", &end, FALSE); + + /* 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); } break; @@ -568,6 +594,7 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype, win->unit_height = 1; win->widget = image; win->frame = image; + win->background_color = 0x00FFFFFF; /* Connect signal handlers */ win->button_press_event_handler = g_signal_connect(image, "button-press-event", G_CALLBACK(on_window_button_press), win); @@ -799,7 +826,12 @@ glk_window_close(winid_t win, stream_result_t *result) if(pair_node != NULL) { gboolean new_child_on_left = ( pair_node == g_node_first_sibling(pair_node) ); - GNode *sibling_node = pair_node->children; /* only one child left */ + + /* Lookup our sibling */ + GNode *sibling_node = pair_node->children; + if(sibling_node == win->window_node) + sibling_node = sibling_node->next; + GNode *new_parent_node = pair_node->parent; g_node_unlink(pair_node); g_node_unlink(sibling_node); @@ -817,6 +849,7 @@ glk_window_close(winid_t win, stream_result_t *result) g_node_append(new_parent_node, sibling_node); } + stream_close_common( ((winid_t) pair_node->data)->window_stream, NULL ); window_close_common( (winid_t) pair_node->data, TRUE); } else /* it was the root window */