--- np2/x11/gtk2/gtk_menu.c	2007/01/02 16:43:48	1.6
+++ np2/x11/gtk2/gtk_menu.c	2007/08/22 15:20:31	1.11
@@ -1,4 +1,4 @@
-/*	$Id: gtk_menu.c,v 1.6 2007/01/02 16:43:48 monaka Exp $	*/
+/*	$Id: gtk_menu.c,v 1.11 2007/08/22 15:20:31 monaka Exp $	*/
 
 /*
  * Copyright (c) 2004 NONAKA Kimihiro (aw9k-nnk@asahi-net.or.jp)
@@ -108,6 +108,7 @@ static GtkActionEntry menu_entries[] = {
 { "SASI1Menu",    NULL, "SASI-_1",   NULL, NULL, NULL },
 { "SASI2Menu",    NULL, "SASI-_2",   NULL, NULL, NULL },
 #endif
+{ "ScrnSizeMenu", NULL, "Size",      NULL, NULL, NULL },
 { "SoundMenu",    NULL, "_Sound",    NULL, NULL, NULL },
 
 /* MenuItem */
@@ -263,6 +264,16 @@ static GtkRadioActionEntry rotate_entrie
 };
 static const guint n_rotate_entries = G_N_ELEMENTS(rotate_entries);
 
+static GtkRadioActionEntry screensize_entries[] = {
+{ "320x200",  NULL, "320x200",  NULL, NULL, 4 },
+{ "480x300",  NULL, "480x300",  NULL, NULL, 6 },
+{ "640x400",  NULL, "640x400",  NULL, NULL, 8 },
+{ "800x500",  NULL, "800x500",  NULL, NULL, 10 },
+{ "960x600",  NULL, "960x600",  NULL, NULL, 12 },
+{ "1280x800", NULL, "1280x800", NULL, NULL, 16 },
+};
+static const guint n_screensize_entries = G_N_ELEMENTS(screensize_entries);
+
 static void cb_beepvol(gint idx);
 static void cb_f12key(gint idx);
 static void cb_framerate(gint idx);
@@ -270,6 +281,7 @@ static void cb_joykey(gint idx);
 static void cb_memory(gint idx);
 static void cb_rotate(gint idx);
 static void cb_screenmode(gint idx);
+static void cb_screensize(gint idx);
 static void cb_soundboard(gint idx);
 
 static const struct {
@@ -284,6 +296,7 @@ static const struct {
 	{ memory_entries, G_N_ELEMENTS(memory_entries), cb_memory },
 	{ rotate_entries, G_N_ELEMENTS(rotate_entries), cb_rotate },
 	{ screenmode_entries, G_N_ELEMENTS(screenmode_entries), cb_screenmode },
+	{ screensize_entries, G_N_ELEMENTS(screensize_entries), cb_screensize },
 	{ soundboard_entries, G_N_ELEMENTS(soundboard_entries), cb_soundboard },
 };
 static const guint n_radiomenu_entries = G_N_ELEMENTS(radiomenu_entries);
@@ -298,7 +311,6 @@ static const gchar *ui_info =
 "   <menuitem action='configure'/>\n"
 "   <menuitem action='newdisk'/>\n"
 "   <menuitem action='font'/>\n"
-"   <menuitem action='configure'/>\n"
 "   <separator/>\n"
 "   <menuitem action='exit'/>\n"
 "  </menu>\n"
@@ -340,11 +352,22 @@ static const gchar *ui_info =
 "   <menuitem action='dispvsync'/>\n"
 "   <menuitem action='realpalettes'/>\n"
 "   <menuitem action='nowait'/>\n"
-"   <menuitem name='framerate' action='autoframe'/>\n"
+"   <menuitem action='autoframe'/>\n"
 "   <menuitem action='fullframe'/>\n"
 "   <menuitem action='1/2 frame'/>\n"
 "   <menuitem action='1/3 frame'/>\n"
 "   <menuitem action='1/4 frame'/>\n"
+#if defined(SUPPORT_SCREENSIZE)
+"   <separator/>\n"
+"   <menu name='Size' action='ScrnSizeMenu'>\n"
+"    <menuitem action='320x200'/>\n"
+"    <menuitem action='480x300'/>\n"
+"    <menuitem action='640x400'/>\n"
+"    <menuitem action='800x500'/>\n"
+"    <menuitem action='960x600'/>\n"
+"    <menuitem action='1280x800'/>\n"
+"   </menu>\n"
+#endif
 "   <separator/>\n"
 "   <menuitem action='screenopt'/>\n"
 "  </menu>\n"
@@ -486,6 +509,8 @@ xmenu_select_item_by_index(MENU_HDL hdl,
 	xmenu_select_item_by_index(NULL, rotate_entries, n_rotate_entries, v);
 #define	xmenu_select_screenmode(v) \
 	xmenu_select_item_by_index(NULL, screenmode_entries, n_screenmode_entries, v);
+#define	xmenu_select_screensize(v) \
+	xmenu_select_item_by_index(NULL, screensize_entries, n_screensize_entries, v);
 #define	xmenu_select_soundboard(v) \
 	xmenu_select_item_by_index(NULL, soundboard_entries, n_soundboard_entries, v);
 
@@ -524,9 +549,13 @@ cb_bmpsave(GtkAction *action, gpointer u
 
 	g_object_set(G_OBJECT(dialog), "show-hidden", TRUE, NULL);
 	gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);
+	if (strlen(bmpfilefolder) == 0) {
+		g_strlcpy(bmpfilefolder, modulefile, sizeof(bmpfilefolder));
+		file_cutname(bmpfilefolder);
+	}
 	utf8 = g_filename_to_utf8(bmpfilefolder, -1, NULL, NULL, NULL);
 	if (utf8) {
-		gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), utf8);
+		gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), utf8);
 		g_free(utf8);
 	}
 
@@ -811,6 +840,8 @@ cb_ataopen(GtkAction *action, gpointer u
 	filter = gtk_file_filter_new();
 	if (filter) {
 		gtk_file_filter_set_name(filter, "IDE disk image files");
+		gtk_file_filter_add_pattern(filter, "*.[tT][hH][dD]");
+		gtk_file_filter_add_pattern(filter, "*.[hH][dD][iI]");
 		gtk_file_filter_add_pattern(filter, "*.[nN][hH][dD]");
 		gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter);
 	}
@@ -996,6 +1027,10 @@ cb_newdisk(GtkAction *action, gpointer u
 
 	g_object_set(G_OBJECT(dialog), "show-hidden", TRUE, NULL);
 	gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);
+	if (strlen(fddfolder) == 0) {
+		g_strlcpy(fddfolder, modulefile, sizeof(fddfolder));
+		file_cutname(fddfolder);
+	}
 	utf8 = g_filename_to_utf8(fddfolder, -1, NULL, NULL, NULL);
 	if (utf8) {
 		gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), utf8);
@@ -1036,11 +1071,8 @@ cb_newdisk(GtkAction *action, gpointer u
 	}
 	gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(dialog), filter[0]);
 
-	if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK) {
-		gtk_widget_destroy(dialog);
-		install_idle_process();
-		return;
-	}
+	if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK)
+		goto end;
 
 	utf8 = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
 	if (utf8 == NULL)
@@ -1649,6 +1681,19 @@ cb_screenmode(gint idx)
 }
 
 static void
+cb_screensize(gint idx)
+{
+	guint value;
+
+	if (idx >= 0) {
+		value = screensize_entries[idx].value;
+	} else {
+		value = 0;
+	}
+	scrnmng_setmultiple(value);
+}
+
+static void
 cb_soundboard(gint idx)
 {
 	guint value;
@@ -1692,6 +1737,71 @@ cb_radio(GtkRadioAction *action, GtkRadi
  * create menubar
  */
 static GtkWidget *menubar;
+static guint menubar_timerid;
+
+#define	EVENT_MASK	(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK)
+
+static gboolean
+menubar_timeout(gpointer p)
+{
+
+	UNUSED(p);
+
+	if (menubar_timerid) {
+		g_source_remove(menubar_timerid);
+		menubar_timerid = 0;
+	}
+
+	if (scrnmode & SCRNMODE_FULLSCREEN) {
+		xmenu_hide();
+	}
+
+	return TRUE;
+}
+
+/*
+ - Signal: gboolean GtkWidget::enter_notify_event (GtkWidget *widget,
+          GdkEventCrossing *event, gpointer user_data)
+*/
+static gboolean
+enter_notify_evhandler(GtkWidget *w, GdkEventCrossing *ev, gpointer p)
+{
+
+	UNUSED(w);
+	UNUSED(ev);
+	UNUSED(p);
+
+	if (menubar_timerid) {
+		g_source_remove(menubar_timerid);
+		menubar_timerid = 0;
+	}
+
+	return TRUE;
+}
+
+/*
+ - Signal: gboolean GtkWidget::leave_notify_event (GtkWidget *widget,
+          GdkEventCrossing *event, gpointer user_data)
+*/
+static gboolean
+leave_notify_evhandler(GtkWidget *w, GdkEventCrossing *ev, gpointer p)
+{
+
+	UNUSED(w);
+	UNUSED(ev);
+	UNUSED(p);
+
+	if (menubar_timerid) {
+		g_source_remove(menubar_timerid);
+		menubar_timerid = 0;
+	}
+
+	if (scrnmode & SCRNMODE_FULLSCREEN) {
+		menubar_timerid = g_timeout_add(1000, menubar_timeout, NULL);
+	}
+
+	return TRUE;
+}
 
 static void
 equip_fddrive(GtkUIManager *ui_manager, guint no)
@@ -1782,6 +1892,7 @@ create_menu(void)
 	xmenu_select_memory(np2cfg.EXTMEM);
 	xmenu_select_rotate(scrnmode & SCRNMODE_ROTATEMASK);
 	xmenu_select_screenmode(scrnmode & SCRNMODE_FULLSCREEN);
+	xmenu_select_screensize(SCREEN_DEFMUL);
 	xmenu_select_soundboard(np2cfg.SOUND_SW);
 
 	if (np2cfg.fddequip) {
@@ -1793,6 +1904,13 @@ create_menu(void)
 	}
 
 	menubar = gtk_ui_manager_get_widget(menu_hdl.ui_manager, "/MainMenu");
+
+	gtk_widget_add_events(menubar, EVENT_MASK);
+	g_signal_connect(GTK_OBJECT(menubar), "enter_notify_event",
+	            GTK_SIGNAL_FUNC(enter_notify_evhandler), NULL);
+	g_signal_connect(GTK_OBJECT(menubar), "leave_notify_event",
+	            GTK_SIGNAL_FUNC(leave_notify_evhandler), NULL);
+
 	return menubar;
 }
 
@@ -1811,6 +1929,16 @@ xmenu_show(void)
 }
 
 void
+xmenu_toggle_menu(void)
+{
+
+	if (GTK_WIDGET_VISIBLE(menubar))
+		xmenu_hide();
+	else
+		xmenu_show();
+}
+
+void
 xmenu_select_screen(UINT8 mode)
 {