X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Ffilemenu.c;h=ce13368ef44697259e3afd1041ab1b3f49d8b71c;hb=bd7fa9a1fba21965467664b72772dddc5e9e0884;hp=560f4d9b18fa3ade561429372ca82590f68ba94f;hpb=a689c767988e598344ba249cde5709c4b24f3e00;p=emu8051.git

diff --git a/src/filemenu.c b/src/filemenu.c
index 560f4d9..ce13368 100644
--- a/src/filemenu.c
+++ b/src/filemenu.c
@@ -34,11 +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 *cwd;
+	char *dir;
+	char *cwd = NULL;
 
 #if defined(DEBUG)
 	g_print("FileOpenEvent()\n");
@@ -50,10 +76,19 @@ FileOpenEvent(GtkObject *object, gpointer data)
 		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 		GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
 
-	/* Opening file chooser to current working directory. */
-	cwd = g_get_current_dir();
-	gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(file_dialog), cwd);
-	g_free (cwd);
+	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;
@@ -66,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);
 		}
@@ -94,7 +131,7 @@ FileAddMenu(GtkWidget *menu_bar)
 
 	/* Create the 'open' item. */
 	item = gtk_menu_item_new_with_label(FILENAME_DESCRIPTION);
-	gtk_menu_append(GTK_MENU(menu), item);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 	/* Attach the callback functions to the activate signal. */
 	gtk_signal_connect_object(GTK_OBJECT(item), "activate",
 				  GTK_SIGNAL_FUNC(FileOpenEvent), NULL);
@@ -102,7 +139,7 @@ FileAddMenu(GtkWidget *menu_bar)
 	AddMenuSeparator(menu);
 
 	item = gtk_menu_item_new_with_label("Exit");
-	gtk_menu_append(GTK_MENU(menu), item);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 	/* We can attach the Quit menu item to our exit function */
 	gtk_signal_connect_object(GTK_OBJECT(item), "activate",
 				  GTK_SIGNAL_FUNC(FileQuitEvent),