X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=src%2Fwindow.c;h=49936677c23dfca5f5a001507106aa7e73d548ee;hb=fed235e548376a8a2763405c4623fdf23f5c6529;hp=6ae9f554341092dd1ff75d19d05431708d3829a7;hpb=12101ebc37859ada0a4ad2088ff3ac288acb8274;p=rodin%2Fchimara.git diff --git a/src/window.c b/src/window.c index 6ae9f55..4993667 100644 --- a/src/window.c +++ b/src/window.c @@ -469,7 +469,8 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype, pair->rock = 0; pair->type = wintype_Pair; pair->window_node = g_node_new(pair); - pair->window_stream = NULL; + /* 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 */ @@ -509,37 +510,74 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype, gtk_widget_set_parent(win->frame, GTK_WIDGET(glk_data->self)); gtk_widget_queue_resize(GTK_WIDGET(glk_data->self)); + gdk_threads_leave(); + /* For text grid windows, wait until GTK draws the window (see note in glk_window_get_size() ), calculate the size and fill the buffer with blanks. */ if(wintype == wintype_TextGrid) { - while(win->widget->allocation.width == 1 && win->widget->allocation.height == 1) - { - /* Release the GDK lock momentarily */ - gdk_threads_leave(); - gdk_threads_enter(); - while(gtk_events_pending()) - gtk_main_iteration(); - } - win->width = (glui32)(win->widget->allocation.width / win->unit_width); - win->height = (glui32)(win->widget->allocation.height / win->unit_height); + /* Force the window to be drawn and cache its size */ + glk_window_get_size(win, NULL, NULL); - /* Mark the cursor position */ + /* Create the cursor position mark */ + gdk_threads_enter(); GtkTextIter begin; GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(win->widget) ); gtk_text_buffer_get_start_iter(buffer, &begin); gtk_text_buffer_create_mark(buffer, "cursor_position", &begin, TRUE); - - /* Fill the buffer with blanks and move the cursor to the upper left */ gdk_threads_leave(); + + /* Fill the buffer with blanks and move the cursor to the upper left */ glk_window_clear(win); - gdk_threads_enter(); } - gdk_threads_leave(); - return win; } +/* Internal function: destroy this window's GTK widgets, window streams, + and those of all its children */ +static void +destroy_windows_below(winid_t win, stream_result_t *result) +{ + switch(win->type) + { + case wintype_Blank: + gdk_threads_enter(); + gtk_widget_unparent(win->widget); + gdk_threads_leave(); + break; + + case wintype_TextGrid: + case wintype_TextBuffer: + gdk_threads_enter(); + gtk_widget_unparent(win->frame); + gdk_threads_leave(); + /* TODO: Cancel all input requests */ + break; + + case wintype_Pair: + destroy_windows_below(win->window_node->children->data, NULL); + destroy_windows_below(win->window_node->children->next->data, NULL); + break; + + default: + ILLEGAL_PARAM("Unknown window type: %u", win->type); + return; + } + stream_close_common(win->window_stream, result); +} + +/* Internal function: free the winid_t structure of this window and those of all its children */ +static void +free_winids_below(winid_t win) +{ + if(win->type == wintype_Pair) { + free_winids_below(win->window_node->children->data); + free_winids_below(win->window_node->children->next->data); + } + win->magic = MAGIC_FREE; + g_free(win); +} + /** * glk_window_close: * @win: Window to close. @@ -588,44 +626,23 @@ void glk_window_close(winid_t win, stream_result_t *result) { VALID_WINDOW(win, return); - - /* First close the window stream before trashing the window tree */ - stream_close_common(win->window_stream, result); - switch(win->type) - { - case wintype_Blank: - gdk_threads_enter(); - gtk_widget_unparent(win->widget); - gdk_threads_leave(); - break; + /* First close all the window streams and destroy the widgets of this window + and below, before trashing the window tree */ + destroy_windows_below(win, result); - case wintype_TextGrid: - case wintype_TextBuffer: - gdk_threads_enter(); - gtk_widget_unparent(win->frame); - gdk_threads_leave(); - /* TODO: Cancel all input requests */ - break; - - case wintype_Pair: - { - GNode *left = win->window_node->children; - GNode *right = win->window_node->children->next; - glk_window_close(left->data, NULL); - glk_window_close(right->data, NULL); - } - break; - - default: - ILLEGAL_PARAM("Unknown window type: %u", win->type); - return; + /* Then free the winid_t structures below this node, but not this one itself */ + if(win->type == wintype_Pair) { + free_winids_below(win->window_node->children->data); + free_winids_below(win->window_node->children->next->data); } - - /* Parent window changes from a split window into the sibling window */ + /* So now we should be left with a skeleton tree hanging off this node */ + + /* 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, or was not unhooked from the tree: */ + /* If win was not the root window: */ if(pair_node != NULL) { gboolean new_child_on_left = ( pair_node == g_node_first_sibling(pair_node) ); @@ -652,6 +669,10 @@ glk_window_close(winid_t win, stream_result_t *result) pair->magic = MAGIC_FREE; g_free(pair); + } + else /* it was the root window */ + { + glk_data->root_window = NULL; } win->magic = MAGIC_FREE; @@ -875,7 +896,20 @@ glk_window_get_size(winid_t win, glui32 *widthptr, glui32 *heightptr) break; case wintype_TextGrid: - /* The text grid caches its width and height */ + gdk_threads_enter(); + /* Wait for the window to be drawn, and then cache the width and height */ + while(win->widget->allocation.width == 1 && win->widget->allocation.height == 1) + { + /* Release the GDK lock momentarily */ + gdk_threads_leave(); + gdk_threads_enter(); + while(gtk_events_pending()) + gtk_main_iteration(); + } + win->width = (glui32)(win->widget->allocation.width / win->unit_width); + win->height = (glui32)(win->widget->allocation.height / win->unit_height); + gdk_threads_leave(); + if(widthptr != NULL) *widthptr = win->width; if(heightptr != NULL)