X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fchimara-glk.c;h=3f5c71b91030cf738f114d1480287e920f7a7666;hb=0c809958984a54204a785cadc7db14d0a7cb45d7;hp=f7887a94a7485a5e434e2a3e8345f0d0d3539c22;hpb=db8dde85ef01518d74df205d083ba1fb501b21c9;p=rodin%2Fchimara.git

diff --git a/libchimara/chimara-glk.c b/libchimara/chimara-glk.c
index f7887a9..3f5c71b 100644
--- a/libchimara/chimara-glk.c
+++ b/libchimara/chimara-glk.c
@@ -2,16 +2,19 @@
 
 #include <math.h>
 #include <gtk/gtk.h>
-#include <glib/gi18n.h>
+#include <config.h>
+#include <glib/gi18n-lib.h>
 #include <gmodule.h>
 #include <pango/pango.h>
 #include "chimara-glk.h"
 #include "chimara-glk-private.h"
+#include "chimara-marshallers.h"
 #include "glk.h"
 #include "abort.h"
 #include "window.h"
 #include "glkstart.h"
 #include "glkunix.h"
+#include "init.h"
 
 #define CHIMARA_GLK_MIN_WIDTH 0
 #define CHIMARA_GLK_MIN_HEIGHT 0
@@ -56,6 +59,9 @@ enum {
 enum {
 	STOPPED,
 	STARTED,
+	CHAR_INPUT,
+	LINE_INPUT,
+	TEXT_BUFFER_OUTPUT,
 
 	LAST_SIGNAL
 };
@@ -76,6 +82,8 @@ chimara_glk_init(ChimaraGlk *self)
     priv->protect = FALSE;
 	priv->default_font_desc = pango_font_description_from_string("Sans");
 	priv->monospace_font_desc = pango_font_description_from_string("Monospace");
+	priv->css_file = "style.css";
+	priv->default_styles = g_hash_table_new(g_str_hash, g_str_equal);
     priv->program = NULL;
     priv->thread = NULL;
     priv->event_queue = NULL;
@@ -186,6 +194,7 @@ chimara_glk_finalize(GObject *object)
 	pango_font_description_free(priv->default_font_desc);
 	pango_font_description_free(priv->monospace_font_desc);
 	g_free(priv->current_dir);
+	g_hash_table_destroy(priv->default_styles);
 	
     G_OBJECT_CLASS(chimara_glk_parent_class)->finalize(object);
 }
@@ -540,6 +549,24 @@ chimara_glk_started(ChimaraGlk *self)
 	/* TODO: Add default signal handler implementation here */
 }
 
+static void
+chimara_glk_char_input(ChimaraGlk *self, guint window_rock, guint keysym)
+{
+	/* TODO: Add default signal handler */
+}
+
+static void
+chimara_glk_line_input(ChimaraGlk *self, guint window_rock, gchar *text)
+{
+	/* TODO: Add default signal handler */
+}
+
+static void
+chimara_glk_text_buffer_output(ChimaraGlk *self, guint window_rock, gchar *text)
+{
+	/* TODO: Add default signal handler */
+}
+
 /* G_PARAM_STATIC_STRINGS only appeared in GTK 2.13.0 */
 #ifndef G_PARAM_STATIC_STRINGS
 #define G_PARAM_STATIC_STRINGS (G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)
@@ -564,6 +591,9 @@ chimara_glk_class_init(ChimaraGlkClass *klass)
     /* Signals */
     klass->stopped = chimara_glk_stopped;
     klass->started = chimara_glk_started;
+    klass->char_input = chimara_glk_char_input;
+    klass->line_input = chimara_glk_line_input;
+    klass->text_buffer_output = chimara_glk_text_buffer_output;
     /**
      * ChimaraGlk::stopped:
      * @glk: The widget that received the signal
@@ -587,6 +617,24 @@ chimara_glk_class_init(ChimaraGlkClass *klass)
 		G_STRUCT_OFFSET(ChimaraGlkClass, started), NULL, NULL,
 		g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 
+	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,
+		G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
+
+	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,
+		G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
+
+	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,
+		G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
+
     /* Properties */
     /**
      * ChimaraGlk:interactive:
@@ -673,6 +721,9 @@ chimara_glk_class_init(ChimaraGlkClass *klass)
 GtkWidget *
 chimara_glk_new(void)
 {
+	/* This is a library entry point; initialize the library */
+	chimara_init();
+
     ChimaraGlk *self = CHIMARA_GLK(g_object_new(CHIMARA_TYPE_GLK, NULL));
     ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(self);
     
@@ -683,7 +734,7 @@ chimara_glk_new(void)
     priv->abort_lock = g_mutex_new();
 	priv->arrange_lock = g_mutex_new();
 	priv->rearranged = g_cond_new();
-    
+
     return GTK_WIDGET(self);
 }
 
@@ -1021,10 +1072,6 @@ chimara_glk_run(ChimaraGlk *glk, gchar *plugin, int argc, char *argv[], GError *
 		/* Set the program name */
 		startup->args.argv[0] = g_strdup(plugin);
     }
-
-	/* Initialize thread-private data */
-	extern GPrivate *glk_data_key;
-	glk_data_key = g_private_new(NULL);
 	startup->glk_data = priv;
 	
     /* Run in a separate thread */