X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fchimara-glk.c;h=b9e0437e3249a48eda74b6016eb2ace27a020e71;hb=bc11b07aaa11619c98fe2223c8c984df9cf01453;hp=2c61dacce675a549305625bd279052d332746a98;hpb=46271bc1f196ef9c6d0c69a84a55c9eac1deb8b3;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/chimara-glk.c b/libchimara/chimara-glk.c
index 2c61dac..b9e0437 100644
--- a/libchimara/chimara-glk.c
+++ b/libchimara/chimara-glk.c
@@ -200,11 +200,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?
@@ -230,7 +233,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:
@@ -282,15 +285,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? 
@@ -317,46 +329,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;
@@ -624,7 +636,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 
 	 * <quote>Monospace</quote>
@@ -913,14 +925,37 @@ 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;
+};
+
 /* 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;
 }
@@ -952,10 +987,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);
     
@@ -964,51 +998,35 @@ 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;
 		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)) )
+		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 */
-			data.argc = 1;
-			data.argv = g_new0(gchar *, 1);
+			startup->args.argc = 1;
+			startup->args.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;
-		
-		gchar **ptr = data.argv;
-		while(*ptr++)
-			g_free(*ptr);
-		g_free(data.argv);
-		
-		if(!startup_succeeded)
-		{
-			chimara_glk_stopped(glk);
-			return FALSE;
-		}
+		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);
 }
@@ -1026,7 +1044,7 @@ 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();
+	signal_abort();
 }
 
 /**