X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Finput.c;h=648f44f03ae0a16c880071d433ec0093844ad123;hb=0edb4482f7a5d5de3b2fe82ad9a4b977eacb8721;hp=a2e0e4a8bd49d88d0f017a1efda711c4569b4b0a;hpb=603af762db13e7b95a7c0931e7178ce44ff8ee21;p=rodin%2Fchimara.git diff --git a/libchimara/input.c b/libchimara/input.c index a2e0e4a..648f44f 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; @@ -8,15 +9,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); @@ -25,20 +28,6 @@ request_char_event_common(winid_t win, gboolean unicode) g_signal_handler_unblock( win->widget, win->char_input_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(); @@ -139,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); @@ -193,9 +186,6 @@ text_buffer_request_line_event_common(winid_t win, glui32 maxlen, gboolean inser gtk_text_buffer_get_end_iter(buffer, &end_iter); /* update after text insertion */ } - /* Scroll to input point */ - gtk_text_view_scroll_mark_onscreen(GTK_TEXT_VIEW(win->widget), input_position); - /* Apply the correct style to the input prompt */ GtkTextIter input_iter; gtk_text_buffer_get_iter_at_mark(buffer, &input_iter, input_position); @@ -239,10 +229,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,16 +284,18 @@ 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 */ 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; @@ -368,6 +361,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 +370,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) @@ -392,10 +387,48 @@ glk_cancel_line_event(winid_t win, event_t *event) } } +/* Helper function: Turn off shutdown key-press-event signal handler */ +static gboolean +turn_off_handler(GNode *node) +{ + winid_t win = node->data; + g_signal_handler_block(win->widget, win->shutdown_keypress_handler); + return FALSE; /* don't stop */ +} + +/* Internal function: Callback for signal key-press-event while waiting for shutdown. */ +gboolean +on_shutdown_key_press_event(GtkWidget *widget, GdkEventKey *event, winid_t win) +{ + ChimaraGlk *glk = CHIMARA_GLK(gtk_widget_get_ancestor(widget, CHIMARA_TYPE_GLK)); + g_assert(glk); + CHIMARA_GLK_USE_PRIVATE(glk, priv); + + /* Turn off all the signal handlers */ + if(priv->root_window) + g_node_traverse(priv->root_window, G_IN_ORDER, G_TRAVERSE_LEAVES, -1, (GNodeTraverseFunc)turn_off_handler, NULL); + + /* Signal the Glk library that it can shut everything down now */ + g_mutex_lock(priv->shutdown_lock); + g_cond_signal(priv->shutdown_key_pressed); + g_mutex_unlock(priv->shutdown_lock); + + return TRUE; /* block the event */ +} + /* Internal function: General callback for signal key-press-event on a text buffer or text grid window. Used in character input on both text buffers and grids. Blocked when not in use. */ 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)); @@ -405,7 +438,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; } @@ -416,10 +449,16 @@ 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 || event->keyval == GDK_Down || event->keyval == GDK_KP_Down) { /* Prevent falling off the end of the history list */ + if(win->history == NULL) + return TRUE; if( (event->keyval == GDK_Up || event->keyval == GDK_KP_Up) && win->history_pos && win->history_pos->next == NULL) return TRUE; @@ -460,6 +499,33 @@ 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; + } + + /* Handle the enter key, which could occur in the middle of the sentence. */ + else if(event->keyval == GDK_Return || event->keyval == GDK_KP_Enter) { + 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 FALSE; + } + return FALSE; /* If this is a text grid window, then redirect the key press to the line input GtkEntry */ @@ -865,3 +931,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"); + } +}