X-Git-Url: https://git.stderr.nl/gitweb?p=rodin%2Fchimara.git;a=blobdiff_plain;f=libchimara%2Fchimara-glk.c;h=625460243e7caa9579e2b2138f29993b8464a2d9;hp=59f99ac8f4c9069b450d3f42c193667cdeb93f9d;hb=268cb7d6d08efc2fcbe52aa7b1e0d27ec19b6dc0;hpb=7e8eb7e80c6d900fc07412037d5b0a835d8ca1cd

diff --git a/libchimara/chimara-glk.c b/libchimara/chimara-glk.c
index 59f99ac..6254602 100644
--- a/libchimara/chimara-glk.c
+++ b/libchimara/chimara-glk.c
@@ -137,6 +137,7 @@ enum {
 	CHAR_INPUT,
 	LINE_INPUT,
 	TEXT_BUFFER_OUTPUT,
+	ILIAD_SCREEN_UPDATE,
 
 	LAST_SIGNAL
 };
@@ -155,8 +156,8 @@ chimara_glk_init(ChimaraGlk *self)
     priv->self = self;
     priv->interactive = TRUE;
     priv->protect = FALSE;
-	priv->default_styles = g_new0(StyleSet,1);
-	priv->current_styles = g_new0(StyleSet,1);
+	priv->styles = g_new0(StyleSet,1);
+	priv->glk_styles = g_new0(StyleSet,1);
 	priv->pager_attr_list = pango_attr_list_new();
 	priv->final_message = g_strdup("[ The game has finished ]");
 	priv->running = FALSE;
@@ -256,10 +257,10 @@ chimara_glk_finalize(GObject *object)
 	/* Free widget properties */
 	g_free(priv->final_message);
 	/* Free styles */
-	g_hash_table_destroy(priv->default_styles->text_buffer);
-	g_hash_table_destroy(priv->default_styles->text_grid);
-	g_hash_table_destroy(priv->current_styles->text_buffer);
-	g_hash_table_destroy(priv->current_styles->text_grid);
+	g_hash_table_destroy(priv->styles->text_buffer);
+	g_hash_table_destroy(priv->styles->text_grid);
+	g_hash_table_destroy(priv->glk_styles->text_buffer);
+	g_hash_table_destroy(priv->glk_styles->text_grid);
 	pango_attr_list_unref(priv->pager_attr_list);
 	
     /* Free the event queue */
@@ -687,6 +688,12 @@ chimara_glk_text_buffer_output(ChimaraGlk *self, guint window_rock, gchar *text)
 	/* Default signal handler */
 }
 
+static void
+chimara_glk_iliad_screen_update(ChimaraGlk *self, gboolean typing)
+{
+	/* Default signal handler */
+}
+
 /* COMPAT: G_PARAM_STATIC_STRINGS only appeared in GTK 2.13.0 */
 #ifndef G_PARAM_STATIC_STRINGS
 
@@ -722,6 +729,8 @@ chimara_glk_class_init(ChimaraGlkClass *klass)
     klass->char_input = chimara_glk_char_input;
     klass->line_input = chimara_glk_line_input;
     klass->text_buffer_output = chimara_glk_text_buffer_output;
+    klass->iliad_screen_update = chimara_glk_iliad_screen_update;
+
     /**
      * ChimaraGlk::stopped:
      * @glk: The widget that received the signal
@@ -768,7 +777,7 @@ chimara_glk_class_init(ChimaraGlkClass *klass)
 	chimara_glk_signals[CHAR_INPUT] = g_signal_new("char-input",
 		G_OBJECT_CLASS_TYPE(klass), 0,
 		G_STRUCT_OFFSET(ChimaraGlkClass, char_input), NULL, NULL,
-		chimara_marshal_VOID__UINT_UINT,
+		_chimara_marshal_VOID__UINT_UINT,
 		G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
 	/**
 	 * ChimaraGlk::line-input:
@@ -782,7 +791,7 @@ chimara_glk_class_init(ChimaraGlkClass *klass)
 	chimara_glk_signals[LINE_INPUT] = g_signal_new("line-input",
 		G_OBJECT_CLASS_TYPE(klass), 0,
 		G_STRUCT_OFFSET(ChimaraGlkClass, line_input), NULL, NULL,
-		chimara_marshal_VOID__UINT_STRING,
+		_chimara_marshal_VOID__UINT_STRING,
 		G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
 	/**
 	 * ChimaraGlk::text-buffer-output:
@@ -795,8 +804,22 @@ chimara_glk_class_init(ChimaraGlkClass *klass)
 	chimara_glk_signals[TEXT_BUFFER_OUTPUT] = g_signal_new("text-buffer-output",
 		G_OBJECT_CLASS_TYPE(klass), 0,
 		G_STRUCT_OFFSET(ChimaraGlkClass, text_buffer_output), NULL, NULL,
-		chimara_marshal_VOID__UINT_STRING,
+		_chimara_marshal_VOID__UINT_STRING,
 		G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
+	/**
+	 * ChimaraGlk::iliad-update-screen:
+	 * @self: The widget that received the signal
+	 * @typing: Whether to perform a typing or full screen update
+	 *
+	 * Iliad specific signal which is emitted whenever the screen needs to be updated.
+	 * Since iliad screen updates are very slow, updating should only be done when
+	 * necessary.
+	 */
+	chimara_glk_signals[ILIAD_SCREEN_UPDATE] = g_signal_new("iliad-screen-update",
+		G_OBJECT_CLASS_TYPE(klass), 0,
+		G_STRUCT_OFFSET(ChimaraGlkClass, iliad_screen_update), NULL, NULL,
+		_chimara_marshal_VOID__BOOLEAN,
+		G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 
     /* Properties */
     /**
@@ -1044,10 +1067,6 @@ chimara_glk_set_css_from_file(ChimaraGlk *glk, const gchar *filename, GError **e
 	scanner->input_name = filename;
 	scan_css_file(scanner, glk);
 
-	/* Set the current style to a copy of the default style */
-	/* FIXME this is not correct */
-	copy_default_styles_to_current_styles(glk);
-	
 	if(close(fd) == -1) {
 		*error = g_error_new(G_IO_ERROR, g_io_error_from_errno(errno),
 		    _("Error closing file \"%s\": %s"), filename, g_strerror(errno));
@@ -1076,10 +1095,6 @@ chimara_glk_set_css_from_string(ChimaraGlk *glk, const gchar *css)
 	g_scanner_input_text(scanner, css, strlen(css));
 	scanner->input_name = "<string>";
 	scan_css_file(scanner, glk);
-
-	/* Set the current style to a copy of the default style */
-	/* FIXME this is not correct */
-	copy_default_styles_to_current_styles(glk);
 }
 
 /**