X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fwindow.c;h=a31bed1b251f7b749d82a325a2b058c599bd4b93;hb=f5361c37bf7265628802787ea90164bab8108d3a;hp=b3995f09189b8234982a3df80977ef9114f487b8;hpb=92895be4421d350eb674093c1789d8703c2d8f94;p=rodin%2Fchimara.git diff --git a/libchimara/window.c b/libchimara/window.c index b3995f0..a31bed1 100644 --- a/libchimara/window.c +++ b/libchimara/window.c @@ -31,6 +31,9 @@ window_new_common(glui32 rock) win->line_input_buffer = NULL; win->line_input_buffer_unicode = NULL; + /* Initialise the buffer */ + win->buffer = g_string_sized_new(1024); + return win; } @@ -48,6 +51,8 @@ window_close_common(winid_t win, gboolean destroy_node) if(destroy_node) g_node_destroy(win->window_node); win->magic = MAGIC_FREE; + + g_string_free(win->buffer, TRUE); g_free(win); } @@ -482,6 +487,10 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype, 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); } @@ -520,9 +529,14 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype, 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);