X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fchimara-glk.c;h=e0b60592b2e842ff988e35f53c5cb4fd8c70e184;hb=deed9ccb2dacd8c2b4e58c2fdd947850299902bc;hp=fc4c446ed05aa51ecead7b2f862061a7588b5b2c;hpb=5a998150d0f5f2fac906dc72b0be80a3809726e8;p=projects%2Fchimara%2Fchimara.git diff --git a/libchimara/chimara-glk.c b/libchimara/chimara-glk.c index fc4c446..e0b6059 100644 --- a/libchimara/chimara-glk.c +++ b/libchimara/chimara-glk.c @@ -2,7 +2,8 @@ #include #include -#include +#include +#include #include #include #include "chimara-glk.h" @@ -11,6 +12,8 @@ #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 @@ -41,7 +44,7 @@ */ 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, @@ -75,6 +78,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; @@ -93,6 +98,8 @@ chimara_glk_init(ChimaraGlk *self) priv->current_stream = NULL; priv->stream_list = NULL; priv->timer_id = 0; + priv->in_startup = FALSE; + priv->current_dir = NULL; } static void @@ -182,6 +189,8 @@ chimara_glk_finalize(GObject *object) /* 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_hash_table_destroy(priv->default_styles); G_OBJECT_CLASS(chimara_glk_parent_class)->finalize(object); } @@ -196,11 +205,14 @@ request_recurse(winid_t win, GtkRequisition *requisition, guint spacing) GtkRequisition child1, child2; request_recurse(win->window_node->children->data, &child1, spacing); request_recurse(win->window_node->children->next->data, &child2, spacing); + + glui32 division = win->split_method & winmethod_DivisionMask; + glui32 direction = win->split_method & winmethod_DirMask; /* If the split is fixed, get the size of the fixed child */ - if((win->split_method & winmethod_DivisionMask) == winmethod_Fixed) + if(division == winmethod_Fixed) { - switch(win->split_method & winmethod_DirMask) + switch(direction) { case winmethod_Left: child1.width = win->key_window? @@ -226,7 +238,7 @@ request_recurse(winid_t win, GtkRequisition *requisition, guint spacing) } /* Add the children's requests */ - switch(win->split_method & winmethod_DirMask) + switch(direction) { case winmethod_Left: case winmethod_Right: @@ -278,15 +290,24 @@ allocate_recurse(winid_t win, GtkAllocation *allocation, guint spacing) { if(win->type == wintype_Pair) { + glui32 division = win->split_method & winmethod_DivisionMask; + glui32 direction = win->split_method & winmethod_DirMask; + + /* If the space gets too small to honor the spacing property, then just + ignore spacing in this window and below. */ + if( (spacing > allocation->width && (direction == winmethod_Left || direction == winmethod_Right)) + || (spacing > allocation->height && (direction == winmethod_Above || direction == winmethod_Below)) ) + spacing = 0; + GtkAllocation child1, child2; child1.x = allocation->x; child1.y = allocation->y; - if((win->split_method & winmethod_DivisionMask) == winmethod_Fixed) + if(division == winmethod_Fixed) { /* If the key window has been closed, then default to 0; otherwise use the key window to determine the size */ - switch(win->split_method & winmethod_DirMask) + switch(direction) { case winmethod_Left: child1.width = win->key_window? @@ -313,46 +334,46 @@ allocate_recurse(winid_t win, GtkAllocation *allocation, guint spacing) else /* proportional */ { gdouble fraction = win->constraint_size / 100.0; - switch(win->split_method & winmethod_DirMask) + switch(direction) { case winmethod_Left: - child1.width = (glui32) ceil( fraction * (allocation->width - spacing) ); + child1.width = MAX(0, (gint)ceil(fraction * (allocation->width - spacing)) ); break; case winmethod_Right: - child2.width = (glui32) ceil( fraction * (allocation->width - spacing) ); + child2.width = MAX(0, (gint)ceil(fraction * (allocation->width - spacing)) ); break; case winmethod_Above: - child1.height = (glui32) ceil( fraction * (allocation->height - spacing) ); + child1.height = MAX(0, (gint)ceil(fraction * (allocation->height - spacing)) ); break; case winmethod_Below: - child2.height = (glui32) ceil( fraction * (allocation->height - spacing) ); + child2.height = MAX(0, (gint)ceil(fraction * (allocation->height - spacing)) ); break; } } /* Fill in the rest of the size requisitions according to the child specified above */ - switch(win->split_method & winmethod_DirMask) + switch(direction) { case winmethod_Left: - child2.width = allocation->width - spacing - child1.width; + child2.width = MAX(0, allocation->width - spacing - child1.width); child2.x = child1.x + child1.width + spacing; child2.y = child1.y; child1.height = child2.height = allocation->height; break; case winmethod_Right: - child1.width = allocation->width - spacing - child2.width; + child1.width = MAX(0, allocation->width - spacing - child2.width); child2.x = child1.x + child1.width + spacing; child2.y = child1.y; child1.height = child2.height = allocation->height; break; case winmethod_Above: - child2.height = allocation->height - spacing - child1.height; + child2.height = MAX(0, allocation->height - spacing - child1.height); child2.x = child1.x; child2.y = child1.y + child1.height + spacing; child1.width = child2.width = allocation->width; break; case winmethod_Below: - child1.height = allocation->height - spacing - child2.height; + child1.height = MAX(0, allocation->height - spacing - child2.height); child2.x = child1.x; child2.y = child1.y + child1.height + spacing; child1.width = child2.width = allocation->width; @@ -468,7 +489,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; @@ -620,7 +641,7 @@ chimara_glk_class_init(ChimaraGlkClass *klass) * 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 * Monospace @@ -657,6 +678,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); @@ -667,7 +691,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); } @@ -909,15 +933,40 @@ chimara_glk_get_spacing(ChimaraGlk *glk) return priv->spacing; } +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(gpointer glk_main) +glk_enter(struct StartupData *startup) { - extern ChimaraGlkPrivate *glk_data; - - g_signal_emit_by_name(glk_data->self, "started"); - ((glk_main_t)glk_main)(); - g_signal_emit_by_name(glk_data->self, "stopped"); + extern GPrivate *glk_data_key; + g_private_set(glk_data_key, startup->glk_data); + + /* Run startup function */ + if(startup->glkunix_startup_code) { + startup->glk_data->in_startup = TRUE; + int result = startup->glkunix_startup_code(&startup->args); + startup->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(startup->glk_data->self, "started"); + (startup->glk_main)(); + g_signal_emit_by_name(startup->glk_data->self, "stopped"); + g_slice_free(struct StartupData, startup); return NULL; } @@ -926,12 +975,19 @@ glk_enter(gpointer glk_main) * @glk: a #ChimaraGlk widget * @plugin: path to a plugin module compiled with glk.h + * @argc: Number of command line arguments in @argv + * @argv: Array of command line arguments to pass to the plugin * @error: location to store a GError, 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 @@ -941,11 +997,9 @@ chimara_glk_run(ChimaraGlk *glk, gchar *plugin, int argc, char *argv[], GError * 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); @@ -954,28 +1008,31 @@ chimara_glk_run(ChimaraGlk *glk, gchar *plugin, int argc, char *argv[], GError * 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; - glkunix_startup_code(&data); - } + 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); + } + /* Set the program name */ + startup->args.argv[0] = g_strdup(plugin); + } + startup->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); } @@ -993,7 +1050,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); + } } /**