--- np2/x11/gtk2/gtk_menu.c	2009/03/05 11:50:39	1.15
+++ np2/x11/gtk2/gtk_menu.c	2011/12/17 20:34:32	1.25
@@ -1,7 +1,5 @@
-/*	$Id: gtk_menu.c,v 1.15 2009/03/05 11:50:39 monaka Exp $	*/
-
 /*
- * Copyright (c) 2004 NONAKA Kimihiro (aw9k-nnk@asahi-net.or.jp)
+ * Copyright (c) 2004-2011 NONAKA Kimihiro
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -243,6 +241,7 @@ static GtkRadioActionEntry f12key_entrie
 { "f12mouse", NULL, "F12 = _Mouse",     NULL, NULL, 0 },
 { "f12copy",  NULL, "F12 = Co_py",      NULL, NULL, 1 },
 { "f12stop",  NULL, "F12 = S_top",      NULL, NULL, 2 },
+{ "f12help",  NULL, "F12 = _Help",      NULL, NULL, 7 },
 { "f12equal", NULL, "F12 = tenkey [=]", NULL, NULL, 4 },
 { "f12comma", NULL, "F12 = tenkey [,]", NULL, NULL, 3 },
 };
@@ -418,6 +417,7 @@ static const gchar *ui_info =
 "    <menuitem action='f12mouse'/>\n"
 "    <menuitem action='f12copy'/>\n"
 "    <menuitem action='f12stop'/>\n"
+"    <menuitem action='f12help'/>\n"
 "    <menuitem action='f12equal'/>\n"
 "    <menuitem action='f12comma'/>\n"
 "   </menu>\n"
@@ -564,9 +564,6 @@ cb_bmpsave(GtkAction *action, gpointer u
 	SCRNBMP bmp = NULL;
 	FILEH fh;
 
-	UNUSED(action);
-	UNUSED(user_data);
-
 	uninstall_idle_process();
 
 	bmp = scrnbmp();
@@ -581,8 +578,11 @@ cb_bmpsave(GtkAction *action, gpointer u
 	if (dialog == NULL)
 		goto end;
 
-	g_object_set(G_OBJECT(dialog), "show-hidden", TRUE, NULL);
-	gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);
+	gtk_file_chooser_set_show_hidden(GTK_FILE_CHOOSER(dialog), TRUE);
+#if GTK_MAJOR_VERSION >= 2 && GTK_MINOR_VERSION >= 8
+	gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog),
+	    TRUE);
+#endif
 	if (strlen(bmpfilefolder) == 0) {
 		g_strlcpy(bmpfilefolder, modulefile, sizeof(bmpfilefolder));
 		file_cutname(bmpfilefolder);
@@ -614,6 +614,12 @@ cb_bmpsave(GtkAction *action, gpointer u
 	if (utf8) {
 		path = g_filename_from_utf8(utf8, -1, NULL, NULL, NULL);
 		if (path) {
+			gchar *ext = file_getext(path);
+			if (strlen(ext) != 3 || file_cmpname(ext, "bmp")) {
+				gchar *tmp = g_strjoin(".", path, "bmp", NULL);
+				g_free(path);
+				path = tmp;
+			}
 			file_cpyname(bmpfilefolder, path, sizeof(bmpfilefolder));
 			sysmng_update(SYS_UPDATEOSCFG);
 			fh = file_create(path);
@@ -642,9 +648,6 @@ cb_change_font(GtkAction *action, gpoint
 	gchar *utf8, *path;
 	struct stat sb;
 
-	UNUSED(action);
-	UNUSED(user_data);
-
 	uninstall_idle_process();
 
 	dialog = gtk_file_chooser_dialog_new("Open a font file",
@@ -655,8 +658,7 @@ cb_change_font(GtkAction *action, gpoint
 	if (dialog == NULL)
 		goto end;
 
-	g_object_set(G_OBJECT(dialog), "show-hidden", TRUE, NULL);
-	gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);
+	gtk_file_chooser_set_show_hidden(GTK_FILE_CHOOSER(dialog), TRUE);
 	utf8 = g_filename_to_utf8(np2cfg.fontfile, -1, NULL, NULL, NULL);
 	if (utf8) {
 		gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), utf8);
@@ -708,8 +710,6 @@ cb_diskeject(GtkAction *action, gpointer
 	const gchar *name = gtk_action_get_name(action);
 	guint drive;
 
-	UNUSED(user_data);
-
 	/* name = "disk?eject" */
 	if ((strlen(name) >= 5) && (g_ascii_isdigit(name[4]))) {
 		drive = g_ascii_digit_value(name[4]) - 1;
@@ -730,8 +730,6 @@ cb_diskopen(GtkAction *action, gpointer 
 	const gchar *name = gtk_action_get_name(action);
 	guint drive;
 
-	UNUSED(user_data);
-
 	if ((strlen(name) < 5) || (!g_ascii_isdigit(name[4])))
 		return;
 	drive = g_ascii_digit_value(name[4]) - 1;
@@ -746,8 +744,7 @@ cb_diskopen(GtkAction *action, gpointer 
 	if (dialog == NULL)
 		goto end;
 
-	g_object_set(G_OBJECT(dialog), "show-hidden", TRUE, NULL);
-	gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);
+	gtk_file_chooser_set_show_hidden(GTK_FILE_CHOOSER(dialog), TRUE);
 	utf8 = g_filename_to_utf8(fddfolder, -1, NULL, NULL, NULL);
 	if (utf8) {
 		gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), utf8);
@@ -833,8 +830,6 @@ cb_ataopen(GtkAction *action, gpointer u
 	const gchar *name = gtk_action_get_name(action);
 	guint channel, drive;
 
-	UNUSED(user_data);
-
 	/* "ata??open" */
 	if ((strlen(name) < 5)
 	 || (!g_ascii_isdigit(name[3]))
@@ -857,8 +852,7 @@ cb_ataopen(GtkAction *action, gpointer u
 	if (dialog == NULL)
 		goto end;
 
-	g_object_set(G_OBJECT(dialog), "show-hidden", TRUE, NULL);
-	gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);
+	gtk_file_chooser_set_show_hidden(GTK_FILE_CHOOSER(dialog), TRUE);
 	utf8 = g_filename_to_utf8(hddfolder, -1, NULL, NULL, NULL);
 	if (utf8) {
 		gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), utf8);
@@ -910,8 +904,6 @@ cb_ataremove(GtkAction *action, gpointer
 	const gchar *name = gtk_action_get_name(GTK_ACTION(action));
 	guint channel, drive;
 
-	UNUSED(user_data);
-
 	/* "ata??open" */
 	if ((strlen(name) < 5)
 	 || (!g_ascii_isdigit(name[3]))
@@ -936,9 +928,6 @@ cb_atapiopen(GtkAction *action, gpointer
 	gchar *utf8, *path;
 	struct stat sb;
 
-	UNUSED(action);
-	UNUSED(user_data);
-
 	uninstall_idle_process();
 
 	dialog = gtk_file_chooser_dialog_new("Open a ATAPI CD-ROM image",
@@ -949,8 +938,7 @@ cb_atapiopen(GtkAction *action, gpointer
 	if (dialog == NULL)
 		goto end;
 
-	g_object_set(G_OBJECT(dialog), "show-hidden", TRUE, NULL);
-	gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);
+	gtk_file_chooser_set_show_hidden(GTK_FILE_CHOOSER(dialog), TRUE);
 	utf8 = g_filename_to_utf8(hddfolder, -1, NULL, NULL, NULL);
 	if (utf8) {
 		gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), utf8);
@@ -1004,9 +992,6 @@ static void
 cb_atapiremove(GtkAction *action, gpointer user_data)
 {
 
-	UNUSED(action);
-	UNUSED(user_data);
-
 	sxsi_devclose(0x02);
 }
 #endif	/* SUPPORT_IDEIO */
@@ -1015,9 +1000,6 @@ static void
 cb_midipanic(GtkAction *action, gpointer user_data)
 {
 
-	UNUSED(action);
-	UNUSED(user_data);
-
 	rs232c_midipanic();
 	mpu98ii_midipanic();
 	pc9861k_midipanic();
@@ -1046,9 +1028,6 @@ cb_newdisk(GtkAction *action, gpointer u
 	int kind;
 	int i;
 
-	UNUSED(action);
-	UNUSED(user_data);
-
 	uninstall_idle_process();
 
 	dialog = gtk_file_chooser_dialog_new("Create new disk image file",
@@ -1059,8 +1038,11 @@ cb_newdisk(GtkAction *action, gpointer u
 	if (dialog == NULL)
 		goto end;
 
-	g_object_set(G_OBJECT(dialog), "show-hidden", TRUE, NULL);
-	gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);
+	gtk_file_chooser_set_show_hidden(GTK_FILE_CHOOSER(dialog), TRUE);
+#if GTK_MAJOR_VERSION >= 2 && GTK_MINOR_VERSION >= 8
+	gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog),
+	    TRUE);
+#endif
 	if (strlen(fddfolder) == 0) {
 		g_strlcpy(fddfolder, modulefile, sizeof(fddfolder));
 		file_cutname(fddfolder);
@@ -1172,9 +1154,6 @@ static void
 cb_reset(GtkAction *action, gpointer user_data)
 {
 
-	UNUSED(action);
-	UNUSED(user_data);
-
 	pccore_cfgupdate();
 	pccore_reset();
 }
@@ -1190,8 +1169,6 @@ cb_sasiopen(GtkAction *action, gpointer 
 	const gchar *name = gtk_action_get_name(action);
 	guint drive;
 
-	UNUSED(user_data);
-
 	if ((strlen(name) < 5) || (!g_ascii_isdigit(name[4])))
 		return;
 	drive = g_ascii_digit_value(name[4]) - 1;
@@ -1206,8 +1183,7 @@ cb_sasiopen(GtkAction *action, gpointer 
 	if (dialog == NULL)
 		goto end;
 
-	g_object_set(G_OBJECT(dialog), "show-hidden", TRUE, NULL);
-	gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);
+	gtk_file_chooser_set_show_hidden(GTK_FILE_CHOOSER(dialog), TRUE);
 	utf8 = g_filename_to_utf8(hddfolder, -1, NULL, NULL, NULL);
 	if (utf8) {
 		gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), utf8);
@@ -1259,8 +1235,6 @@ cb_sasiremove(GtkAction *action, gpointe
 	const gchar *name = gtk_action_get_name(GTK_ACTION(action));
 	guint drive;
 
-	UNUSED(user_data);
-
 	/* name = "sasi?eject" */
 	if ((strlen(name) >= 5) && (g_ascii_isdigit(name[4]))) {
 		drive = g_ascii_digit_value(name[4]) - 1;
@@ -1279,8 +1253,6 @@ cb_statsave(GtkAction *action, gpointer 
 	char ext[4];
 	guint n;
 
-	UNUSED(user_data);
-
 	/* name = "stat??save" */
 	if ((strlen(name) >= 6)
 	 && (g_ascii_isdigit(name[4]))
@@ -1299,8 +1271,6 @@ cb_statload(GtkAction *action, gpointer 
 	char ext[4];
 	guint n;
 
-	UNUSED(user_data);
-
 	/* name = "stat??load" */
 	if ((strlen(name) >= 6)
 	 && (g_ascii_isdigit(name[4]))
@@ -1318,8 +1288,6 @@ cb_dialog(GtkAction *action, gpointer us
 {
 	const gchar *name = gtk_action_get_name(action);
 
-	UNUSED(user_data);
-
 	if (g_ascii_strcasecmp(name, "configure") == 0) {
 		create_configure_dialog();
 	} else if (g_ascii_strcasecmp(name, "soundopt") == 0) {
@@ -1346,8 +1314,6 @@ cb_clockdisp(GtkToggleAction *action, gp
 	gboolean b = gtk_toggle_action_get_active(action);
 	gboolean f;
 
-	UNUSED(user_data);
-
 	f = (np2oscfg.DISPCLK & 1) ^ (b ? 1 : 0);
 	if (f) {
 		np2oscfg.DISPCLK ^= 1;
@@ -1363,8 +1329,6 @@ cb_dispvsync(GtkToggleAction *action, gp
 	gboolean b = gtk_toggle_action_get_active(action);
 	gboolean f;
 
-	UNUSED(user_data);
-
 	f = (np2cfg.DISPSYNC ? 1 : 0) ^ (b ? 1 : 0);
 	if (f) {
 		np2cfg.DISPSYNC = !np2cfg.DISPSYNC;
@@ -1378,8 +1342,6 @@ cb_framedisp(GtkToggleAction *action, gp
 	gboolean b = gtk_toggle_action_get_active(action);
 	gboolean f;
 
-	UNUSED(user_data);
-
 	f = (np2oscfg.DISPCLK & 2) ^ (b ? 2 : 0);
 	if (f) {
 		np2oscfg.DISPCLK ^= 2;
@@ -1395,8 +1357,6 @@ cb_jastsound(GtkToggleAction *action, gp
 	gboolean b = gtk_toggle_action_get_active(action);
 	gboolean f;
 
-	UNUSED(user_data);
-
 	f = (np2oscfg.jastsnd ? 1 : 0) ^ (b ? 1 : 0);
 	if (f) {
 		np2oscfg.jastsnd = !np2oscfg.jastsnd;
@@ -1410,8 +1370,6 @@ cb_joyrapid(GtkToggleAction *action, gpo
 	gboolean b = gtk_toggle_action_get_active(action);
 	gboolean f;
 
-	UNUSED(user_data);
-
 	f = (np2cfg.BTN_RAPID ? 1 : 0) ^ (b ? 1 : 0);
 	if (f) {
 		np2cfg.BTN_RAPID = !np2cfg.BTN_RAPID;
@@ -1425,8 +1383,6 @@ cb_joyreverse(GtkToggleAction *action, g
 	gboolean b = gtk_toggle_action_get_active(action);
 	gboolean f;
 
-	UNUSED(user_data);
-
 	f = (np2cfg.BTN_MODE ? 1 : 0) ^ (b ? 1 : 0);
 	if (f) {
 		np2cfg.BTN_MODE = !np2cfg.BTN_MODE;
@@ -1440,8 +1396,6 @@ cb_keydisplay(GtkToggleAction *action, g
 	gboolean b = gtk_toggle_action_get_active(action);
 	gboolean f;
 
-	UNUSED(user_data);
-
 	f = (np2oscfg.keydisp ? 1 : 0) ^ (b ? 1 : 0);
 	if (f) {
 		np2oscfg.keydisp = !np2oscfg.keydisp;
@@ -1460,8 +1414,6 @@ cb_mousemode(GtkToggleAction *action, gp
 	gboolean b = gtk_toggle_action_get_active(action);
 	gboolean f;
 
-	UNUSED(user_data);
-
 	f = (np2oscfg.MOUSE_SW ? 1 : 0) ^ (b ? 1 : 0);
 	if (f) {
 		mouse_running(MOUSE_XOR);
@@ -1476,8 +1428,6 @@ cb_mouserapid(GtkToggleAction *action, g
 	gboolean b = gtk_toggle_action_get_active(action);
 	gboolean f;
 
-	UNUSED(user_data);
-
 	f = (np2cfg.MOUSERAPID ? 1 : 0) ^ (b ? 1 : 0);
 	if (f) {
 		np2cfg.MOUSERAPID = !np2cfg.MOUSERAPID;
@@ -1491,8 +1441,6 @@ cb_nowait(GtkToggleAction *action, gpoin
 	gboolean b = gtk_toggle_action_get_active(action);
 	gboolean f;
 
-	UNUSED(user_data);
-
 	f = (np2oscfg.NOWAIT ? 1 : 0) ^ (b ? 1 : 0);
 	if (f) {
 		np2oscfg.NOWAIT = !np2oscfg.NOWAIT;
@@ -1506,8 +1454,6 @@ cb_realpalettes(GtkToggleAction *action,
 	gboolean b = gtk_toggle_action_get_active(action);
 	gboolean f;
 
-	UNUSED(user_data);
-
 	f = (np2cfg.RASTER ? 1 : 0) ^ (b ? 1 : 0);
 	if (f) {
 		np2cfg.RASTER = !np2cfg.RASTER;
@@ -1523,8 +1469,6 @@ cb_s98logging(GtkToggleAction *action, g
 	gboolean b = gtk_toggle_action_get_active(action);
 	gboolean f;
 
-	UNUSED(user_data);
-
 	f = (s98logging ? 1 : 0) ^ (b ? 1 : 0);
 	if (f) {
 		s98logging = !s98logging;
@@ -1546,8 +1490,6 @@ cb_seeksound(GtkToggleAction *action, gp
 	gboolean b = gtk_toggle_action_get_active(action);
 	gboolean f;
 
-	UNUSED(user_data);
-
 	f = (np2cfg.MOTOR ? 1 : 0) ^ (b ? 1 : 0);
 	if (f) {
 		np2cfg.MOTOR = !np2cfg.MOTOR;
@@ -1561,8 +1503,6 @@ cb_softkeyboard(GtkToggleAction *action,
 	gboolean b = gtk_toggle_action_get_active(action);
 	gboolean f;
 
-	UNUSED(user_data);
-
 	f = (np2oscfg.softkbd ? 1 : 0) ^ (b ? 1 : 0);
 	if (f) {
 		np2oscfg.softkbd = !np2oscfg.softkbd;
@@ -1581,8 +1521,6 @@ cb_toolwindow(GtkToggleAction *action, g
 	gboolean b = gtk_toggle_action_get_active(action);
 	gboolean f;
 
-	UNUSED(user_data);
-
 	f = (np2oscfg.toolwin ? 1 : 0) ^ (b ? 1 : 0);
 	if (f) {
 		np2oscfg.toolwin = !np2oscfg.toolwin;
@@ -1601,8 +1539,6 @@ cb_xctrlkey(GtkToggleAction *action, gpo
 	gboolean b = gtk_toggle_action_get_active(action);
 	gboolean f;
 
-	UNUSED(user_data);
-
 	f = (np2cfg.XSHIFT & 2) ^ (b ? 2 : 0);
 	if (f) {
 		np2cfg.XSHIFT ^= 2;
@@ -1617,8 +1553,6 @@ cb_xgrphkey(GtkToggleAction *action, gpo
 	gboolean b = gtk_toggle_action_get_active(action);
 	gboolean f;
 
-	UNUSED(user_data);
-
 	f = (np2cfg.XSHIFT & 4) ^ (b ? 4 : 0);
 	if (f) {
 		np2cfg.XSHIFT ^= 4;
@@ -1633,8 +1567,6 @@ cb_xshiftkey(GtkToggleAction *action, gp
 	gboolean b = gtk_toggle_action_get_active(action);
 	gboolean f;
 
-	UNUSED(user_data);
-
 	f = (np2cfg.XSHIFT & 1) ^ (b ? 1 : 0);
 	if (f) {
 		np2cfg.XSHIFT ^= 1;
@@ -1792,8 +1724,6 @@ cb_radio(GtkRadioAction *action, GtkRadi
 	guint menu_idx = (guint)GPOINTER_TO_INT(user_data);
 	gint i;
 
-	UNUSED(current);	/* emitted item */
-
 	if (menu_idx < n_radiomenu_entries) {
 		for (i = 0; i < radiomenu_entries[menu_idx].count; i++) {
 			if (radiomenu_entries[menu_idx].entry[i].value == value)
@@ -1821,8 +1751,6 @@ static gboolean
 menubar_timeout(gpointer p)
 {
 
-	UNUSED(p);
-
 	if (menubar_timerid) {
 		g_source_remove(menubar_timerid);
 		menubar_timerid = 0;
@@ -1843,10 +1771,6 @@ 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;
@@ -1863,10 +1787,6 @@ 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;
@@ -2062,7 +1982,7 @@ void
 xmenu_toggle_menu(void)
 {
 
-	if (GTK_WIDGET_VISIBLE(menubar))
+	if (gtk_widget_get_visible(menubar))
 		xmenu_hide();
 	else
 		xmenu_show();