X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=src%2Finput.c;h=7eebfa596ac2e85324cb8c2917ec80d15dded6e5;hb=e47eebee2f127d0c1d4825d9bdc41471b6d7f3c1;hp=22f321cc1488a672ea66078cf56296989febd8c1;hpb=39b042ec7971c1a0ca083ac46a094e18ac24eed2;p=rodin%2Fchimara.git

diff --git a/src/input.c b/src/input.c
index 22f321c..7eebfa5 100644
--- a/src/input.c
+++ b/src/input.c
@@ -236,10 +236,20 @@ on_window_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) )
 	{
-		gboolean retval = TRUE;
-		g_signal_emit_by_name(win->input_entry, "key-press-event", event, &retval);
+		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 && 
@@ -368,7 +378,10 @@ end_line_input_request(winid_t win, const gchar *inserted_text)
 }
 
 /* Internal function: Callback for signal insert-text on a text buffer window.
-Runs after the default handler has already inserted the text.*/
+Runs after the default handler has already inserted the text.
+FIXME: This function assumes that newline was the last character typed into the
+window. That assumption is wrong if, for example, text containing a newline was
+pasted into the window. */
 void
 after_window_insert_text(GtkTextBuffer *textbuffer, GtkTextIter *location, gchar *text, gint len, winid_t win) 
 {
@@ -386,6 +399,7 @@ after_window_insert_text(GtkTextBuffer *textbuffer, GtkTextIter *location, gchar
         GtkTextMark *input_position = gtk_text_buffer_get_mark(window_buffer, "input_position");
         gtk_text_buffer_get_iter_at_mark(window_buffer, &start_iter, input_position);
         gtk_text_buffer_get_end_iter(window_buffer, &end_iter);
+		gtk_text_iter_backward_cursor_position(&end_iter); /* don't include \n */
         
         inserted_text = gtk_text_buffer_get_text(window_buffer, &start_iter, &end_iter, FALSE);