X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Finput.c;h=96b6353f96f4b4fb9de6eff5dcb762020d4b64c7;hb=bdb0212e5a713122e189704fdcfa46cc1e1be2e1;hp=9e7eea0cf533242cc7ccbc15f0ed82beefe9385c;hpb=4b0bbd6bb235b4cad89d321cdd7f570610a97712;p=rodin%2Fchimara.git

diff --git a/libchimara/input.c b/libchimara/input.c
index 9e7eea0..96b6353 100644
--- 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);
@@ -239,10 +241,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 +296,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 */
@@ -368,6 +371,7 @@ glk_cancel_line_event(winid_t win, event_t *event)
 
 	int chars_written = 0;
 
+	gdk_threads_enter();
 	if(win->type == wintype_TextGrid) {
 		chars_written = finish_text_grid_line_input(win, FALSE);
 	} else if(win->type == wintype_TextBuffer) {
@@ -376,6 +380,7 @@ glk_cancel_line_event(winid_t win, event_t *event)
 		g_signal_handler_block(window_buffer, win->insert_text_handler);
 		chars_written = finish_text_buffer_line_input(win, FALSE);
 	}
+	gdk_threads_leave();
 
 	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
 	if(glk_data->unregister_arr)
@@ -434,7 +439,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;
 }
@@ -445,6 +450,8 @@ 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)
 			{
@@ -489,6 +496,24 @@ 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;
+			}
+
 			return FALSE;
 
 		/* If this is a text grid window, then redirect the key press to the line input GtkEntry */
@@ -894,3 +919,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");
+	}
+}