X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Finput.c;h=c35564593ec0a5d6990cb5d34901cb422f0a1ea7;hb=687ba0746c0fd8a954002e91a88feadf2fb12962;hp=86cbe34fd08657d98ca97af42412c5f65486554e;hpb=d5cba75653b3af23b3f071e8860053aba675e945;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/input.c b/libchimara/input.c
index 86cbe34..c355645 100644
--- a/libchimara/input.c
+++ b/libchimara/input.c
@@ -16,11 +16,13 @@ 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);
+
+	flush_window_buffer(win);
 	
 	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
 
 	win->input_request_type = unicode? INPUT_REQUEST_CHARACTER_UNICODE : INPUT_REQUEST_CHARACTER;
-	g_signal_handler_unblock( G_OBJECT(win->widget), win->keypress_handler );
+	g_signal_handler_unblock( G_OBJECT(win->widget), win->char_input_keypress_handler );
 
 	gdk_threads_enter();
 	
@@ -91,7 +93,7 @@ glk_cancel_char_event(winid_t win)
 	if(win->input_request_type == INPUT_REQUEST_CHARACTER || win->input_request_type == INPUT_REQUEST_CHARACTER_UNICODE)
 	{
 		win->input_request_type = INPUT_REQUEST_NONE;
-		g_signal_handler_block( G_OBJECT(win->widget), win->keypress_handler );
+		g_signal_handler_block( G_OBJECT(win->widget), win->char_input_keypress_handler );
 	}
 }
 
@@ -155,7 +157,7 @@ text_grid_request_line_event_common(winid_t win, glui32 maxlen, gboolean insert,
     gtk_widget_show(win->input_entry);
     gtk_text_view_add_child_at_anchor(GTK_TEXT_VIEW(win->widget), win->input_entry, win->input_anchor);
 	
-	g_signal_handler_unblock( G_OBJECT(win->widget), win->keypress_handler );
+	g_signal_handler_unblock( G_OBJECT(win->widget), win->char_input_keypress_handler );
 
 	gtk_widget_grab_focus(win->input_entry);
 	
@@ -166,6 +168,8 @@ text_grid_request_line_event_common(winid_t win, glui32 maxlen, gboolean insert,
 static void
 text_buffer_request_line_event_common(winid_t win, glui32 maxlen, gboolean insert, gchar *inserttext)
 {
+	flush_window_buffer(win);
+
 	gdk_threads_enter();
 	
 	GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(win->widget) );
@@ -351,12 +355,12 @@ glk_cancel_line_event(winid_t win, event_t *event)
 	if(win->input_request_type != INPUT_REQUEST_LINE && win->input_request_type != INPUT_REQUEST_LINE_UNICODE)
 		return;
 
-	g_signal_handler_block( G_OBJECT(win->widget), win->keypress_handler );
+	g_signal_handler_block( G_OBJECT(win->widget), win->char_input_keypress_handler );
 
 	int chars_written = 0;
 
 	if(win->type == wintype_TextGrid) {
-		g_signal_handler_block( G_OBJECT(win->widget), win->keypress_handler );
+		g_signal_handler_block( G_OBJECT(win->widget), win->char_input_keypress_handler );
 		chars_written = finish_text_grid_line_input(win, FALSE);
 	} else if(win->type == wintype_TextBuffer) {
 		GtkTextBuffer *window_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(win->widget) );
@@ -381,31 +385,8 @@ glk_cancel_line_event(winid_t win, event_t *event)
 
 /* Internal function: General callback for signal key-press-event on a text buffer or text grid window. Used in character input on both text buffers and grids, and also in line input on grids, to redirect keystrokes to the line input field. Blocked when not in use. */
 gboolean
-on_window_key_press_event(GtkWidget *widget, GdkEventKey *event, winid_t win)
+on_char_input_key_press_event(GtkWidget *widget, GdkEventKey *event, winid_t win)
 {
-	/* If this is a text grid window, and line input is active, then redirect the key press to the line input GtkEntry */
-	if( win->type == wintype_TextGrid && (win->input_request_type == INPUT_REQUEST_LINE || win->input_request_type == INPUT_REQUEST_LINE_UNICODE) )
-	{
-		if(event->keyval == GDK_Up || event->keyval == GDK_KP_Up
-		    || event->keyval == GDK_Down || event->keyval == GDK_KP_Down
-		    || event->keyval == GDK_Left || event->keyval == GDK_KP_Left
-		    || event->keyval == GDK_Right || event->keyval == GDK_KP_Right
-		    || event->keyval == GDK_Tab || event->keyval == GDK_KP_Tab
-		    || event->keyval == GDK_Page_Up || event->keyval == GDK_KP_Page_Up
-		    || event->keyval == GDK_Page_Down || event->keyval == GDK_KP_Page_Down
-		    || event->keyval == GDK_Home || event->keyval == GDK_KP_Home
-		    || event->keyval == GDK_End || event->keyval == GDK_KP_End)
-			return FALSE; /* Don't redirect these keys */
-		gtk_widget_grab_focus(win->input_entry);
-		gtk_editable_set_position(GTK_EDITABLE(win->input_entry), -1);
-		gboolean retval = TRUE;
-		g_signal_emit_by_name(win->input_entry, "key-press-event", event, &retval);
-		return retval; /* Block this key event if the entry handled it */
-	}
-	if(win->input_request_type != INPUT_REQUEST_CHARACTER && 
-		win->input_request_type != INPUT_REQUEST_CHARACTER_UNICODE)
-		return FALSE;
-
 	glui32 keycode = keyval_to_glk_keycode(event->keyval, win->input_request_type == INPUT_REQUEST_CHARACTER_UNICODE);
 
 	ChimaraGlk *glk = CHIMARA_GLK(gtk_widget_get_ancestor(widget, CHIMARA_TYPE_GLK));
@@ -415,11 +396,86 @@ on_window_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( G_OBJECT(win->widget), win->keypress_handler );
+	g_signal_handler_block( G_OBJECT(win->widget), win->char_input_keypress_handler );
 
 	return TRUE;
 }
 
+gboolean
+on_line_input_key_press_event(GtkWidget *widget, GdkEventKey *event, winid_t win)
+{
+	switch(win->type)
+	{
+		case wintype_TextBuffer:
+			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( (event->keyval == GDK_Up || event->keyval == GDK_KP_Up)
+					&& win->history_pos && win->history_pos->next == NULL)
+					return TRUE;
+				if( (event->keyval == GDK_Down || event->keyval == GDK_KP_Down)
+					&& (win->history_pos == NULL || win->history_pos->prev == NULL) )
+					return TRUE;
+			
+				GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(win->widget));
+				GtkTextIter start, end;
+				/* Erase any text that was already typed */
+				GtkTextMark *input_position = gtk_text_buffer_get_mark(buffer, "input_position");
+				gtk_text_buffer_get_iter_at_mark(buffer, &start, input_position);
+				gtk_text_buffer_get_end_iter(buffer, &end);
+				
+				if(win->history_pos == NULL) {
+					gchar *current_input = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
+					win->history = g_list_prepend(win->history, current_input);
+					win->history_pos = win->history;
+				}
+				
+				gtk_text_buffer_delete(buffer, &start, &end);
+		
+				if(event->keyval == GDK_Up || event->keyval == GDK_KP_Up)
+				{
+					if(win->history_pos)
+						win->history_pos = g_list_next(win->history_pos);
+					else
+						win->history_pos = win->history;
+				}
+				else /* down */
+					win->history_pos = g_list_previous(win->history_pos);
+		
+				/* Insert the history item into the window */
+				gtk_text_buffer_get_end_iter(buffer, &end);
+				
+				g_signal_handler_block(buffer, win->insert_text_handler);
+				gtk_text_buffer_insert_with_tags_by_name(buffer, &end, win->history_pos->data, -1, "input", NULL);
+				g_signal_handler_unblock(buffer, win->insert_text_handler);
+				return TRUE;
+			}
+			return FALSE;
+
+		/* If this is a text grid window, then redirect the key press to the line input GtkEntry */
+		case wintype_TextGrid:
+		{
+			if(event->keyval == GDK_Up || event->keyval == GDK_KP_Up
+				|| event->keyval == GDK_Down || event->keyval == GDK_KP_Down
+				|| event->keyval == GDK_Left || event->keyval == GDK_KP_Left
+				|| event->keyval == GDK_Right || event->keyval == GDK_KP_Right
+				|| event->keyval == GDK_Tab || event->keyval == GDK_KP_Tab
+				|| event->keyval == GDK_Page_Up || event->keyval == GDK_KP_Page_Up
+				|| event->keyval == GDK_Page_Down || event->keyval == GDK_KP_Page_Down
+				|| event->keyval == GDK_Home || event->keyval == GDK_KP_Home
+				|| event->keyval == GDK_End || event->keyval == GDK_KP_End)
+				return FALSE; /* Don't redirect these keys */
+			gtk_widget_grab_focus(win->input_entry);
+			gtk_editable_set_position(GTK_EDITABLE(win->input_entry), -1);
+			gboolean retval = TRUE;
+			g_signal_emit_by_name(win->input_entry, "key-press-event", event, &retval);
+			return retval; /* Block this key event if the entry handled it */
+		}
+	}
+	return FALSE;
+}
+
 /* Internal function: finish handling a line input request, for both text grid and text buffer windows. */
 static int
 write_to_window_buffer(winid_t win, const gchar *inserted_text)
@@ -499,6 +555,18 @@ finish_text_buffer_line_input(winid_t win, gboolean emit_signal)
 		g_assert(glk);
 		g_signal_emit_by_name(glk, "line-input", win->rock, inserted_text);
 	}
+	
+	/* Add the text to the window input history */
+	if(win->history_pos != NULL)
+	{
+		g_free(win->history->data);
+		win->history = g_list_delete_link(win->history, win->history);
+	}
+	if(*inserted_text != 0)
+		win->history = g_list_prepend(win->history, g_strdup(inserted_text));	
+	
+	win->history_pos = NULL;
+	
 	g_free(inserted_text);
 
 	return chars_written;
@@ -555,6 +623,13 @@ pasted into the window. */
 void
 after_window_insert_text(GtkTextBuffer *textbuffer, GtkTextIter *location, gchar *text, gint len, winid_t win) 
 {
+	/* Set the history position to NULL and erase the text we were already editing */
+	if(win->history_pos != NULL)
+	{
+		g_free(win->history->data);
+		win->history = g_list_delete_link(win->history, win->history);
+		win->history_pos = NULL;
+	}
 	if( strchr(text, '\n') != NULL ) 
 	{
 		/* Remove signal handlers */
@@ -575,7 +650,7 @@ in a text grid window. */
 void
 on_input_entry_activate(GtkEntry *input_entry, winid_t win)
 {
-	g_signal_handler_block(win->widget, win->keypress_handler);
+	g_signal_handler_block(win->widget, win->char_input_keypress_handler);
 
 	int chars_written = finish_text_grid_line_input(win, TRUE);
 	ChimaraGlk *glk = CHIMARA_GLK(gtk_widget_get_ancestor(win->widget, CHIMARA_TYPE_GLK));
@@ -693,7 +768,7 @@ force_line_input_from_queue(winid_t win, event_t *event)
 	else if(win->type == wintype_TextGrid)
 	{
 		/* Remove signal handlers so the line input doesn't get picked up again */
-		g_signal_handler_block(win->widget, win->keypress_handler);
+		g_signal_handler_block(win->widget, win->char_input_keypress_handler);
 		
 		/* Insert the forced input into the window */
 		gtk_entry_set_text(GTK_ENTRY(win->input_entry), text);