win->line_input_buffer = NULL;
win->line_input_buffer_unicode = NULL;
+ /* Initialise the buffer */
+ win->buffer = g_string_sized_new(1024);
+
return win;
}
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);
win->disprock.ptr = NULL;
}
- g_node_destroy(win->window_node);
+ if(destroy_node)
+ g_node_destroy(win->window_node);
win->magic = MAGIC_FREE;
+
+ g_string_free(win->buffer, TRUE);
g_free(win);
}
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 );
+ 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->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 );
+ 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 );
+
/* 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);
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);