#include "abort.h"
#include "window.h"
#include "glkstart.h"
+#include "glkunix.h"
#define CHIMARA_GLK_MIN_WIDTH 0
#define CHIMARA_GLK_MIN_HEIGHT 0
*/
typedef void (* glk_main_t) (void);
-typedef void (* glkunix_startup_code_t) (glkunix_startup_t*);
+typedef int (* glkunix_startup_code_t) (glkunix_startup_t*);
enum {
PROP_0,
priv->abort_lock = NULL;
priv->abort_signalled = FALSE;
priv->arrange_lock = NULL;
+ priv->rearranged = NULL;
+ priv->needs_rearrange = FALSE;
priv->ignore_next_arrange_event = FALSE;
priv->interrupt_handler = NULL;
priv->root_window = NULL;
priv->current_stream = NULL;
priv->stream_list = NULL;
priv->timer_id = 0;
+ priv->in_startup = FALSE;
+ priv->current_dir = NULL;
}
static void
/* Free the window arrangement signalling */
g_mutex_lock(priv->arrange_lock);
- /* Make sure no other thread is busy with this */
+ g_cond_free(priv->rearranged);
g_mutex_unlock(priv->arrange_lock);
g_mutex_free(priv->arrange_lock);
priv->arrange_lock = NULL;
/* Free private data */
pango_font_description_free(priv->default_font_desc);
pango_font_description_free(priv->monospace_font_desc);
+ g_free(priv->current_dir);
G_OBJECT_CLASS(chimara_glk_parent_class)->finalize(object);
}
}
else
priv->ignore_next_arrange_event = FALSE;
+ priv->needs_rearrange = FALSE;
+ g_cond_signal(priv->rearranged);
g_mutex_unlock(priv->arrange_lock);
}
}
* ChimaraGlk:monospace-font-description:
*
* Pointer to a #PangoFontDescription describing the default monospace font,
- * to be used in text grid windows and #style_Preformatted, for example.
+ * to be used in text grid windows and %style_Preformatted, for example.
*
* Default value: font description created from the string
* <quote>Monospace</quote>
priv->event_queue_not_full = g_cond_new();
priv->abort_lock = g_mutex_new();
priv->arrange_lock = g_mutex_new();
+ priv->rearranged = g_cond_new();
return GTK_WIDGET(self);
}
return priv->spacing;
}
+struct StartupData {
+ glk_main_t glk_main;
+ glkunix_startup_code_t glkunix_startup_code;
+ glkunix_startup_t args;
+};
+
/* glk_enter() is the actual function called in the new thread in which glk_main() runs. */
static gpointer
-glk_enter(gpointer glk_main)
+glk_enter(struct StartupData *startup)
{
extern ChimaraGlkPrivate *glk_data;
-
+
+ /* Run startup function */
+ if(startup->glkunix_startup_code) {
+ glk_data->in_startup = TRUE;
+ int result = startup->glkunix_startup_code(&startup->args);
+ glk_data->in_startup = FALSE;
+
+ int i = 0;
+ while(i < startup->args.argc)
+ g_free(startup->args.argv[i++]);
+ g_free(startup->args.argv);
+
+ if(!result)
+ return NULL;
+ }
+
+ /* Run main function */
g_signal_emit_by_name(glk_data->self, "started");
- ((glk_main_t)glk_main)();
+ (startup->glk_main)();
+ g_slice_free(struct StartupData, startup);
g_signal_emit_by_name(glk_data->self, "stopped");
return NULL;
}
* @glk: a #ChimaraGlk widget
* @plugin: path to a plugin module compiled with <filename
* class="header">glk.h</filename>
+ * @argc: Number of command line arguments in @argv
+ * @argv: Array of command line arguments to pass to the plugin
* @error: location to store a <link linkend="glib-GError">GError</link>, or
* %NULL
*
- * Opens a Glk program compiled as a plugin and runs its glk_main() function in
+ * Opens a Glk program compiled as a plugin. Sorts out its command line
+ * arguments from #glkunix_arguments, calls its startup function
+ * glkunix_startup_code(), and then calls its main function glk_main() in
* a separate thread. On failure, returns %FALSE and sets @error.
*
+ * The plugin must at least export a glk_main() function; #glkunix_arguments and
+ * glkunix_startup_code() are optional.
+ *
* Return value: %TRUE if the Glk program was started successfully.
*/
gboolean
g_return_val_if_fail(plugin, FALSE);
ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(glk);
+ struct StartupData *startup = g_slice_new0(struct StartupData);
-
/* Open the module to run */
- glk_main_t glk_main;
- glkunix_startup_code_t glkunix_startup_code;
g_assert( g_module_supported() );
priv->program = g_module_open(plugin, G_MODULE_BIND_LAZY);
g_warning( "Error opening module: %s", g_module_error() );
return FALSE;
}
- if( !g_module_symbol(priv->program, "glk_main", (gpointer *) &glk_main) )
+ if( !g_module_symbol(priv->program, "glk_main", (gpointer *) &startup->glk_main) )
{
g_warning( "Error finding glk_main(): %s", g_module_error() );
return FALSE;
}
- extern ChimaraGlkPrivate *glk_data;
- /* Set the thread's private data */
- /* TODO: Do this with a GPrivate */
- glk_data = priv;
-
- if( g_module_symbol(priv->program, "glkunix_startup_code", (gpointer *) &glkunix_startup_code) )
+ if( g_module_symbol(priv->program, "glkunix_startup_code", (gpointer *) &startup->glkunix_startup_code) )
{
- glkunix_startup_t data;
- data.argc = argc;
- data.argv = argv;
+ glkunix_argumentlist_t *glkunix_arguments;
+
+ if( !(g_module_symbol(priv->program, "glkunix_arguments", (gpointer *) &glkunix_arguments)
+ && parse_command_line(glkunix_arguments, argc, argv, &startup->args)) )
+ {
+ /* arguments could not be parsed, so create data ourselves */
+ startup->args.argc = 1;
+ startup->args.argv = g_new0(gchar *, 1);
+ }
- glkunix_startup_code(&data);
+ /* 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;
+
/* Run in a separate thread */
- priv->thread = g_thread_create(glk_enter, glk_main, TRUE, error);
+ priv->thread = g_thread_create((GThreadFunc)glk_enter, startup, TRUE, error);
return !(priv->thread == NULL);
}
{
g_return_if_fail(glk || CHIMARA_IS_GLK(glk));
/* TODO: check if glk is actually running a program */
- signal_abort();
+ signal_abort();
}
/**
projects / rodin / chimara.git / blobdiff