X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Finput.c;h=44334b40f660c9e6c9316508cace9541985438ba;hb=907b2c6900b3555a526a04cdc1bcb5a67321bd6a;hp=ab1eef52de587023d18f79cd14ec81fa5abcfb06;hpb=db8dde85ef01518d74df205d083ba1fb501b21c9;p=rodin%2Fchimara.git

diff --git a/libchimara/input.c b/libchimara/input.c
index ab1eef5..44334b4 100644
--- a/libchimara/input.c
+++ b/libchimara/input.c
@@ -1,11 +1,44 @@
 #include "charset.h"
 #include "magic.h"
 #include "input.h"
+#include "chimara-glk-private.h"
+
+extern GPrivate *glk_data_key;
 
 /* Forward declarations */
 static int flush_text_buffer(winid_t win);
 static int flush_text_grid(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);
+
+	win->input_request_type = unicode? INPUT_REQUEST_CHARACTER_UNICODE : INPUT_REQUEST_CHARACTER;
+	g_signal_handler_unblock( G_OBJECT(win->widget), win->keypress_handler );
+
+	gdk_threads_enter();
+	
+	/* If the request is in a text buffer window, scroll to the end of the
+	 text buffer. TODO: This may scroll text off the top of the window that the
+	 user hasn't read yet. We need to implement a paging mechanism. */
+	if(win->type == wintype_TextBuffer)
+	{
+		GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(win->widget) );
+		GtkTextIter iter;
+		gtk_text_buffer_get_end_iter(buffer, &iter);
+		gtk_text_buffer_place_cursor(buffer, &iter);
+		gtk_text_view_scroll_mark_onscreen(GTK_TEXT_VIEW(win->widget), gtk_text_buffer_get_insert(buffer));
+		/* Why doesn't this always work?? */
+	}
+	
+	gtk_widget_grab_focus( GTK_WIDGET(win->widget) );
+	gdk_threads_leave();
+}
+
 /** 
  * glk_request_char_event:
  * @win: A window to request char events from.
@@ -19,12 +52,7 @@ static int flush_text_grid(winid_t win);
 void
 glk_request_char_event(winid_t win)
 {
-	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);
-
-	win->input_request_type = INPUT_REQUEST_CHARACTER;
-	g_signal_handler_unblock( G_OBJECT(win->widget), win->keypress_handler );
+	request_char_event_common(win, FALSE);
 }
 
 /** 
@@ -37,12 +65,7 @@ glk_request_char_event(winid_t win)
 void
 glk_request_char_event_uni(winid_t win)
 {
-	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);
-
-	win->input_request_type = INPUT_REQUEST_CHARACTER_UNICODE;
-	g_signal_handler_unblock( G_OBJECT(win->widget), win->keypress_handler );
+	request_char_event_common(win, TRUE);
 }
 
 /**
@@ -128,6 +151,8 @@ text_grid_request_line_event_common(winid_t win, glui32 maxlen, gboolean insert,
     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 );
+
+	gtk_widget_grab_focus(win->input_entry);
 	
 	gdk_threads_leave();
 }
@@ -162,6 +187,8 @@ text_buffer_request_line_event_common(winid_t win, glui32 maxlen, gboolean inser
     
     gtk_text_view_set_editable(GTK_TEXT_VIEW(win->widget), TRUE);
     g_signal_handler_unblock(buffer, win->insert_text_handler);
+
+	gtk_widget_grab_focus(win->widget);
 	
 	gdk_threads_leave();
 }
@@ -200,6 +227,11 @@ glk_request_line_event(winid_t win, char* buf, glui32 maxlen, glui32 initlen)
 	g_return_if_fail(win->type != wintype_TextBuffer || win->type != wintype_TextGrid);
 	g_return_if_fail(initlen <= maxlen);
 
+	/* Register the buffer */
+	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+	if(glk_data->register_arr)
+        win->buffer_rock = (*glk_data->register_arr)(buf, maxlen, "&+#!Cn");
+	
 	win->input_request_type = INPUT_REQUEST_LINE;
 	win->line_input_buffer = buf;
 	win->line_input_buffer_max_len = maxlen;
@@ -244,6 +276,11 @@ glk_request_line_event_uni(winid_t win, glui32 *buf, glui32 maxlen, glui32 initl
 	g_return_if_fail(win->type != wintype_TextBuffer || win->type != wintype_TextGrid);
 	g_return_if_fail(initlen <= maxlen);
 
+	/* Register the buffer */
+	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+	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;
@@ -314,6 +351,15 @@ glk_cancel_line_event(winid_t win, event_t *event)
 		chars_written = flush_text_buffer(win);
 	}
 
+	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+	if(glk_data->unregister_arr) 
+	{
+		if(win->input_request_type == INPUT_REQUEST_LINE_UNICODE)
+			(*glk_data->unregister_arr)(win->line_input_buffer_unicode, win->line_input_buffer_max_len, "&+#!Iu", win->buffer_rock);
+		else
+        	(*glk_data->unregister_arr)(win->line_input_buffer, win->line_input_buffer_max_len, "&+#!Cn", win->buffer_rock);
+    }
+	
 	if(event != NULL && chars_written > 0) {
 		event->type = evtype_LineInput;
 		event->val1 = chars_written;
@@ -493,7 +539,7 @@ static int
 flush_text_grid(winid_t win)
 {
 	VALID_WINDOW(win, return 0);
-	g_return_val_if_fail(win->type == wintype_TextBuffer, 0);
+	g_return_val_if_fail(win->type == wintype_TextGrid, 0);
 
 	GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(win->widget) );
 	
@@ -554,6 +600,6 @@ on_input_entry_activate(GtkEntry *input_entry, winid_t win)
 	g_signal_handler_block( G_OBJECT(win->widget), win->keypress_handler );
 
 	int chars_written = flush_text_grid(win);
-	event_throw(CHIMARA_GLK(gtk_widget_get_ancestor(GTK_WIDGET(input_entry), CHIMARA_TYPE_GLK)), evtype_LineInput, win, chars_written, 0);
+	event_throw(CHIMARA_GLK(gtk_widget_get_ancestor(win->widget, CHIMARA_TYPE_GLK)), evtype_LineInput, win, chars_written, 0);
 }