X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fwindow.c;h=edb241f88a4c34fdf34369409c3da24ecccbae3d;hb=641bba7f53fbed8f422568a4d884d3205d84fe6a;hp=a31bed1b251f7b749d82a325a2b058c599bd4b93;hpb=f48bef46bd39ddac5067af1a4ac9b977b6158d07;p=projects%2Fchimara%2Fchimara.git diff --git a/libchimara/window.c b/libchimara/window.c index a31bed1..edb241f 100644 --- a/libchimara/window.c +++ b/libchimara/window.c @@ -30,6 +30,7 @@ window_new_common(glui32 rock) win->input_request_type = INPUT_REQUEST_NONE; win->line_input_buffer = NULL; win->line_input_buffer_unicode = NULL; + win->history = NULL; /* Initialise the buffer */ win->buffer = g_string_sized_new(1024); @@ -52,6 +53,9 @@ window_close_common(winid_t win, gboolean destroy_node) g_node_destroy(win->window_node); win->magic = MAGIC_FREE; + g_list_foreach(win->history, (GFunc)g_free, NULL); + g_list_free(win->history); + g_string_free(win->buffer, TRUE); g_free(win); } @@ -470,29 +474,29 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype, gtk_text_view_set_editable( GTK_TEXT_VIEW(textview), FALSE ); gtk_widget_show(textview); - /* Set the window's font */ - gtk_widget_modify_font(textview, glk_data->monospace_font_desc); + /* Create the styles available to the window stream */ + style_init_textgrid(textbuffer); + gtk_widget_modify_font( textview, get_current_font(wintype) ); win->widget = textview; win->frame = textview; /* Determine the size of a "0" character in pixels */ PangoLayout *zero = gtk_widget_create_pango_layout(textview, "0"); - pango_layout_set_font_description(zero, glk_data->monospace_font_desc); + pango_layout_set_font_description( zero, get_current_font(wintype) ); pango_layout_get_pixel_size(zero, &(win->unit_width), &(win->unit_height)); g_object_unref(zero); /* width and height are set later */ /* Connect signal handlers */ - win->keypress_handler = g_signal_connect( G_OBJECT(textview), "key-press-event", G_CALLBACK(on_window_key_press_event), win ); - g_signal_handler_block( G_OBJECT(textview), win->keypress_handler ); + 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); - gtk_widget_add_events( GTK_WIDGET(textview), GDK_BUTTON_RELEASE_MASK ); + gtk_widget_add_events( textview, GDK_BUTTON_RELEASE_MASK ); win->mouse_click_handler = g_signal_connect_after( G_OBJECT(textview), "button-release-event", G_CALLBACK(on_window_button_release_event), win ); - g_signal_handler_block( G_OBJECT(textview), win->mouse_click_handler ); - - /* Create the styles available to the window stream */ - style_init_textgrid(textbuffer); + g_signal_handler_block( textview, win->mouse_click_handler ); } break; @@ -513,37 +517,36 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype, gtk_container_add( GTK_CONTAINER(scrolledwindow), textview ); gtk_widget_show_all(scrolledwindow); - /* Set the window's font */ - gtk_widget_modify_font(textview, glk_data->default_font_desc); + /* Create the styles available to the window stream */ + style_init_textbuffer(textbuffer); + 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, glk_data->default_font_desc); + pango_layout_set_font_description( zero, get_current_font(wintype) ); pango_layout_get_pixel_size(zero, &(win->unit_width), &(win->unit_height)); g_object_unref(zero); /* Connect signal handlers */ - win->keypress_handler = g_signal_connect( G_OBJECT(textview), "key-press-event", G_CALLBACK(on_window_key_press_event), win ); - g_signal_handler_block( G_OBJECT(textview), win->keypress_handler ); - + 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); + gtk_widget_add_events( GTK_WIDGET(textview), GDK_BUTTON_RELEASE_MASK ); - win->mouse_click_handler = g_signal_connect_after( G_OBJECT(textview), "button-release-event", G_CALLBACK(on_window_button_release_event), win ); - g_signal_handler_block( G_OBJECT(textview), win->mouse_click_handler ); - - win->insert_text_handler = g_signal_connect_after( G_OBJECT(textbuffer), "insert-text", G_CALLBACK(after_window_insert_text), win ); - g_signal_handler_block( G_OBJECT(textbuffer), win->insert_text_handler ); + win->mouse_click_handler = g_signal_connect_after( textview, "button-release-event", G_CALLBACK(on_window_button_release_event), win ); + g_signal_handler_block( textview, win->mouse_click_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 ); /* 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); - /* Create the styles available to the window stream */ - style_init_textbuffer(textbuffer); - /* Mark the position where the user will input text */ GtkTextIter end; gtk_text_buffer_get_end_iter(textbuffer, &end); @@ -1232,6 +1235,8 @@ glk_window_move_cursor(winid_t win, glui32 xpos, glui32 ypos) VALID_WINDOW(win, return); g_return_if_fail(win->type == wintype_TextGrid); + flush_window_buffer(win); + ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); /* Wait until the window's size is current */ @@ -1250,6 +1255,7 @@ glk_window_move_cursor(winid_t win, glui32 xpos, glui32 ypos) ypos += xpos / win->width; xpos %= win->width; } + /* Go to the end if the cursor is moved off the bottom edge */ if(ypos >= win->height) {