Special Portal commit

[rodin/chimara.git] / libchimara / window.c

diff --git a/libchimara/window.c b/libchimara/window.c
index 7dd14c7b3d53d6e22e7538d2eadea855469c0e92..8e83b9d194f92c080bcef3020bcd721785297f34 100644 (file)
--- 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, 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 );
@@ -479,6 +490,13 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
                        /* 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 );
+
+                       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;
                
@@ -515,14 +533,19 @@ 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);
 
-                       /* 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 +679,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 +793,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);
@@ -1126,6 +1149,7 @@ glk_window_get_size(winid_t win, glui32 *widthptr, glui32 *heightptr)
 void
 glk_window_set_arrangement(winid_t win, glui32 method, glui32 size, winid_t keywin)
 {
+       printf("set_arrangement(%d)\n", size);
        VALID_WINDOW(win, return);
        VALID_WINDOW_OR_NULL(keywin, return);
        g_return_if_fail(win->type == wintype_Pair);
@@ -1213,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 */
@@ -1231,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)
        {