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

diff --git a/libchimara/input.c b/libchimara/input.c
index 43ed045..16673c9 100644
--- a/libchimara/input.c
+++ b/libchimara/input.c
@@ -33,12 +33,6 @@ request_char_event_common(winid_t win, gboolean unicode)
 
 	/* Emit the "waiting" signal to let listeners know we are ready for input */
 	g_signal_emit_by_name(glk_data->self, "waiting");
-
-	/* Schedule a check for the pager */
-	/*
-	if(win->type == wintype_TextBuffer)
-		g_idle_add(pager_check, win);
-	*/
 }
 
 /**
@@ -203,11 +197,6 @@ text_buffer_request_line_event_common(winid_t win, glui32 maxlen, gboolean inser
 	gtk_widget_grab_focus(win->widget);
 
 	gdk_threads_leave();
-
-	/* Schedule a check for the pager */
-	/*
-		g_idle_add(pager_check, win);
-		*/
 }
 
 /**
@@ -435,6 +424,10 @@ on_char_input_key_press_event(GtkWidget *widget, GdkEventKey *event, winid_t win
 	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);
 
@@ -456,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
@@ -500,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;
 			}
@@ -917,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)