Fixed history recall bug

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

diff --git a/libchimara/input.c b/libchimara/input.c
index 86a9ff5f8e500b1a7807f5aa5e039d24d555b344..c740809a0f36c69a0b61e18f97bc5334ac8697de 100644 (file)
--- a/libchimara/input.c
+++ b/libchimara/input.c
@@ -8,15 +8,17 @@ extern GPrivate *glk_data_key;
 /* Forward declarations */
 static int finish_text_buffer_line_input(winid_t win, gboolean emit_signal);
 static int finish_text_grid_line_input(winid_t win, gboolean emit_signal);
+static void cancel_old_input_request(winid_t win);
 
 /* Internal function: code common to both flavors of char event request */
 void
 request_char_event_common(winid_t win, gboolean unicode)
 {
        VALID_WINDOW(win, return);
-       g_return_if_fail(win->input_request_type == INPUT_REQUEST_NONE);
        g_return_if_fail(win->type != wintype_TextBuffer || win->type != wintype_TextGrid);
 
+       cancel_old_input_request(win);
+
        flush_window_buffer(win);
 
        ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
@@ -26,9 +28,7 @@ request_char_event_common(winid_t win, gboolean unicode)
 
        gdk_threads_enter();
 
-       /* If the request is in a text buffer window, scroll to the end of the
-        text buffer. TODO: This may scroll text off the top of the window that the
-        user hasn't read yet. We need to implement a paging mechanism. */
+       /*
        if(win->type == wintype_TextBuffer)
        {
                GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(win->widget) );
@@ -36,8 +36,8 @@ request_char_event_common(winid_t win, gboolean unicode)
                gtk_text_buffer_get_end_iter(buffer, &iter);
                gtk_text_buffer_place_cursor(buffer, &iter);
                gtk_text_view_scroll_mark_onscreen(GTK_TEXT_VIEW(win->widget), gtk_text_buffer_get_insert(buffer));
-               /* Why doesn't this always work?? */
-       }
+               // Why doesn't this always work?? 
+       } */
 
        gtk_widget_grab_focus( GTK_WIDGET(win->widget) );
        gdk_threads_leave();
@@ -239,10 +239,11 @@ glk_request_line_event(winid_t win, char *buf, glui32 maxlen, glui32 initlen)
 {
        VALID_WINDOW(win, return);
        g_return_if_fail(buf);
-       g_return_if_fail(win->input_request_type == INPUT_REQUEST_NONE);
        g_return_if_fail(win->type != wintype_TextBuffer || win->type != wintype_TextGrid);
        g_return_if_fail(initlen <= maxlen);
 
+       cancel_old_input_request(win);
+
        ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
 
        /* Register the buffer */
@@ -293,10 +294,10 @@ glk_request_line_event_uni(winid_t win, glui32 *buf, glui32 maxlen, glui32 initl
 {
        VALID_WINDOW(win, return);
        g_return_if_fail(buf);
-       g_return_if_fail(win->input_request_type == INPUT_REQUEST_NONE);
        g_return_if_fail(win->type != wintype_TextBuffer || win->type != wintype_TextGrid);
        g_return_if_fail(initlen <= maxlen);
 
+       cancel_old_input_request(win);
        ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
 
        /* Register the buffer */
@@ -436,7 +437,7 @@ on_char_input_key_press_event(GtkWidget *widget, GdkEventKey *event, winid_t win
 
        /* Only one keypress will be handled */
        win->input_request_type = INPUT_REQUEST_NONE;
-       g_signal_handler_block( win->widget, win->char_input_keypress_handler );
+       g_signal_handler_block(win->widget, win->char_input_keypress_handler);
 
        return TRUE;
 }
@@ -447,10 +448,14 @@ on_line_input_key_press_event(GtkWidget *widget, GdkEventKey *event, winid_t win
        switch(win->type)
        {
                case wintype_TextBuffer:
+
+                       /* History up/down */
                        if(event->keyval == GDK_Up || event->keyval == GDK_KP_Up
                                || event->keyval == GDK_Down || event->keyval == GDK_KP_Down)
                        {
                                /* Prevent falling off the end of the history list */
+                               if(win->history == NULL)
+                                       return TRUE;
                                if( (event->keyval == GDK_Up || event->keyval == GDK_KP_Up)
                                        && win->history_pos && win->history_pos->next == NULL)
                                        return TRUE;
@@ -491,6 +496,33 @@ on_line_input_key_press_event(GtkWidget *widget, GdkEventKey *event, winid_t win
                                g_signal_handler_unblock(buffer, win->insert_text_handler);
                                return TRUE;
                        }
+
+                       /* Move to beginning/end of input field */
+                       else if(event->keyval == GDK_Home) {
+                               GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(win->widget));
+                               GtkTextIter input_iter;
+                               GtkTextMark *input_position = gtk_text_buffer_get_mark(buffer, "input_position");
+                               gtk_text_buffer_get_iter_at_mark(buffer, &input_iter, input_position);
+                               gtk_text_buffer_place_cursor(buffer, &input_iter);
+                               return TRUE;
+                       }
+                       else if(event->keyval == GDK_End) {
+                               GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(win->widget));
+                               GtkTextIter end_iter;
+                               gtk_text_buffer_get_end_iter(buffer, &end_iter);
+                               gtk_text_buffer_place_cursor(buffer, &end_iter);
+                               return TRUE;
+                       }
+
+                       /* Handle the enter key, which could occur in the middle of the sentence. */
+                       else if(event->keyval == GDK_Return || event->keyval == GDK_KP_Enter) {
+                               GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(win->widget));
+                               GtkTextIter end_iter;
+                               gtk_text_buffer_get_end_iter(buffer, &end_iter);
+                               gtk_text_buffer_place_cursor(buffer, &end_iter);
+                               return FALSE; 
+                       }
+
                        return FALSE;
 
                /* If this is a text grid window, then redirect the key press to the line input GtkEntry */
@@ -896,3 +928,25 @@ force_line_input_from_queue(winid_t win, event_t *event)
        event->val1 = chars_written;
        event->val2 = 0;
 }
+
+/*** Internal function: cancels any pending input requests on the window and presents a warning if not INPUT_REQUEST_NONE ***/
+void
+cancel_old_input_request(winid_t win)
+{
+       switch(win->input_request_type) {
+       case INPUT_REQUEST_NONE:
+               break; /* All is well */
+       case INPUT_REQUEST_CHARACTER:
+       case INPUT_REQUEST_CHARACTER_UNICODE:
+               glk_cancel_char_event(win);
+               WARNING("Cancelling pending char event");
+               break;
+       case INPUT_REQUEST_LINE:
+       case INPUT_REQUEST_LINE_UNICODE:
+               glk_cancel_line_event(win, NULL);
+               WARNING("Cancelling pending line event");
+               break;
+       default:
+               WARNING("Could not cancel pending input request: unknown input request");
+       }
+}