#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);
+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);
+
+/* 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:
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);
}
/**
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);
}
/**
static void
text_grid_request_line_event_common(winid_t win, glui32 maxlen, gboolean insert, gchar *inserttext)
{
+ gdk_threads_enter();
+
GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(win->widget) );
GtkTextMark *cursor = gtk_text_buffer_get_mark(buffer, "cursor_position");
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();
}
/* Internal function: Request either latin-1 or unicode line input, in a text buffer window. */
static void
text_buffer_request_line_event_common(winid_t win, glui32 maxlen, gboolean insert, gchar *inserttext)
{
+ gdk_threads_enter();
+
GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(win->widget) );
/* Move the input_position mark to the end of the window_buffer */
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();
}
/**
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;
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;
*
* For convenience, it is legal to call glk_cancel_line_event() even if there
* is no line input request on that window. The event type will be set to
- * #evtype_None in this case.
+ * %evtype_None in this case.
*/
void
glk_cancel_line_event(winid_t win, event_t *event)
event->val2 = 0;
}
- if(win->input_request_type == INPUT_REQUEST_NONE)
+ if(win->input_request_type != INPUT_REQUEST_LINE && win->input_request_type != INPUT_REQUEST_LINE_UNICODE)
return;
g_signal_handler_block( G_OBJECT(win->widget), win->keypress_handler );
if(win->type == wintype_TextGrid) {
g_signal_handler_block( G_OBJECT(win->widget), win->keypress_handler );
- chars_written = flush_text_grid(win);
+ chars_written = finish_text_grid_line_input(win, FALSE);
} else if(win->type == wintype_TextBuffer) {
GtkTextBuffer *window_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(win->widget) );
g_signal_handler_block(window_buffer, win->insert_text_handler);
- chars_written = flush_text_buffer(win);
+ chars_written = finish_text_buffer_line_input(win, FALSE);
}
+ 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;
keycode = keycode_Unknown;
}
- event_throw(evtype_CharInput, win, keycode, 0);
-
+ ChimaraGlk *glk = CHIMARA_GLK(gtk_widget_get_ancestor(widget, CHIMARA_TYPE_GLK));
+ g_assert(glk);
+ event_throw(glk, evtype_CharInput, win, keycode, 0);
+ g_signal_emit_by_name(glk, "char-input", win->rock, event->keyval);
+
/* Only one keypress will be handled */
win->input_request_type = INPUT_REQUEST_NONE;
g_signal_handler_block( G_OBJECT(win->widget), win->keypress_handler );
/* Internal function: Retrieves the input of a TextBuffer window and stores it in the window buffer.
* Returns the number of characters written, suitable for inclusion in a line input event. */
static int
-flush_text_buffer(winid_t win)
+finish_text_buffer_line_input(winid_t win, gboolean emit_signal)
{
VALID_WINDOW(win, return 0);
g_return_val_if_fail(win->type == wintype_TextBuffer, 0);
gchar* inserted_text = gtk_text_buffer_get_text(window_buffer, &start_iter, &end_iter, FALSE);
int chars_written = write_to_window_buffer(win, inserted_text);
+ if(emit_signal)
+ {
+ ChimaraGlk *glk = CHIMARA_GLK(gtk_widget_get_ancestor(win->widget, CHIMARA_TYPE_GLK));
+ g_assert(glk);
+ g_signal_emit_by_name(glk, "line-input", win->rock, inserted_text);
+ }
g_free(inserted_text);
return chars_written;
/* Internal function: Retrieves the input of a TextGrid window and stores it in the window buffer.
* Returns the number of characters written, suitable for inclusion in a line input event. */
static int
-flush_text_grid(winid_t win)
+finish_text_grid_line_input(winid_t win, gboolean emit_signal)
{
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) );
g_free(text_to_insert);
int chars_written = write_to_window_buffer(win, text);
+ if(emit_signal)
+ {
+ ChimaraGlk *glk = CHIMARA_GLK(gtk_widget_get_ancestor(win->widget, CHIMARA_TYPE_GLK));
+ g_assert(glk);
+ g_signal_emit_by_name(glk, "line-input", win->rock, text);
+ }
g_free(text);
return chars_written;
/* Make the window uneditable again and retrieve the text that was input */
gtk_text_view_set_editable(GTK_TEXT_VIEW(win->widget), FALSE);
- int chars_written = flush_text_buffer(win);
- event_throw(evtype_LineInput, win, chars_written, 0);
+ int chars_written = finish_text_buffer_line_input(win, TRUE);
+ ChimaraGlk *glk = CHIMARA_GLK(gtk_widget_get_ancestor(win->widget, CHIMARA_TYPE_GLK));
+ event_throw(glk, evtype_LineInput, win, chars_written, 0);
}
}
{
g_signal_handler_block( G_OBJECT(win->widget), win->keypress_handler );
- int chars_written = flush_text_grid(win);
- event_throw(evtype_LineInput, win, chars_written, 0);
+ int chars_written = finish_text_grid_line_input(win, TRUE);
+ event_throw(CHIMARA_GLK(gtk_widget_get_ancestor(win->widget, CHIMARA_TYPE_GLK)), evtype_LineInput, win, chars_written, 0);
}
projects / rodin / chimara.git / blobdiff