X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fwindow.c;h=31b157f17077278a3b01bb357f4308acb882eade;hb=cbd4cb7f8c62b2ba51329a4cb082a96115a7529d;hp=cbfc9862e8911f37f2e2c27ca2f3dfb4adafc7e3;hpb=dafe71ca57fc0cf09415bceb36b86cf07e74cfbf;p=rodin%2Fchimara.git diff --git a/libchimara/window.c b/libchimara/window.c index cbfc986..31b157f 100644 --- a/libchimara/window.c +++ b/libchimara/window.c @@ -35,29 +35,45 @@ window_new_common(glui32 rock) /* Initialise the buffer */ win->buffer = g_string_sized_new(1024); + /* Initialise hyperlink table */ + win->hyperlinks = g_hash_table_new_full(g_int_hash, g_direct_equal, g_free, g_object_unref); + return win; } +/* Internal function: window closing stuff that is safe to call from either the + main thread or the Glk thread. */ +void +trash_window_thread_independent(ChimaraGlkPrivate *glk_data, winid_t win) +{ + 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_hash_table_destroy(win->hyperlinks); + g_free(win->current_hyperlink); + g_free(win); +} + +/* Internal function: do all the stuff necessary to close a window. Call only + from Glk thread. */ static void window_close_common(winid_t win, gboolean destroy_node) { ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); - + if(glk_data->unregister_obj) { (*glk_data->unregister_obj)(win, gidisp_Class_Window, win->disprock); win->disprock.ptr = NULL; } - + if(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); + + trash_window_thread_independent(glk_data, win); } /** @@ -474,29 +490,25 @@ 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->char_input_keypress_handler = g_signal_connect( G_OBJECT(textview), "key-press-event", G_CALLBACK(on_char_input_key_press_event), win ); - g_signal_handler_block( G_OBJECT(textview), win->char_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 ); - - /* Create the styles available to the window stream */ - style_init_textgrid(textbuffer); + 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); } break; @@ -517,38 +529,33 @@ 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->char_input_keypress_handler = g_signal_connect( G_OBJECT(textview), "key-press-event", G_CALLBACK(on_char_input_key_press_event), win ); - g_signal_handler_block( G_OBJECT(textview), win->char_input_keypress_handler ); - win->line_input_keypress_handler = g_signal_connect( G_OBJECT(textview), "key-press-event", G_CALLBACK(on_line_input_key_press_event), win ); + 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->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);