#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 "window.h"
#include "glkstart.h"
#include "glkunix.h"
+#include "init.h"
#define CHIMARA_GLK_MIN_WIDTH 0
#define CHIMARA_GLK_MIN_HEIGHT 0
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;
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);
}
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;
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);
priv->abort_lock = g_mutex_new();
priv->arrange_lock = g_mutex_new();
priv->rearranged = g_cond_new();
-
+
return GTK_WIDGET(self);
}
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)
}
/* 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;
}
/* 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);
{
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);
+ }
}
/**