X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;ds=sidebyside;f=libchimara%2Fwindow.c;h=cbfc9862e8911f37f2e2c27ca2f3dfb4adafc7e3;hb=19db05f34fdd08fa2f2ae14890abe9752f0b0263;hp=53f264dc91200ebdfcce700dfdc7db822d2d3b2b;hpb=1d19cdbaca8b7cd239cd5d1e1f650bd48fa37bee;p=projects%2Fchimara%2Fchimara.git
diff --git a/libchimara/window.c b/libchimara/window.c
index 53f264d..cbfc986 100644
--- a/libchimara/window.c
+++ b/libchimara/window.c
@@ -30,12 +30,16 @@ window_new_common(glui32 rock)
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);
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);
@@ -45,8 +49,14 @@ window_close_common(winid_t win)
win->disprock.ptr = NULL;
}
- g_node_destroy(win->window_node);
+ if(destroy_node)
+ g_node_destroy(win->window_node);
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_free(win);
}
@@ -458,6 +468,7 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
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 );
@@ -477,8 +488,15 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
/* 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( G_OBJECT(textview), "key-press-event", G_CALLBACK(on_char_input_key_press_event), win );
+ g_signal_handler_block( G_OBJECT(textview), win->char_input_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);
}
break;
@@ -512,17 +530,23 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
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( G_OBJECT(textview), "key-press-event", G_CALLBACK(on_char_input_key_press_event), win );
+ g_signal_handler_block( G_OBJECT(textview), win->char_input_keypress_handler );
+ win->line_input_keypress_handler = g_signal_connect( G_OBJECT(textview), "key-press-event", G_CALLBACK(on_line_input_key_press_event), win );
+
+ 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);
- /* Create the default styles available to the window stream */
+ /* Create the styles available to the window stream */
style_init_textbuffer(textbuffer);
/* Mark the position where the user will input text */
@@ -656,7 +680,7 @@ free_winids_below(winid_t win)
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);
}
/**
@@ -770,14 +794,14 @@ glk_window_close(winid_t win, stream_result_t *result)
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);
@@ -895,17 +919,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);
}
/**
@@ -1204,6 +1237,8 @@ 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 */
@@ -1222,6 +1257,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)
{