X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fchimara-glk.c;h=bf0e60b7fc72cc2fd332de6be14dc406792df88d;hb=c6009981145d784b85990702617018ebc5d6cc8a;hp=16e674969c10f9ae9feaf92804261b0b4414c8d5;hpb=0b85f1dd5993e2ed111ec2ba13bbbb4ebda06ada;p=rodin%2Fchimara.git
diff --git a/libchimara/chimara-glk.c b/libchimara/chimara-glk.c
index 16e6749..bf0e60b 100644
--- a/libchimara/chimara-glk.c
+++ b/libchimara/chimara-glk.c
@@ -10,6 +10,8 @@
#include "glk.h"
#include "abort.h"
#include "window.h"
+#include "glkstart.h"
+#include "glkunix.h"
#define CHIMARA_GLK_MIN_WIDTH 0
#define CHIMARA_GLK_MIN_HEIGHT 0
@@ -40,6 +42,7 @@
*/
typedef void (* glk_main_t) (void);
+typedef int (* glkunix_startup_code_t) (glkunix_startup_t*);
enum {
PROP_0,
@@ -81,12 +84,18 @@ chimara_glk_init(ChimaraGlk *self)
priv->event_queue_not_full = NULL;
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->fileref_list = NULL;
priv->current_stream = NULL;
priv->stream_list = NULL;
priv->timer_id = 0;
+ priv->in_startup = FALSE;
+ priv->current_dir = NULL;
}
static void
@@ -166,9 +175,17 @@ chimara_glk_finalize(GObject *object)
g_mutex_free(priv->abort_lock);
priv->abort_lock = NULL;
+ /* Free the window arrangement signalling */
+ g_mutex_lock(priv->arrange_lock);
+ 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);
}
@@ -257,8 +274,10 @@ chimara_glk_size_request(GtkWidget *widget, GtkRequisition *requisition)
}
}
-/* Recursively give the Glk windows their allocated space */
-static void
+/* Recursively give the Glk windows their allocated space. Returns a window
+ containing all children of this window that must be redrawn, or NULL if there
+ are no children that require redrawing. */
+static winid_t
allocate_recurse(winid_t win, GtkAllocation *allocation, guint spacing)
{
if(win->type == wintype_Pair)
@@ -345,8 +364,13 @@ allocate_recurse(winid_t win, GtkAllocation *allocation, guint spacing)
}
/* Recurse */
- allocate_recurse(win->window_node->children->data, &child1, spacing);
- allocate_recurse(win->window_node->children->next->data, &child2, spacing);
+ winid_t arrange1 = allocate_recurse(win->window_node->children->data, &child1, spacing);
+ winid_t arrange2 = allocate_recurse(win->window_node->children->next->data, &child2, spacing);
+ if(arrange1 == NULL)
+ return arrange2;
+ if(arrange2 == NULL)
+ return arrange1;
+ return win;
}
else if(win->type == wintype_TextGrid)
@@ -411,13 +435,15 @@ allocate_recurse(winid_t win, GtkAllocation *allocation, guint spacing)
g_free(text);
}
+ gboolean arrange = !(win->width == newwidth && win->height == newheight);
win->width = newwidth;
win->height = newheight;
+ return arrange? win : NULL;
}
/* For non-pair, non-text-grid windows, just give them the size */
- else
- gtk_widget_size_allocate(win->frame, allocation);
+ gtk_widget_size_allocate(win->frame, allocation);
+ return NULL;
}
/* Overrides gtk_widget_size_allocate */
@@ -438,7 +464,21 @@ chimara_glk_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
child.y = allocation->y + GTK_CONTAINER(widget)->border_width;
child.width = CLAMP(allocation->width - 2 * GTK_CONTAINER(widget)->border_width, 0, allocation->width);
child.height = CLAMP(allocation->height - 2 * GTK_CONTAINER(widget)->border_width, 0, allocation->height);
- allocate_recurse(priv->root_window->data, &child, priv->spacing);
+ winid_t arrange = allocate_recurse(priv->root_window->data, &child, priv->spacing);
+
+ /* arrange points to a window that contains all text grid and graphics
+ windows which have been resized */
+ g_mutex_lock(priv->arrange_lock);
+ if(!priv->ignore_next_arrange_event)
+ {
+ if(arrange)
+ event_throw(evtype_Arrange, arrange == priv->root_window->data? NULL : arrange, 0, 0);
+ }
+ else
+ priv->ignore_next_arrange_event = FALSE;
+ priv->needs_rearrange = FALSE;
+ g_cond_signal(priv->rearranged);
+ g_mutex_unlock(priv->arrange_lock);
}
}
@@ -584,7 +624,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
@@ -629,6 +669,8 @@ chimara_glk_new(void)
priv->event_queue_not_empty = g_cond_new();
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);
}
@@ -876,6 +918,7 @@ static gpointer
glk_enter(gpointer glk_main)
{
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");
@@ -887,16 +930,23 @@ glk_enter(gpointer glk_main)
* @glk: a #ChimaraGlk widget
* @plugin: path to a plugin module compiled with
+ * @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
-chimara_glk_run(ChimaraGlk *glk, gchar *plugin, GError **error)
+chimara_glk_run(ChimaraGlk *glk, gchar *plugin, int argc, char *argv[], GError **error)
{
g_return_val_if_fail(glk || CHIMARA_IS_GLK(glk), FALSE);
g_return_val_if_fail(plugin, FALSE);
@@ -905,6 +955,7 @@ chimara_glk_run(ChimaraGlk *glk, gchar *plugin, GError **error)
/* 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);
@@ -919,11 +970,43 @@ chimara_glk_run(ChimaraGlk *glk, gchar *plugin, GError **error)
return FALSE;
}
- extern ChimaraGlkPrivate *glk_data;
+ 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) )
+ {
+ glkunix_startup_t data;
+ glkunix_argumentlist_t *glkunix_arguments;
+ gboolean startup_succeeded;
+
+ if( !(g_module_symbol(priv->program, "glkunix_arguments", (gpointer *) &glkunix_arguments) && parse_command_line(glkunix_arguments, argc, argv, &data)) )
+ {
+ /* arguments could not be parsed, so create data ourselves */
+ data.argc = 1;
+ data.argv = g_new0(gchar *, 1);
+ }
+ /* Set the program name */
+ data.argv[0] = g_strdup(plugin);
+
+ priv->in_startup = TRUE;
+ startup_succeeded = glkunix_startup_code(&data);
+ priv->in_startup = FALSE;
+
+ int i=0;
+ while(i < data.argc)
+ g_free(data.argv[i++]);
+ g_free(data.argv);
+
+ if(!startup_succeeded)
+ {
+ chimara_glk_stopped(glk);
+ return FALSE;
+ }
+ }
+
/* Run in a separate thread */
priv->thread = g_thread_create(glk_enter, glk_main, TRUE, error);