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)
+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;
}
-
- g_node_destroy(win->window_node);
- win->magic = MAGIC_FREE;
- g_free(win);
+
+ if(destroy_node)
+ g_node_destroy(win->window_node);
+
+ trash_window_thread_independent(glk_data, win);
}
/**
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);
/* 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;
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);
+
+ 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);
free_winids_below(win->window_node->children->data);
free_winids_below(win->window_node->children->next->data);
}
- window_close_common(win);
+ window_close_common(win, FALSE);
}
/**
g_node_append(new_parent_node, sibling_node);
}
- window_close_common( (winid_t) pair_node->data );
+ window_close_common( (winid_t) pair_node->data, TRUE);
}
else /* it was the root window */
{
glk_data->root_window = NULL;
}
- window_close_common(win);
+ window_close_common(win, FALSE);
/* Schedule a redraw */
g_mutex_lock(glk_data->arrange_lock);
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 */
ypos += xpos / win->width;
xpos %= win->width;
}
+
/* Go to the end if the cursor is moved off the bottom edge */
if(ypos >= win->height)
{
projects / rodin / chimara.git / blobdiff