From: fliep <fliep@ddfedd41-794f-dd11-ae45-00112f111e67>
Date: Sun, 2 May 2010 20:00:18 +0000 (+0000)
Subject: Frotz now compiled to use Gargoyle extensions
X-Git-Tag: v0.9~206
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=30a24d6641c2e4a7c73c07c6d9f1b1dc8f074628;p=projects%2Fchimara%2Fchimara.git

Frotz now compiled to use Gargoyle extensions
---

diff --git a/interpreters/frotz/glkfrotz.h b/interpreters/frotz/glkfrotz.h
index 54747b1..85b2222 100644
--- a/interpreters/frotz/glkfrotz.h
+++ b/interpreters/frotz/glkfrotz.h
@@ -35,6 +35,7 @@
 #include <time.h>
 
 #include "glk.h"
+#include <libchimara/garglk.h>
 
 extern int curr_status_ht;
 extern int mach_status_ht;
diff --git a/libchimara/input.c b/libchimara/input.c
index 8b6d4c2..4bb9264 100644
--- a/libchimara/input.c
+++ b/libchimara/input.c
@@ -417,6 +417,9 @@ on_shutdown_key_press_event(GtkWidget *widget, GdkEventKey *event, winid_t win)
 gboolean
 on_char_input_key_press_event(GtkWidget *widget, GdkEventKey *event, winid_t win)
 {
+	if(event->is_modifier)
+		return FALSE; /* don't stop the event */
+	
 	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));
diff --git a/libchimara/strio.c b/libchimara/strio.c
index bac3153..f668cb9 100644
--- a/libchimara/strio.c
+++ b/libchimara/strio.c
@@ -258,6 +258,7 @@ write_buffer_to_stream_uni(strid_t str, glui32 *buf, glui32 len)
 			if(str->unicode && str->ubuffer)
 			{
 				int copycount = MIN(len, str->buflen - str->mark);
+				g_printerr("Attempting to copy %d units; %d units of space left in buffer\n", len, str->buflen - str->mark);
 				memmove(str->ubuffer + str->mark, buf, copycount * sizeof(glui32));
 				str->mark += copycount;
 			}
@@ -265,6 +266,7 @@ write_buffer_to_stream_uni(strid_t str, glui32 *buf, glui32 len)
 			{
 				gchar *latin1 = convert_ucs4_to_latin1_binary(buf, len);
 				int copycount = MIN(len, str->buflen - str->mark);
+				g_printerr("Attempting to copy %d units; %d units of space left in buffer\n", len, str->buflen - str->mark);
 				memmove(str->buffer + str->mark, latin1, copycount);
 				g_free(latin1);
 				str->mark += copycount;