X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fchimara-glk.c;h=1ddeb7911e8a859294f51de746597dbf81f726f1;hb=734e6185b06e70e10528a33e4e4d719e18821200;hp=16e674969c10f9ae9feaf92804261b0b4414c8d5;hpb=78652af29a2f39e626febd5f4213da57d3a13901;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/chimara-glk.c b/libchimara/chimara-glk.c
index 16e6749..1ddeb79 100644
--- a/libchimara/chimara-glk.c
+++ b/libchimara/chimara-glk.c
@@ -10,6 +10,7 @@
 #include "glk.h"
 #include "abort.h"
 #include "window.h"
+#include "glkstart.h"
 
 #define CHIMARA_GLK_MIN_WIDTH 0
 #define CHIMARA_GLK_MIN_HEIGHT 0
@@ -40,6 +41,7 @@
  */
 
 typedef void (* glk_main_t) (void);
+typedef void (* glkunix_startup_code_t) (glkunix_startup_t*);
 
 enum {
     PROP_0,
@@ -81,6 +83,8 @@ chimara_glk_init(ChimaraGlk *self)
     priv->event_queue_not_full = NULL;
     priv->abort_lock = NULL;
     priv->abort_signalled = FALSE;
+	priv->arrange_lock = NULL;
+	priv->ignore_next_arrange_event = FALSE;
     priv->interrupt_handler = NULL;
     priv->root_window = NULL;
     priv->fileref_list = NULL;
@@ -166,6 +170,13 @@ 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);
+	/* Make sure no other thread is busy with this */
+	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);
@@ -257,8 +268,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 +358,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 +429,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 +458,19 @@ 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;
+		g_mutex_unlock(priv->arrange_lock);
 	}
 }
 
@@ -629,6 +661,7 @@ 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();
     
     return GTK_WIDGET(self);
 }
@@ -876,6 +909,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");
@@ -896,15 +930,17 @@ glk_enter(gpointer glk_main)
  * 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);
     
     ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(glk);
     
+
     /* 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);
     
@@ -924,6 +960,15 @@ chimara_glk_run(ChimaraGlk *glk, gchar *plugin, GError **error)
     /* 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;
+		data.argc = argc;
+		data.argv = argv;
+
+		glkunix_startup_code(&data);
+    }
+
     /* Run in a separate thread */
 	priv->thread = g_thread_create(glk_enter, glk_main, TRUE, error);