Implemented the signals 'char-input', 'line-input', and 'text-buffer-output' on the...

[rodin/chimara.git] / libchimara / chimara-glk.c

diff --git a/libchimara/chimara-glk.c b/libchimara/chimara-glk.c
index b9e0437e3249a48eda74b6016eb2ace27a020e71..3f5c71b91030cf738f114d1480287e920f7a7666 100644 (file)
--- 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);
 }
@@ -484,7 +493,7 @@ chimara_glk_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
                if(!priv->ignore_next_arrange_event)
                {
                        if(arrange)
-                               event_throw(evtype_Arrange, arrange == priv->root_window->data? NULL : arrange, 0, 0);
+                               event_throw(CHIMARA_GLK(widget), evtype_Arrange, arrange == priv->root_window->data? NULL : arrange, 0, 0);
                }
                else
                        priv->ignore_next_arrange_event = FALSE;
@@ -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);
 }
 
@@ -929,19 +980,21 @@ struct StartupData {
        glk_main_t glk_main;
        glkunix_startup_code_t glkunix_startup_code;
        glkunix_startup_t args;
+       ChimaraGlkPrivate *glk_data;
 };
 
 /* glk_enter() is the actual function called in the new thread in which glk_main() runs.  */
 static gpointer
 glk_enter(struct StartupData *startup)
 {
-    extern ChimaraGlkPrivate *glk_data;
+       extern GPrivate *glk_data_key;
+       g_private_set(glk_data_key, startup->glk_data);
        
        /* Run startup function */
        if(startup->glkunix_startup_code) {
-               glk_data->in_startup = TRUE;
+               startup->glk_data->in_startup = TRUE;
                int result = startup->glkunix_startup_code(&startup->args);
-               glk_data->in_startup = FALSE;
+               startup->glk_data->in_startup = FALSE;
                
                int i = 0;
                while(i < startup->args.argc)
@@ -953,10 +1006,10 @@ glk_enter(struct StartupData *startup)
        }
        
        /* Run main function */
-    g_signal_emit_by_name(glk_data->self, "started");
+    g_signal_emit_by_name(startup->glk_data->self, "started");
        (startup->glk_main)();
-       g_slice_free(struct StartupData, startup);      
-       g_signal_emit_by_name(glk_data->self, "stopped");
+       g_signal_emit_by_name(startup->glk_data->self, "stopped");
+       g_slice_free(struct StartupData, startup);
        return NULL;
 }
 
@@ -1019,11 +1072,7 @@ chimara_glk_run(ChimaraGlk *glk, gchar *plugin, int argc, char *argv[], GError *
                /* Set the program name */
                startup->args.argv[0] = g_strdup(plugin);
     }
-
-       extern ChimaraGlkPrivate *glk_data;
-    /* Set the thread's private data */
-    /* TODO: Do this with a GPrivate */
-    glk_data = priv;
+       startup->glk_data = priv;
        
     /* Run in a separate thread */
        priv->thread = g_thread_create((GThreadFunc)glk_enter, startup, TRUE, error);
@@ -1044,7 +1093,14 @@ chimara_glk_stop(ChimaraGlk *glk)
 {
     g_return_if_fail(glk || CHIMARA_IS_GLK(glk));
     /* TODO: check if glk is actually running a program */
-       signal_abort();
+       ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(glk);
+       if(priv->abort_lock) {
+               g_mutex_lock(priv->abort_lock);
+               priv->abort_signalled = TRUE;
+               g_mutex_unlock(priv->abort_lock);
+               /* Stop blocking on the event queue condition */
+               event_throw(glk, evtype_Abort, NULL, 0, 0);
+       }
 }
 
 /**