X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=src%2Fwindow.c;h=49936677c23dfca5f5a001507106aa7e73d548ee;hb=fed235e548376a8a2763405c4623fdf23f5c6529;hp=0cc7efa737f7c7998a7847995f0c455261ce927a;hpb=e66286d2dba385eef01ef1d45a57e4cf8a0df04f;p=rodin%2Fchimara.git diff --git a/src/window.c b/src/window.c index 0cc7efa..4993667 100644 --- a/src/window.c +++ b/src/window.c @@ -140,15 +140,6 @@ glk_window_get_root() return (winid_t)glk_data->root_window->data; } -/* Determine the size of a "0" character in pixels */ -static void -text_window_get_char_size(GtkWidget *textview, int *width, int *height) -{ - PangoLayout *zero = gtk_widget_create_pango_layout(textview, "0"); - pango_layout_get_pixel_size(zero, width, height); - g_object_unref(zero); -} - /** * glk_window_open: * @split: The window to split to create the new window. Must be 0 if there @@ -345,7 +336,7 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype, gdk_threads_enter(); - /* We only create one window and don't support any more than that */ + /* Create the new window */ winid_t win = g_new0(struct glk_window_struct, 1); win->magic = MAGIC_WINDOW; win->rock = rock; @@ -389,7 +380,12 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype, win->widget = textview; win->frame = scrolledwindow; - text_window_get_char_size( textview, &(win->unit_width), &(win->unit_height) ); + + /* 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_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); @@ -410,6 +406,8 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype, GtkWidget *textview = gtk_text_view_new(); GtkTextBuffer *textbuffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(textview) ); + gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(scrolledwindow), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC ); + gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW(textview), GTK_WRAP_WORD_CHAR ); gtk_text_view_set_editable( GTK_TEXT_VIEW(textview), FALSE ); @@ -421,7 +419,12 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype, win->widget = textview; win->frame = scrolledwindow; - text_window_get_char_size( textview, &(win->unit_width), &(win->unit_height) ); + + /* 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_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); @@ -462,14 +465,19 @@ 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; pair->type = wintype_Pair; pair->window_node = g_node_new(pair); - pair->unit_width = split->unit_width; - pair->unit_height = split->unit_height; - 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 */ + pair->key_window = win; + pair->split_method = method; + pair->constraint_size = size; + /* Insert the new window into the window tree */ if(split->window_node->parent == NULL) { @@ -478,92 +486,98 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype, g_node_append(split->window_node->parent, pair->window_node); g_node_unlink(split->window_node); } - - /* Keep track of the parent widget of the window that is being split */ - GtkWidget* old_parent = gtk_widget_get_parent(split->frame); - gtk_widget_ref(split->frame); - gtk_widget_unparent(split->frame); - /* Place the windows in the correct order */ switch(method & winmethod_DirMask) { case winmethod_Left: - pair->widget = gtk_hbox_new(FALSE, 0); - gtk_box_pack_end(GTK_BOX(pair->widget), split->frame, TRUE, TRUE, 0); - gtk_box_pack_end(GTK_BOX(pair->widget), win->frame, TRUE, TRUE, 0); - g_node_append(pair->window_node, split->window_node); - g_node_append(pair->window_node, win->window_node); - break; - case winmethod_Right: - pair->widget = gtk_hbox_new(FALSE, 0); - gtk_box_pack_end(GTK_BOX(pair->widget), win->frame, TRUE, TRUE, 0); - gtk_box_pack_end(GTK_BOX(pair->widget), split->frame, TRUE, TRUE, 0); - g_node_append(pair->window_node, win->window_node); - g_node_append(pair->window_node, split->window_node); - break; case winmethod_Above: - pair->widget = gtk_vbox_new(FALSE, 0); - gtk_box_pack_end(GTK_BOX(pair->widget), split->frame, TRUE, TRUE, 0); - gtk_box_pack_end(GTK_BOX(pair->widget), win->frame, TRUE, TRUE, 0); - g_node_append(pair->window_node, split->window_node); g_node_append(pair->window_node, win->window_node); + g_node_append(pair->window_node, split->window_node); break; + case winmethod_Right: case winmethod_Below: - pair->widget = gtk_vbox_new(FALSE, 0); - gtk_box_pack_end(GTK_BOX(pair->widget), win->frame, TRUE, TRUE, 0); - gtk_box_pack_end(GTK_BOX(pair->widget), split->frame, TRUE, TRUE, 0); - g_node_append(pair->window_node, win->window_node); g_node_append(pair->window_node, split->window_node); + g_node_append(pair->window_node, win->window_node); break; } - gtk_widget_unref(split->frame); - - /* TODO: set the new size of the windows */ - pair->frame = pair->widget; - gtk_widget_set_parent(pair->widget, old_parent); - gtk_widget_show(pair->widget); } else { /* Set the window as root window */ glk_data->root_window = win->window_node; - gtk_widget_set_parent(win->frame, GTK_WIDGET(glk_data->self)); - gtk_widget_queue_resize(GTK_WIDGET(glk_data->self)); } + /* Set the window as a child of the Glk widget */ + 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(); - - /* Apparently this only works after the window has been realized */ - gtk_text_view_set_overwrite( GTK_TEXT_VIEW(win->widget), TRUE ); } - 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. @@ -613,69 +627,60 @@ glk_window_close(winid_t win, stream_result_t *result) { VALID_WINDOW(win, return); - GNode* parent_node; - - gdk_threads_enter(); - - switch(win->type) - { - case wintype_Blank: - gtk_widget_destroy(win->widget); - 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: - gtk_widget_destroy(win->frame); - /* TODO: Cancel all input requests */ - break; - - case wintype_Pair: - { - GNode* left_child = g_node_first_child(win->window_node); - GNode* right_child = g_node_last_child(win->window_node); - - glk_window_close((winid_t) left_child->data, result); - glk_window_close((winid_t) right_child->data, result); - - gtk_widget_destroy(win->widget); - } - break; - - default: - ILLEGAL_PARAM("Unknown window type: %u", win->type); - gdk_threads_leave(); - 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); } - - stream_close_common(win->window_stream, result); - + /* 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 */ - if( (parent_node = win->window_node->parent) != NULL ) + /* 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) { - winid_t pair = (winid_t) parent_node->data; - if(parent_node->parent == NULL) + gboolean new_child_on_left = ( pair_node == g_node_first_sibling(pair_node) ); + GNode *sibling_node = pair_node->children; /* only one child left */ + GNode *new_parent_node = pair_node->parent; + g_node_unlink(pair_node); + g_node_unlink(sibling_node); + /* pair_node and sibling_node should now be totally unconnected to the tree */ + + if(new_parent_node == NULL) { - if(parent_node->next) - glk_data->root_window = parent_node->next; - else if(parent_node->prev) - glk_data->root_window = parent_node->prev; + glk_data->root_window = sibling_node; } else { - if(parent_node->next) - g_node_append(parent_node->parent, parent_node->next); - else if(parent_node->prev) - g_node_append(parent_node->parent, parent_node->prev); + if(new_child_on_left) + g_node_prepend(new_parent_node, sibling_node); + else + g_node_append(new_parent_node, sibling_node); } - g_node_unlink(parent_node); + winid_t pair = (winid_t) pair_node->data; + g_node_destroy(pair_node); + + pair->magic = MAGIC_FREE; g_free(pair); + } + else /* it was the root window */ + { + glk_data->root_window = NULL; } - g_node_destroy(win->window_node); win->magic = MAGIC_FREE; g_free(win); + /* Schedule a redraw */ + gdk_threads_enter(); + gtk_widget_queue_resize( GTK_WIDGET(glk_data->self) ); gdk_threads_leave(); } @@ -883,6 +888,7 @@ glk_window_get_size(winid_t win, glui32 *widthptr, glui32 *heightptr) switch(win->type) { case wintype_Blank: + case wintype_Pair: if(widthptr != NULL) *widthptr = 0; if(heightptr != NULL) @@ -890,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)