X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fwindow.c;h=31b157f17077278a3b01bb357f4308acb882eade;hb=cbd4cb7f8c62b2ba51329a4cb082a96115a7529d;hp=5e0ec5015ff95cfded035c18a4b5882d08499a5d;hpb=c6009981145d784b85990702617018ebc5d6cc8a;p=rodin%2Fchimara.git diff --git a/libchimara/window.c b/libchimara/window.c index 5e0ec50..31b157f 100644 --- a/libchimara/window.c +++ b/libchimara/window.c @@ -1,8 +1,80 @@ +#include #include "window.h" #include "magic.h" #include "chimara-glk-private.h" +#include "gi_dispa.h" -extern ChimaraGlkPrivate *glk_data; +extern GPrivate *glk_data_key; + +static winid_t +window_new_common(glui32 rock) +{ + ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); + winid_t win = g_new0(struct glk_window_struct, 1); + + win->magic = MAGIC_WINDOW; + win->rock = rock; + if(glk_data->register_obj) + win->disprock = (*glk_data->register_obj)(win, gidisp_Class_Window); + + win->window_node = g_node_new(win); + + /* Every window has a window stream, but printing to it might have no effect */ + win->window_stream = stream_new_common(0); + win->window_stream->file_mode = filemode_Write; + 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; + win->line_input_buffer_unicode = NULL; + win->history = NULL; + + /* 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); + + trash_window_thread_independent(glk_data, win); +} /** * glk_window_iterate: @@ -25,6 +97,7 @@ glk_window_iterate(winid_t win, glui32 *rockptr) { VALID_WINDOW_OR_NULL(win, return NULL); + ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); GNode *retnode; if(win == NULL) @@ -135,6 +208,7 @@ glk_window_get_sibling(winid_t win) winid_t glk_window_get_root() { + ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); if(glk_data->root_window == NULL) return NULL; return (winid_t)glk_data->root_window->data; @@ -377,6 +451,8 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype, g_return_val_if_fail(method == (method & (winmethod_DirMask | winmethod_DivisionMask)), NULL); g_return_val_if_fail(!(((method & winmethod_DivisionMask) == winmethod_Proportional) && size > 100), NULL); + ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); + if(split == NULL && glk_data->root_window != NULL) { ILLEGAL("Tried to open a new root window, but there is already a root window"); @@ -386,11 +462,8 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype, gdk_threads_enter(); /* Create the new window */ - winid_t win = g_new0(struct glk_window_struct, 1); - win->magic = MAGIC_WINDOW; - win->rock = rock; + winid_t win = window_new_common(rock); win->type = wintype; - win->window_node = g_node_new(win); switch(wintype) { @@ -405,42 +478,37 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype, /* A blank window has no size */ win->unit_width = 0; win->unit_height = 0; - /* You can print to a blank window's stream, but it does nothing */ - win->window_stream = window_stream_new(win); - win->echo_stream = NULL; } break; case wintype_TextGrid: { GtkWidget *textview = gtk_text_view_new(); + GtkTextBuffer *textbuffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(textview) ); gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW(textview), GTK_WRAP_NONE ); 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); - - /* Set the other parameters (width and height are set later) */ - win->window_stream = window_stream_new(win); - win->echo_stream = NULL; - win->input_request_type = INPUT_REQUEST_NONE; - win->line_input_buffer = NULL; - win->line_input_buffer_unicode = NULL; + /* 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); } break; @@ -461,39 +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); - - /* Set the other parameters */ - win->window_stream = window_stream_new(win); - win->echo_stream = NULL; - win->input_request_type = INPUT_REQUEST_NONE; - win->line_input_buffer = NULL; - win->line_input_buffer_unicode = NULL; /* 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); + + 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); - 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 ); /* 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 default 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); @@ -519,14 +581,8 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype, { /* When splitting, construct a new parent window * copying most characteristics from the window that is being split */ - winid_t pair = g_new0(struct glk_window_struct, 1); - pair->magic = MAGIC_WINDOW; - pair->rock = 0; + winid_t pair = window_new_common(0); pair->type = wintype_Pair; - pair->window_node = g_node_new(pair); - /* You can print to a pair window's window stream, but it has no effect */ - pair->window_stream = window_stream_new(pair); - pair->echo_stream = NULL; /* The pair window must know about its children's split method */ pair->key_window = win; @@ -631,8 +687,7 @@ free_winids_below(winid_t win) free_winids_below(win->window_node->children->data); free_winids_below(win->window_node->children->next->data); } - win->magic = MAGIC_FREE; - g_free(win); + window_close_common(win, FALSE); } /** @@ -701,6 +756,8 @@ void glk_window_close(winid_t win, stream_result_t *result) { VALID_WINDOW(win, return); + + ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); gdk_threads_enter(); /* Prevent redraw while we're trashing the window */ @@ -722,7 +779,6 @@ glk_window_close(winid_t win, stream_result_t *result) /* Parent window changes from a split window into the sibling window */ /* The parent of any window is either a pair window or NULL */ GNode *pair_node = win->window_node->parent; - g_node_destroy(win->window_node); /* If win was not the root window: */ if(pair_node != NULL) { @@ -745,19 +801,14 @@ glk_window_close(winid_t win, stream_result_t *result) g_node_append(new_parent_node, sibling_node); } - winid_t pair = (winid_t) pair_node->data; - g_node_destroy(pair_node); - - pair->magic = MAGIC_FREE; - g_free(pair); + window_close_common( (winid_t) pair_node->data, TRUE); } else /* it was the root window */ { glk_data->root_window = NULL; } - win->magic = MAGIC_FREE; - g_free(win); + window_close_common(win, FALSE); /* Schedule a redraw */ g_mutex_lock(glk_data->arrange_lock); @@ -810,6 +861,8 @@ glk_window_clear(winid_t win) { VALID_WINDOW(win, return); g_return_if_fail(win->input_request_type != INPUT_REQUEST_LINE && win->input_request_type != INPUT_REQUEST_LINE_UNICODE); + + ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); switch(win->type) { @@ -873,17 +926,26 @@ glk_window_clear(winid_t win) /** * glk_set_window: - * @win: A window. + * @win: A window, or %NULL. * * Sets the current stream to @win's window stream. It is exactly equivalent to * |[ #glk_stream_set_current(#glk_window_get_stream(@win)) ]| * See Streams. + * + * Chimara + * + * Although this is not mentioned in the specification, @win may also be + * %NULL, in which case the current stream is also set to %NULL. + * */ void glk_set_window(winid_t win) { - VALID_WINDOW(win, return); - glk_stream_set_current( glk_window_get_stream(win) ); + VALID_WINDOW_OR_NULL(win, return); + if(win) + glk_stream_set_current( glk_window_get_stream(win) ); + else + glk_stream_set_current(NULL); } /** @@ -976,6 +1038,8 @@ glk_window_get_size(winid_t win, glui32 *widthptr, glui32 *heightptr) { VALID_WINDOW(win, return); + ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); + switch(win->type) { case wintype_Blank: @@ -1103,6 +1167,8 @@ glk_window_set_arrangement(winid_t win, glui32 method, glui32 size, winid_t keyw } g_return_if_fail(method == (method & (winmethod_DirMask | winmethod_DivisionMask))); g_return_if_fail(!(((method & winmethod_DivisionMask) == winmethod_Proportional) && size > 100)); + + ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); win->split_method = method; win->constraint_size = size; @@ -1177,6 +1243,10 @@ 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 */ g_mutex_lock(glk_data->arrange_lock); @@ -1194,6 +1264,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) { @@ -1211,4 +1282,3 @@ glk_window_move_cursor(winid_t win, glui32 xpos, glui32 ypos) gdk_threads_leave(); } -