X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fchimara-glk.c;h=ef8e6d5896c2bb367e916fe9224315fe1a24a2b1;hb=0ae54d1f83e8581396969afcf6362be5c04c5f55;hp=949f951d084669a9664115964d9225d67ac8b65c;hpb=b2e519687ab410b6489b3ec02348ec5251e81b05;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/chimara-glk.c b/libchimara/chimara-glk.c
index 949f951..ef8e6d5 100644
--- a/libchimara/chimara-glk.c
+++ b/libchimara/chimara-glk.c
@@ -28,27 +28,6 @@
 #define CHIMARA_GLK_MIN_WIDTH 0
 #define CHIMARA_GLK_MIN_HEIGHT 0
 
-/* Substitute functions for compiling on iLiad */
-
-#if !GTK_CHECK_VERSION(2, 18, 0)
-#define gtk_widget_get_allocation(w, a) \
-	G_STMT_START { \
-		(a)->x = (w)->allocation.x; \
-		(a)->y = (w)->allocation.y; \
-		(a)->width = (w)->allocation.width; \
-		(a)->height = (w)->allocation.height; \
-	} G_STMT_END
-#define gtk_widget_set_allocation(w, a) \
-	G_STMT_START { (w)->allocation = *(a); } G_STMT_END
-#define gtk_widget_set_has_window(w, f) \
-	G_STMT_START { \
-		if(f) \
-			GTK_WIDGET_UNSET_FLAGS((w), GTK_NO_WINDOW); \
-		else \
-			GTK_WIDGET_SET_FLAGS((w), GTK_NO_WINDOW); \
-	} G_STMT_END
-#endif /* GTK 2.18 */
-
 /**
  * SECTION:chimara-glk
  * @short_description: Widget which executes a Glk program
@@ -148,7 +127,8 @@ enum {
 	PROP_SPACING,
 	PROP_PROGRAM_NAME,
 	PROP_PROGRAM_INFO,
-	PROP_STORY_NAME
+	PROP_STORY_NAME,
+	PROP_RUNNING
 };
 
 enum {
@@ -170,6 +150,8 @@ G_DEFINE_TYPE(ChimaraGlk, chimara_glk, GTK_TYPE_CONTAINER);
 static void
 chimara_glk_init(ChimaraGlk *self)
 {
+	chimara_init(); /* This is a library entry point */
+
     gtk_widget_set_has_window(GTK_WIDGET(self), FALSE);
 
     ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(self);
@@ -267,6 +249,9 @@ chimara_glk_get_property(GObject *object, guint prop_id, GValue *value, GParamSp
 		case PROP_STORY_NAME:
 			g_value_set_string(value, priv->story_name);
 			break;
+		case PROP_RUNNING:
+			g_value_set_boolean(value, priv->running);
+			break;
 		default:
             G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
     }
@@ -339,93 +324,35 @@ chimara_glk_finalize(GObject *object)
     G_OBJECT_CLASS(chimara_glk_parent_class)->finalize(object);
 }
 
-/* Internal function: Recursively get the Glk window tree's size request */
-static void
-request_recurse(winid_t win, GtkRequisition *requisition, guint spacing)
+/* Implementation of get_request_mode(): Always request constant size */
+static GtkSizeRequestMode
+chimara_glk_get_request_mode(GtkWidget *widget)
 {
-	if(win->type == wintype_Pair)
-	{
-		/* Get children's size requests */
-		GtkRequisition child1, child2;
-		request_recurse(win->window_node->children->data, &child1, spacing);
-		request_recurse(win->window_node->children->next->data, &child2, spacing);
+	return GTK_SIZE_REQUEST_CONSTANT_SIZE;
+}
 
-		glui32 division = win->split_method & winmethod_DivisionMask;
-		glui32 direction = win->split_method & winmethod_DirMask;
-		unsigned border = ((win->split_method & winmethod_BorderMask) == winmethod_NoBorder)? 0 : spacing;
+/* Minimal implementation of width request. Allocation in Glk is
+strictly top-down, so we just request our current size by returning 1. */
+static void
+chimara_glk_get_preferred_width(GtkWidget *widget, int *minimal, int *natural)
+{
+    g_return_if_fail(widget || CHIMARA_IS_GLK(widget));
+    g_return_if_fail(minimal);
+    g_return_if_fail(natural);
 
-		/* If the split is fixed, get the size of the fixed child */
-		if(division == winmethod_Fixed)
-		{
-			switch(direction)
-			{
-				case winmethod_Left:
-					child1.width = win->key_window?
-						win->constraint_size * win->key_window->unit_width
-						: 0;
-					break;
-				case winmethod_Right:
-					child2.width = win->key_window?
-						win->constraint_size * win->key_window->unit_width
-						: 0;
-					break;
-				case winmethod_Above:
-					child1.height = win->key_window?
-						win->constraint_size * win->key_window->unit_height
-						: 0;
-					break;
-				case winmethod_Below:
-					child2.height = win->key_window?
-						win->constraint_size * win->key_window->unit_height
-						: 0;
-					break;
-			}
-		}
-		
-		/* Add the children's requests */
-		switch(direction)
-		{
-			case winmethod_Left:
-			case winmethod_Right:
-				requisition->width = child1.width + child2.width + border;
-				requisition->height = MAX(child1.height, child2.height);
-				break;
-			case winmethod_Above:
-			case winmethod_Below:
-				requisition->width = MAX(child1.width, child2.width);
-				requisition->height = child1.height + child2.height + border;
-				break;
-		}
-	}
-	
-	/* For non-pair windows, just use the size that GTK requests */
-	else
-		gtk_widget_size_request(win->frame, requisition);
+    *minimal = *natural = 1;
 }
 
-/* Overrides gtk_widget_size_request */
+/* Minimal implementation of height request. Allocation in Glk is
+strictly top-down, so we just request our current size by returning 1. */
 static void
-chimara_glk_size_request(GtkWidget *widget, GtkRequisition *requisition)
+chimara_glk_get_preferred_height(GtkWidget *widget, int *minimal, int *natural)
 {
-    g_return_if_fail(widget);
-    g_return_if_fail(requisition);
-    g_return_if_fail(CHIMARA_IS_GLK(widget));
-    
-    ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(widget);
-    
-    guint border_width = gtk_container_get_border_width(GTK_CONTAINER(widget));
-    /* For now, just pass the size request on to the root Glk window */
-    if(priv->root_window) 
-	{
-		request_recurse(priv->root_window->data, requisition, priv->spacing);
-		requisition->width += 2 * border_width;
-		requisition->height += 2 * border_width;
-	} 
-	else 
-	{
-        requisition->width = CHIMARA_GLK_MIN_WIDTH + 2 * border_width;
-        requisition->height = CHIMARA_GLK_MIN_HEIGHT + 2 * border_width;
-    }
+    g_return_if_fail(widget || CHIMARA_IS_GLK(widget));
+    g_return_if_fail(minimal);
+    g_return_if_fail(natural);
+
+    *minimal = *natural = 1;
 }
 
 /* Recursively give the Glk windows their allocated space. Returns a window
@@ -546,64 +473,92 @@ allocate_recurse(winid_t win, GtkAllocation *allocation, guint spacing)
 		 bottom or right area is filled with blanks. */
 		GtkAllocation widget_allocation;
 		gtk_widget_get_allocation(win->widget, &widget_allocation);
-		glui32 newwidth = (glui32)(widget_allocation.width / win->unit_width);
-		glui32 newheight = (glui32)(widget_allocation.height / win->unit_height);
-		gint line;
-		GtkTextBuffer *textbuffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(win->widget) );
-		GtkTextIter start, end;
-	
-		for(line = 0; line < win->height; line++)
+		glui32 new_width = (glui32)(widget_allocation.width / win->unit_width);
+		glui32 new_height = (glui32)(widget_allocation.height / win->unit_height);
+
+		if(new_width != win->width || new_height != win->height)
 		{
-			gtk_text_buffer_get_iter_at_line(textbuffer, &start, line);
-			/* If this line is going to fall off the bottom, delete it */
-			if(line >= newheight)
-			{
-				end = start;
-				gtk_text_iter_forward_to_line_end(&end);
-				gtk_text_iter_forward_char(&end);
-				gtk_text_buffer_delete(textbuffer, &start, &end);
-				break;
+			// Window has changed size, trim or expand the textbuffer if necessary.
+			GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(win->widget) );
+			GtkTextIter start, end;
+
+			// Add or remove lines
+			if(new_height == 0) {
+				gtk_text_buffer_get_start_iter(buffer, &start);
+				gtk_text_buffer_get_end_iter(buffer, &end);
+				gtk_text_buffer_delete(buffer, &start, &end);
 			}
-			/* If this line is not long enough, add spaces on the end */
-			if(newwidth > win->width)
+			else if(new_height < win->height)
 			{
-				gchar *spaces = g_strnfill(newwidth - win->width, ' ');
+				// Remove surplus lines
+				gtk_text_buffer_get_end_iter(buffer, &end);
+				gtk_text_buffer_get_iter_at_line(buffer, &start, new_height-1);
 				gtk_text_iter_forward_to_line_end(&start);
-				gtk_text_buffer_insert(textbuffer, &start, spaces, -1);
-				g_free(spaces);
+				gtk_text_buffer_delete(buffer, &start, &end);
+
 			}
-			/* But if it's too long, delete characters from the end */
-			else if(newwidth < win->width)
+			else if(new_height > win->height)
 			{
+				// Add extra lines
+				gint lines_to_add = new_height - win->height;
+				gtk_text_buffer_get_end_iter(buffer, &end);
+				start = end;
+
+				gchar *blanks = g_strnfill(win->width, ' ');
+				gchar **blanklines = g_new0(gchar *, lines_to_add + 1);
+				int count;
+				for(count = 0; count < lines_to_add; count++)
+					blanklines[count] = blanks;
+				blanklines[lines_to_add] = NULL;
+				gchar *vertical_blanks = g_strjoinv("\n", blanklines);
+				g_free(blanklines); 
+				g_free(blanks);
+
+				if(win->height > 0) 
+					gtk_text_buffer_insert(buffer, &end, "\n", 1);
+
+				gtk_text_buffer_insert(buffer, &end, vertical_blanks, -1);
+			}
+
+			// Trim or expand lines
+			if(new_width < win->width) {
+				gtk_text_buffer_get_start_iter(buffer, &start);
 				end = start;
-				gtk_text_iter_forward_chars(&start, newwidth);
-				gtk_text_iter_forward_to_line_end(&end);
-				gtk_text_buffer_delete(textbuffer, &start, &end);
+
+				gint line;
+				for(line = 0; line <= new_height; line++) {
+					// Trim the line
+					gtk_text_iter_forward_cursor_positions(&start, new_width);
+					gtk_text_iter_forward_to_line_end(&end);
+					gtk_text_buffer_delete(buffer, &start, &end);
+					gtk_text_iter_forward_line(&start);
+					end = start;
+				}
+			} else if(new_width > win->width) {
+				gint chars_to_add = new_width - win->width;
+				gchar *horizontal_blanks = g_strnfill(chars_to_add, ' ');
+
+				gtk_text_buffer_get_start_iter(buffer, &start);
+				end = start;
+
+				gint line;
+				for(line = 0; line <= new_height; line++) {
+					gtk_text_iter_forward_to_line_end(&start);
+					end = start;
+					gint start_offset = gtk_text_iter_get_offset(&start);
+					gtk_text_buffer_insert(buffer, &end, horizontal_blanks, -1);
+					gtk_text_buffer_get_iter_at_offset(buffer, &start, start_offset);
+					gtk_text_iter_forward_line(&start);
+					end = start;
+				}
+
+				g_free(horizontal_blanks);
 			}
-			/* Note: if the widths are equal, do nothing */
-		}
-		/* Add blank lines if there aren't enough lines to fit the new size */
-		if(newheight > win->height)
-		{
-			gchar *blanks = g_strnfill(win->width, ' ');
-		    gchar **blanklines = g_new0(gchar *, (newheight - win->height) + 1);
-		    int count;
-		    for(count = 0; count < newheight - win->height; count++)
-		        blanklines[count] = blanks;
-		    blanklines[newheight - win->height] = NULL;
-		    gchar *text = g_strjoinv("\n", blanklines);
-		    g_free(blanklines); /* not g_strfreev() */
-		    g_free(blanks);
-		    
-			gtk_text_buffer_get_end_iter(textbuffer, &start);
-			gtk_text_buffer_insert(textbuffer, &start, "\n", -1);
-		    gtk_text_buffer_insert(textbuffer, &start, text, -1);
-		    g_free(text);
 		}
 	
-		gboolean arrange = !(win->width == newwidth && win->height == newheight);
-		win->width = newwidth;
-		win->height = newheight;
+		gboolean arrange = !(win->width == new_width && win->height == new_height);
+		win->width = new_width;
+		win->height = new_height;
 		return arrange? win : NULL;
 	}
 	
@@ -623,16 +578,11 @@ chimara_glk_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
     ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(widget);
     
     gtk_widget_set_allocation(widget, allocation);
-            
+
     if(priv->root_window) {
-		GtkAllocation child;
-		guint border_width = gtk_container_get_border_width(GTK_CONTAINER(widget));
-		child.x = allocation->x + border_width;
-		child.y = allocation->y + border_width;
-		child.width = CLAMP(allocation->width - 2 * border_width, 0, allocation->width);
-		child.height = CLAMP(allocation->height - 2 * border_width, 0, allocation->height);
+		GtkAllocation child = *allocation;
 		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);
@@ -729,18 +679,6 @@ chimara_glk_iliad_screen_update(ChimaraGlk *self, gboolean typing)
 	/* Default signal handler */
 }
 
-/* COMPAT: G_PARAM_STATIC_STRINGS only appeared in GTK 2.13.0 */
-#ifndef G_PARAM_STATIC_STRINGS
-
-/* COMPAT: G_PARAM_STATIC_NAME and friends only appeared in GTK 2.8 */
-#if GTK_CHECK_VERSION(2,8,0)
-#define G_PARAM_STATIC_STRINGS (G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)
-#else
-#define G_PARAM_STATIC_STRINGS (0)
-#endif
-
-#endif
-
 static void
 chimara_glk_class_init(ChimaraGlkClass *klass)
 {
@@ -751,11 +689,15 @@ chimara_glk_class_init(ChimaraGlkClass *klass)
     object_class->finalize = chimara_glk_finalize;
     
     GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
-    widget_class->size_request = chimara_glk_size_request;
+    widget_class->get_request_mode = chimara_glk_get_request_mode;
+    widget_class->get_preferred_width = chimara_glk_get_preferred_width;
+    widget_class->get_preferred_height = chimara_glk_get_preferred_height;
     widget_class->size_allocate = chimara_glk_size_allocate;
 
     GtkContainerClass *container_class = GTK_CONTAINER_CLASS(klass);
     container_class->forall = chimara_glk_forall;
+    /* Automatically handle the GtkContainer:border-width property */
+    gtk_container_class_handle_border_width(container_class);
 
     /* Signals */
     klass->stopped = chimara_glk_stopped;
@@ -947,6 +889,17 @@ chimara_glk_class_init(ChimaraGlkClass *klass)
 		NULL,
 		G_PARAM_READABLE | G_PARAM_STATIC_STRINGS) );
 	
+	/**
+	 * ChimaraGlk:running:
+	 *
+	 * Whether this Glk widget is currently running a game or not.
+	 */
+	g_object_class_install_property(object_class, PROP_RUNNING,
+		g_param_spec_boolean("running", _("Running"),
+		_("Whether there is a program currently running"),
+		FALSE,
+		G_PARAM_READABLE | G_PARAM_STATIC_STRINGS) );
+
 	/* Private data */
     g_type_class_add_private(klass, sizeof(ChimaraGlkPrivate));
 }
@@ -1299,6 +1252,35 @@ chimara_glk_run(ChimaraGlk *glk, const gchar *plugin, int argc, char *argv[], GE
 	return !(priv->thread == NULL);
 }
 
+/**
+ * chimara_glk_run_file:
+ * @self: a #ChimaraGlk widget
+ * @plugin_file: a #GFile pointing 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-Error-Reporting">GError</link>, or %NULL
+ *
+ * Opens a Glk program compiled as a plugin, from a #GFile. See
+ * chimara_glk_run() for details.
+ *
+ * Return value: %TRUE if the Glk program was started successfully.
+ */
+gboolean
+chimara_glk_run_file(ChimaraGlk *self, GFile *plugin_file, int argc, char *argv[], GError **error)
+{
+	g_return_val_if_fail(self || CHIMARA_IS_GLK(self), FALSE);
+	g_return_val_if_fail(plugin_file || G_IS_FILE(plugin_file), FALSE);
+	g_return_val_if_fail(error == NULL || *error == NULL, FALSE);
+
+	char *path = g_file_get_path(plugin_file);
+	gboolean retval = chimara_glk_run(self, path, argc, argv, error);
+	g_free(path);
+
+	return retval;
+}
+
 /**
  * chimara_glk_stop:
  * @glk: a #ChimaraGlk widget