X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Ffilemenu.c;h=1f3df9f931ffcf3d7c0bfb34dd36402866621b8f;hb=9a4763975619ad66d0bcbb3f2da127f45fe21422;hp=c3f13e03a31dfebd1e2824e55d3df22b591482fa;hpb=e57f14d42e7caff4850d0613611cfe764a9b39aa;p=emu8051.git

diff --git a/src/filemenu.c b/src/filemenu.c
index c3f13e0..1f3df9f 100644
--- a/src/filemenu.c
+++ b/src/filemenu.c
@@ -34,10 +34,37 @@
 
 #define FILENAME_DESCRIPTION "Open Intel Hex file"
 
+static char previous_folder[MAX_FILENAME_LENGTH + 1];
+
+static void
+remember_current_folder(GtkFileChooser *chooser)
+{
+	char *folder;
+
+	folder = gtk_file_chooser_get_current_folder(chooser);
+
+	if (folder != NULL) {
+		if (strlen(folder) >= MAX_FILENAME_LENGTH) {
+			/* Non-critical error */
+			g_print("current folder name too long for buffer\n");
+		} else {
+#if defined(DEBUG)
+			g_print("current folder = %s\n", folder);
+#endif
+
+			strncpy(previous_folder, folder, MAX_FILENAME_LENGTH);
+		}
+
+		g_free(folder);
+	}
+}
+
 void
 FileOpenEvent(GtkObject *object, gpointer data)
 {
 	GtkWidget *file_dialog;
+	char *dir;
+	char *cwd = NULL;
 
 #if defined(DEBUG)
 	g_print("FileOpenEvent()\n");
@@ -49,6 +76,20 @@ FileOpenEvent(GtkObject *object, gpointer data)
 		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 		GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
 
+	if (strlen(previous_folder) == 0) {
+		/* Opening file chooser to current working directory. */
+		cwd = g_get_current_dir();
+		dir = cwd;
+	} else {
+		/* Opening file chooser to previous opened directory. */
+		dir = previous_folder;
+	}
+
+	gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(file_dialog), dir);
+
+	if (cwd)
+		g_free(cwd);
+
 	if (gtk_dialog_run(GTK_DIALOG(file_dialog)) == GTK_RESPONSE_ACCEPT) {
 		char *selected_file;
 
@@ -60,6 +101,8 @@ FileOpenEvent(GtkObject *object, gpointer data)
 			g_print("emugtk_File = %s\n", selected_file);
 #endif
 
+			remember_current_folder(GTK_FILE_CHOOSER(file_dialog));
+
 			emugtk_new_file(selected_file);
 			g_free(selected_file);
 		}