X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Finput.c;h=16673c977bc19fb04c81ffb8b32bf14248cda422;hb=6fea4d9d2b3cbe24bb760bbdeda5fefa3c74033b;hp=ddc41d8b216fe7ba14ccdc8359f1f41b2616fe66;hpb=02dacdfeec2bb204aff8dae862ece880c58f5e0c;p=rodin%2Fchimara.git

diff --git a/libchimara/input.c b/libchimara/input.c
index ddc41d8..16673c9 100644
--- a/libchimara/input.c
+++ b/libchimara/input.c
@@ -1,6 +1,7 @@
 #include "charset.h"
 #include "magic.h"
 #include "input.h"
+#include "pager.h"
 #include "chimara-glk-private.h"
 
 extern GPrivate *glk_data_key;
@@ -127,7 +128,11 @@ text_grid_request_line_event_common(winid_t win, glui32 maxlen, gboolean insert,
 	/* Make the entry as small as possible to fit with the text */
 	gtk_entry_set_has_frame(GTK_ENTRY(win->input_entry), FALSE);
 	GtkBorder border = { 0, 0, 0, 0 };
+
+	/* COMPAT: */
+#if GTK_CHECK_VERSION(2,10,0)
 	gtk_entry_set_inner_border(GTK_ENTRY(win->input_entry), &border);
+#endif
     gtk_entry_set_max_length(GTK_ENTRY(win->input_entry), win->input_length);
     gtk_entry_set_width_chars(GTK_ENTRY(win->input_entry), win->input_length);
 
@@ -289,6 +294,8 @@ glk_request_line_event_uni(winid_t win, glui32 *buf, glui32 maxlen, glui32 initl
 	if(glk_data->register_arr)
         win->buffer_rock = (*glk_data->register_arr)(buf, maxlen, "&+#!Iu");
 
+
+
 	win->input_request_type = INPUT_REQUEST_LINE_UNICODE;
 	win->line_input_buffer_unicode = buf;
 	win->line_input_buffer_max_len = maxlen;
@@ -413,6 +420,15 @@ on_shutdown_key_press_event(GtkWidget *widget, GdkEventKey *event, winid_t win)
 gboolean
 on_char_input_key_press_event(GtkWidget *widget, GdkEventKey *event, winid_t win)
 {
+	/* Ignore modifier keys, otherwise the char input will already trigger on 
+	the shift key when the user tries to type a capital letter */
+	if(event->is_modifier)
+		return FALSE; /* don't stop the event */
+
+	/* All text up to the input position is now regarded as being read by the user */
+	if(win->type == wintype_TextBuffer)
+		pager_update(win);
+	
 	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));
@@ -433,6 +449,8 @@ on_line_input_key_press_event(GtkWidget *widget, GdkEventKey *event, winid_t win
 	switch(win->type)
 	{
 		case wintype_TextBuffer:
+			/* All text up to the input position is now regarded as being read by the user */
+			pager_update(win);
 
 			/* History up/down */
 			if(event->keyval == GDK_Up || event->keyval == GDK_KP_Up
@@ -477,7 +495,7 @@ on_line_input_key_press_event(GtkWidget *widget, GdkEventKey *event, winid_t win
 				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);
+				gtk_text_buffer_insert_with_tags_by_name(buffer, &end, win->history_pos->data, -1, "default", "input", NULL);
 				g_signal_handler_unblock(buffer, win->insert_text_handler);
 				return TRUE;
 			}
@@ -894,7 +912,7 @@ force_line_input_from_queue(winid_t win, event_t *event)
 		/* Insert the forced input into the window */
 		gtk_text_buffer_get_end_iter(buffer, &end);
 		gchar *text_to_insert = g_strconcat(text, "\n", NULL);
-		gtk_text_buffer_insert_with_tags_by_name(buffer, &end, text_to_insert, -1, "input", NULL);
+		gtk_text_buffer_insert_with_tags_by_name(buffer, &end, text_to_insert, -1, "default", "input", NULL);
 		chars_written = finish_text_buffer_line_input(win, TRUE);
 	}
 	else if(win->type == wintype_TextGrid)