- if( strchr(text, '\n') != NULL) {
- /* Make the window uneditable again and remove signal handlers */
- GtkTextBuffer *window_buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(window->widget));
- gtk_text_view_set_editable(GTK_TEXT_VIEW(window->widget), FALSE);
- g_signal_handler_block(window_buffer, window->insert_text_handler);
-
- /* Retrieve the text that was input */
- GtkTextMark *input_position = gtk_text_buffer_get_mark(window_buffer, "input_position");
- GtkTextIter start_iter;
- GtkTextIter end_iter;
- gtk_text_buffer_get_iter_at_mark(window_buffer, &start_iter, input_position);
- gtk_text_buffer_get_end_iter(window_buffer, &end_iter);
- gchar *inserted_text = gtk_text_buffer_get_text(window_buffer, &start_iter, &end_iter, FALSE);
-
-
- /* Convert the string from UTF-8 to Latin-1 or Unicode */
- if(window->input_request_type == INPUT_REQUEST_LINE) {
- GError *error = NULL;
- gchar *latin1;
- gsize bytes_written;
- latin1 = g_convert_with_fallback(inserted_text, -1, "ISO-8859-1", "UTF-8", "?", NULL, &bytes_written, &error);
- g_free(inserted_text);
-
- if(latin1 == NULL)
- {
- error_dialog(NULL, error, "Error during utf8->latin1 conversion: ");
- event_throw(evtype_LineInput, window, 0, 0);
- return;
- }
-
- /* Place input in the echo stream */
- if(window->echo_stream != NULL)
- glk_put_string_stream(window->echo_stream, latin1);
-
- /* Copy the string (but not the NULL at the end) */
- memcpy(window->line_input_buffer, latin1, MIN(window->line_input_buffer_max_len, bytes_written-1));
- g_free(latin1);
- event_throw(evtype_LineInput, window, MIN(window->line_input_buffer_max_len, bytes_written-1), 0);
- }
- else if(window->input_request_type == INPUT_REQUEST_LINE_UNICODE) {
- gunichar *unicode;
- glong items_written;
- unicode = g_utf8_to_ucs4_fast(inserted_text, -1, &items_written);
- g_free(inserted_text);
-
- if(unicode == NULL)
- {
- error_dialog(NULL, NULL, "Error during utf8->unicode conversion");
- event_throw(evtype_LineInput, window, 0, 0);
- return;
- }
-
- /* Place input in the echo stream */
- // TODO: fixme
- // if(window->echo_stream != NULL)
- // glk_put_string_stream_uni(window->echo_stream, unicode);
-
- /* Copy the string (but not the NULL at the end) */
- memcpy(window->line_input_buffer_unicode, unicode, MIN(window->line_input_buffer_max_len, items_written)*sizeof(gunichar));
- g_free(unicode);
- event_throw(evtype_LineInput, window, MIN(window->line_input_buffer_max_len, items_written), 0);
- }
- else {
- g_warning("%s: Wrong input request type.", __func__);
- }
-
- window->input_request_type = INPUT_REQUEST_NONE;
- }
+ GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(win->widget) );
+
+ gchar *text = g_strdup(gtk_entry_get_text(input_entry));
+ /* Move the focus back into the text view */
+ gtk_widget_grab_focus(win->widget);
+ /* Remove entry widget from text view */
+ /* Should be ok even though this is the widget's own signal handler */
+ gtk_container_remove( GTK_CONTAINER(win->widget), GTK_WIDGET(input_entry) );
+ win->input_entry = NULL;
+ /* Delete the child anchor */
+ GtkTextIter start, end;
+ gtk_text_buffer_get_iter_at_child_anchor(buffer, &start, win->input_anchor);
+ end = start;
+ gtk_text_iter_forward_char(&end); /* Point after the child anchor */
+ gtk_text_buffer_delete(buffer, &start, &end);
+ win->input_anchor = NULL;
+
+ gchar *spaces = g_strnfill(win->input_length - g_utf8_strlen(text, -1), ' ');
+ gchar *text_to_insert = g_strconcat(text, spaces, NULL);
+ g_free(spaces);
+ gtk_text_buffer_insert(buffer, &start, text_to_insert, -1);
+ g_free(text_to_insert);
+
+ g_signal_handler_block( G_OBJECT(win->widget), win->keypress_handler );
+
+ end_line_input_request(win, text);
+ g_free(text);