projects
/
projects
/
chimara
/
chimara.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Restored support for cancel_line_input_request on a textgrid
[projects/chimara/chimara.git]
/
src
/
strio.c
diff --git
a/src/strio.c
b/src/strio.c
index 4517b38dec72e9122f08969bc766c313e7e9f093..e30d52bdda39638a6eb1529e0c974b065cb8a695 100644
(file)
--- a/
src/strio.c
+++ b/
src/strio.c
@@
-17,6
+17,12
@@
static void
write_utf8_to_grid(winid_t win, gchar *s)
{
static void
write_utf8_to_grid(winid_t win, gchar *s)
{
+ if(win->input_request_type == INPUT_REQUEST_LINE || win->input_request_type == INPUT_REQUEST_LINE_UNICODE)
+ {
+ ILLEGAL("Tried to print to a text grid window with line input pending.");
+ return;
+ }
+
/* Number of characters to insert */
glong length = g_utf8_strlen(s, -1);
glong chars_left = length;
/* Number of characters to insert */
glong length = g_utf8_strlen(s, -1);
glong chars_left = length;
@@
-59,6
+65,12
@@
write_utf8_to_grid(winid_t win, gchar *s)
static void
write_utf8_to_window(winid_t win, gchar *s)
{
static void
write_utf8_to_window(winid_t win, gchar *s)
{
+ if(win->input_request_type == INPUT_REQUEST_LINE || win->input_request_type == INPUT_REQUEST_LINE_UNICODE)
+ {
+ ILLEGAL("Tried to print to a text buffer window with line input pending.");
+ return;
+ }
+
gdk_threads_enter();
GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(win->widget) );
gdk_threads_enter();
GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(win->widget) );