X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=src%2Ffileref.c;h=6b7213809697553aa15b0eab0e0808d73675d89a;hb=82db17cf44e29708bb971b1da2e1e6d4d747fa9b;hp=b277bb33f974c34be360c306b77df057dc41289c;hpb=4a8f20f28d17b8995a8770cc7ef95db3cb5212b4;p=rodin%2Fchimara.git

diff --git a/src/fileref.c b/src/fileref.c
index b277bb3..6b72138 100644
--- a/src/fileref.c
+++ b/src/fileref.c
@@ -4,9 +4,9 @@
 #include <glib/gstdio.h>
 #include "fileref.h"
 #include "error.h"
+#include "chimara-glk-private.h"
 
-/* List of streams currently in existence */
-static GList *fileref_list = NULL;
+extern ChimaraGlkPrivate *glk_data;
 
 /**
  * glk_fileref_iterate:
@@ -31,7 +31,7 @@ glk_fileref_iterate(frefid_t fref, glui32 *rockptr)
 	GList *retnode;
 	
 	if(fref == NULL)
-		retnode = fileref_list;
+		retnode = glk_data->fileref_list;
 	else
 		retnode = fref->fileref_list->next;
 	frefid_t retval = retnode? (frefid_t)retnode->data : NULL;
@@ -69,10 +69,10 @@ fileref_new(gchar *filename, glui32 rock, glui32 usage, glui32 orig_filemode)
 	f->filename = g_strdup(filename);
 	f->usage = usage;
 	f->orig_filemode = orig_filemode;
-
+	
 	/* Add it to the global fileref list */
-	fileref_list = g_list_prepend(fileref_list, f);
-	f->fileref_list = fileref_list;
+	glk_data->fileref_list = g_list_prepend(glk_data->fileref_list, f);
+	f->fileref_list = glk_data->fileref_list;
 	
 	return f;
 }
@@ -144,10 +144,13 @@ glk_fileref_create_by_prompt(glui32 usage, glui32 fmode, glui32 rock)
 	/* TODO: Remember current working directory and last used filename
 	for each usage */
 	GtkWidget *chooser;
+
+	gdk_threads_enter();
+
 	switch(fmode)
 	{
 		case filemode_Read:
-			chooser = gtk_file_chooser_dialog_new("Select a file", NULL,
+			chooser = gtk_file_chooser_dialog_new("Select a file to open", NULL,
 				GTK_FILE_CHOOSER_ACTION_OPEN,
 				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 				GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
@@ -156,9 +159,7 @@ glk_fileref_create_by_prompt(glui32 usage, glui32 fmode, glui32 rock)
 				GTK_FILE_CHOOSER_ACTION_OPEN);
 			break;
 		case filemode_Write:
-		case filemode_ReadWrite:
-		case filemode_WriteAppend:
-			chooser = gtk_file_chooser_dialog_new("Select a file", NULL,
+			chooser = gtk_file_chooser_dialog_new("Select a file to save to", NULL,
 				GTK_FILE_CHOOSER_ACTION_SAVE,
 				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 				GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
@@ -168,14 +169,26 @@ glk_fileref_create_by_prompt(glui32 usage, glui32 fmode, glui32 rock)
 			gtk_file_chooser_set_do_overwrite_confirmation(
 				GTK_FILE_CHOOSER(chooser), TRUE);
 			break;
+		case filemode_ReadWrite:
+		case filemode_WriteAppend:
+			chooser = gtk_file_chooser_dialog_new("Select a file to save to", NULL,
+				GTK_FILE_CHOOSER_ACTION_SAVE,
+				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+				GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+				NULL);
+			gtk_file_chooser_set_action(GTK_FILE_CHOOSER(chooser),
+				GTK_FILE_CHOOSER_ACTION_SAVE);
+			break;
 		default:
 			g_warning("glk_fileref_create_by_prompt: Unsupported mode");
+			gdk_threads_leave();
 			return NULL;
 	}
 	
 	if(gtk_dialog_run( GTK_DIALOG(chooser) ) != GTK_RESPONSE_ACCEPT)
 	{
 		gtk_widget_destroy(chooser);
+		gdk_threads_leave();
 		return NULL;
 	}
 	gchar *filename = 
@@ -183,6 +196,8 @@ glk_fileref_create_by_prompt(glui32 usage, glui32 fmode, glui32 rock)
 	frefid_t f = fileref_new(filename, rock, usage, fmode);
 	g_free(filename);
 	gtk_widget_destroy(chooser);
+
+	gdk_threads_leave();
 	return f;
 }
 
@@ -260,7 +275,7 @@ glk_fileref_create_from_fileref(glui32 usage, frefid_t fref, glui32 rock)
 void
 glk_fileref_destroy(frefid_t fref)
 {
-	fileref_list = g_list_delete_link(fileref_list, fref->fileref_list);
+	glk_data->fileref_list = g_list_delete_link(glk_data->fileref_list, fref->fileref_list);
 	if(fref->filename)
 		g_free(fref->filename);
 	g_free(fref);