--- np2/x11/gtk2/gtk_menu.c 2007/01/21 00:24:24 1.8 +++ np2/x11/gtk2/gtk_menu.c 2011/12/17 20:34:32 1.25 @@ -1,7 +1,5 @@ -/* $Id: gtk_menu.c,v 1.8 2007/01/21 00:24:24 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 @@ -60,6 +58,9 @@ #include "gtk2/gtk_menu.h" #include "gtk2/gtk_keyboard.h" +#ifndef NSTATSAVE +#define NSTATSAVE 10 +#endif /* normal */ static void cb_bmpsave(GtkAction *action, gpointer user_data); @@ -79,6 +80,10 @@ static void cb_reset(GtkAction *action, static void cb_sasiopen(GtkAction *action, gpointer user_data); static void cb_sasiremove(GtkAction *action, gpointer user_data); #endif +#if defined(SUPPORT_STATSAVE) +static void cb_statsave(GtkAction *action, gpointer user_data); +static void cb_statload(GtkAction *action, gpointer user_data); +#endif static void cb_dialog(GtkAction *action, gpointer user_data); static void cb_radio(GtkRadioAction *action, GtkRadioAction *current, gpointer user_data); @@ -91,6 +96,7 @@ static GtkActionEntry menu_entries[] = { { "ScreenMenu", NULL, "Screen", NULL, NULL, NULL }, { "DeviceMenu", NULL, "Device", NULL, NULL, NULL }, { "OtherMenu", NULL, "Other", NULL, NULL, NULL }, +{ "StatMenu", NULL, "Stat", NULL, NULL, NULL }, /* Submenu */ { "Drive1Menu", NULL, "Drive_1", NULL, NULL, NULL }, @@ -108,6 +114,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 */ @@ -146,6 +153,28 @@ static GtkActionEntry menu_entries[] = { { "serialopt", NULL, "Se_rial option...", NULL, NULL, G_CALLBACK(cb_dialog) }, { "soundopt", NULL, "So_und option...", NULL, NULL, G_CALLBACK(cb_dialog) }, { "reset", NULL, "_Reset", NULL, NULL, G_CALLBACK(cb_reset) }, +#if defined(SUPPORT_STATSAVE) +{ "stat00save", NULL, "Save 0", NULL, NULL, G_CALLBACK(cb_statsave), }, +{ "stat01save", NULL, "Save 1", NULL, NULL, G_CALLBACK(cb_statsave), }, +{ "stat02save", NULL, "Save 2", NULL, NULL, G_CALLBACK(cb_statsave), }, +{ "stat03save", NULL, "Save 3", NULL, NULL, G_CALLBACK(cb_statsave), }, +{ "stat04save", NULL, "Save 4", NULL, NULL, G_CALLBACK(cb_statsave), }, +{ "stat05save", NULL, "Save 5", NULL, NULL, G_CALLBACK(cb_statsave), }, +{ "stat06save", NULL, "Save 6", NULL, NULL, G_CALLBACK(cb_statsave), }, +{ "stat07save", NULL, "Save 7", NULL, NULL, G_CALLBACK(cb_statsave), }, +{ "stat08save", NULL, "Save 8", NULL, NULL, G_CALLBACK(cb_statsave), }, +{ "stat09save", NULL, "Save 9", NULL, NULL, G_CALLBACK(cb_statsave), }, +{ "stat00load", NULL, "Load 0", NULL, NULL, G_CALLBACK(cb_statload), }, +{ "stat01load", NULL, "Load 1", NULL, NULL, G_CALLBACK(cb_statload), }, +{ "stat02load", NULL, "Load 2", NULL, NULL, G_CALLBACK(cb_statload), }, +{ "stat03load", NULL, "Load 3", NULL, NULL, G_CALLBACK(cb_statload), }, +{ "stat04load", NULL, "Load 4", NULL, NULL, G_CALLBACK(cb_statload), }, +{ "stat05load", NULL, "Load 5", NULL, NULL, G_CALLBACK(cb_statload), }, +{ "stat06load", NULL, "Load 6", NULL, NULL, G_CALLBACK(cb_statload), }, +{ "stat07load", NULL, "Load 7", NULL, NULL, G_CALLBACK(cb_statload), }, +{ "stat08load", NULL, "Load 8", NULL, NULL, G_CALLBACK(cb_statload), }, +{ "stat09load", NULL, "Load 9", NULL, NULL, G_CALLBACK(cb_statload), }, +#endif }; static const guint n_menu_entries = G_N_ELEMENTS(menu_entries); @@ -212,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 }, }; @@ -263,6 +293,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 +310,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 +325,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,10 +340,13 @@ static const gchar *ui_info = " \n" " \n" " \n" -" \n" " \n" " \n" " \n" +#if defined(SUPPORT_STATSAVE) +" \n" +" \n" +#endif " \n" " \n" " \n" @@ -340,11 +385,22 @@ static const gchar *ui_info = " \n" " \n" " \n" -" \n" +" \n" " \n" " \n" " \n" " \n" +#if defined(SUPPORT_SCREENSIZE) +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +#endif " \n" " \n" " \n" @@ -361,6 +417,7 @@ static const gchar *ui_info = " \n" " \n" " \n" +" \n" " \n" " \n" " \n" @@ -486,6 +543,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); @@ -505,9 +564,6 @@ cb_bmpsave(GtkAction *action, gpointer u SCRNBMP bmp = NULL; FILEH fh; - UNUSED(action); - UNUSED(user_data); - uninstall_idle_process(); bmp = scrnbmp(); @@ -522,11 +578,18 @@ 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); + } 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); } @@ -551,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); @@ -579,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", @@ -592,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); @@ -645,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; @@ -667,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; @@ -683,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); @@ -770,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])) @@ -794,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); @@ -811,6 +868,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); } @@ -845,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])) @@ -871,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", @@ -884,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); @@ -939,9 +992,6 @@ static void cb_atapiremove(GtkAction *action, gpointer user_data) { - UNUSED(action); - UNUSED(user_data); - sxsi_devclose(0x02); } #endif /* SUPPORT_IDEIO */ @@ -950,9 +1000,6 @@ static void cb_midipanic(GtkAction *action, gpointer user_data) { - UNUSED(action); - UNUSED(user_data); - rs232c_midipanic(); mpu98ii_midipanic(); pc9861k_midipanic(); @@ -981,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", @@ -994,8 +1038,15 @@ 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); + } utf8 = g_filename_to_utf8(fddfolder, -1, NULL, NULL, NULL); if (utf8) { gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), utf8); @@ -1009,7 +1060,7 @@ cb_newdisk(GtkAction *action, gpointer u filter[0] = gtk_file_filter_new(); if (filter[0]) { - gtk_file_filter_set_name(filter[0], "D88 floppy disk image"); + gtk_file_filter_set_name(filter[0], "D88 floppy disk image (*.d88,*.d98,*.88d,*.98d)"); gtk_file_filter_add_pattern(filter[0], "*.[dD]88"); gtk_file_filter_add_pattern(filter[0], "*.88[dD]"); gtk_file_filter_add_pattern(filter[0], "*.[dD]98"); @@ -1018,19 +1069,19 @@ cb_newdisk(GtkAction *action, gpointer u } filter[1] = gtk_file_filter_new(); if (filter[1]) { - gtk_file_filter_set_name(filter[1], "Anex86 hard disk image files"); + gtk_file_filter_set_name(filter[1], "Anex86 hard disk image (*.hdi)"); gtk_file_filter_add_pattern(filter[1], "*.[hH][dD][iI]"); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter[1]); } filter[2] = gtk_file_filter_new(); if (filter[2]) { - gtk_file_filter_set_name(filter[2], "T98 hard disk image files"); + gtk_file_filter_set_name(filter[2], "T98 hard disk image (*.thd)"); gtk_file_filter_add_pattern(filter[2], "*.[tT][hH][dD]"); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter[2]); } filter[3] = gtk_file_filter_new(); if (filter[3]) { - gtk_file_filter_set_name(filter[3], "T98-Next hard disk image files"); + gtk_file_filter_set_name(filter[3], "T98-Next hard disk image (*.nhd)"); gtk_file_filter_add_pattern(filter[3], "*.[nN][hH][dD]"); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter[3]); } @@ -1103,9 +1154,6 @@ static void cb_reset(GtkAction *action, gpointer user_data) { - UNUSED(action); - UNUSED(user_data); - pccore_cfgupdate(); pccore_reset(); } @@ -1121,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; @@ -1137,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); @@ -1190,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; @@ -1202,13 +1245,49 @@ cb_sasiremove(GtkAction *action, gpointe } #endif /* !SUPPORT_IDEIO */ +#if defined(SUPPORT_STATSAVE) +static void +cb_statsave(GtkAction *action, gpointer user_data) +{ + const gchar *name = gtk_action_get_name(GTK_ACTION(action)); + char ext[4]; + guint n; + + /* name = "stat??save" */ + if ((strlen(name) >= 6) + && (g_ascii_isdigit(name[4])) + && (g_ascii_isdigit(name[5]))) { + n = g_ascii_digit_value(name[4]) * 10; + n += g_ascii_digit_value(name[5]); + g_snprintf(ext, sizeof(ext), np2flagext, n); + flagsave(ext); + } +} + +static void +cb_statload(GtkAction *action, gpointer user_data) +{ + const gchar *name = gtk_action_get_name(GTK_ACTION(action)); + char ext[4]; + guint n; + + /* name = "stat??load" */ + if ((strlen(name) >= 6) + && (g_ascii_isdigit(name[4])) + && (g_ascii_isdigit(name[5]))) { + n = g_ascii_digit_value(name[4]) * 10; + n += g_ascii_digit_value(name[5]); + g_snprintf(ext, sizeof(ext), np2flagext, n); + flagload(ext, "Status Load", TRUE); + } +} +#endif + static void cb_dialog(GtkAction *action, gpointer user_data) { 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) { @@ -1235,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; @@ -1252,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; @@ -1267,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; @@ -1284,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; @@ -1299,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; @@ -1314,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; @@ -1329,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; @@ -1349,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); @@ -1365,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; @@ -1380,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; @@ -1395,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; @@ -1412,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; @@ -1435,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; @@ -1450,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; @@ -1470,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; @@ -1490,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; @@ -1506,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; @@ -1522,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; @@ -1646,6 +1689,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; @@ -1668,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) @@ -1691,14 +1745,12 @@ cb_radio(GtkRadioAction *action, GtkRadi static GtkWidget *menubar; static guint menubar_timerid; -#define EVENT_MASK (GDK_LEAVE_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK) +#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; @@ -1719,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; @@ -1739,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; @@ -1755,10 +1799,50 @@ leave_notify_evhandler(GtkWidget *w, Gdk return TRUE; } +#if defined(SUPPORT_STATSAVE) +static void +create_menu_statsave(GtkUIManager *ui_manager, int num) +{ + char *name, *action; + guint id; + int i; + + if (num <= 0) + return; + + /* Save %d */ + for (i = 0; i < num; i++) { + id = gtk_ui_manager_new_merge_id(ui_manager); + name = g_strdup_printf("Save %d", i); + action = g_strdup_printf("stat%02dsave", i); + gtk_ui_manager_add_ui(ui_manager, id, "/MainMenu/Stat", + name, action, GTK_UI_MANAGER_MENUITEM, FALSE); + g_free(action); + g_free(name); + } + + /* separator */ + id = gtk_ui_manager_new_merge_id(ui_manager); + gtk_ui_manager_add_ui(ui_manager, id, "/MainMenu/Stat", + "", "", GTK_UI_MANAGER_SEPARATOR, FALSE); + + /* Load %d */ + for (i = 0; i < num; i++) { + id = gtk_ui_manager_new_merge_id(ui_manager); + name = g_strdup_printf("Load %d", i); + action = g_strdup_printf("stat%02dload", i); + gtk_ui_manager_add_ui(ui_manager, id, "/MainMenu/Stat", + name, action, GTK_UI_MANAGER_MENUITEM, FALSE); + g_free(action); + g_free(name); + } +} +#endif + static void equip_fddrive(GtkUIManager *ui_manager, guint no) { - char path[32], name[32], action[32]; + char *path, *name, *action; guint id; if (no >= 4) @@ -1766,23 +1850,32 @@ equip_fddrive(GtkUIManager *ui_manager, no++; id = gtk_ui_manager_new_merge_id(ui_manager); - g_snprintf(name, sizeof(name), "Drive%d", no); - g_snprintf(action, sizeof(action), "Drive%dMenu", no); + name = g_strdup_printf("Drive%d", no); + action = g_strdup_printf("Drive%dMenu", no); gtk_ui_manager_add_ui(ui_manager, id, "/MainMenu/FDD", name, action, GTK_UI_MANAGER_MENU, FALSE); + g_free(action); + g_free(name); + + path = g_strdup_printf("/MainMenu/FDD/Drive%d", no); - g_snprintf(path, sizeof(path), "/MainMenu/FDD/Drive%d", no); id = gtk_ui_manager_new_merge_id(ui_manager); - g_snprintf(name, sizeof(name), "Drive%dOpen", no); - g_snprintf(action, sizeof(action), "disk%dopen", no); + name = g_strdup_printf("Drive%dOpen", no); + action = g_strdup_printf("disk%dopen", no); gtk_ui_manager_add_ui(ui_manager, id, path, name, action, GTK_UI_MANAGER_MENUITEM, FALSE); + g_free(action); + g_free(name); id = gtk_ui_manager_new_merge_id(ui_manager); - g_snprintf(name, sizeof(name), "Drive%dEject", no); - g_snprintf(action, sizeof(action), "disk%deject", no); + name = g_strdup_printf("Drive%dEject", no); + action = g_strdup_printf("disk%deject", no); gtk_ui_manager_add_ui(ui_manager, id, path, name, action, GTK_UI_MANAGER_MENUITEM, FALSE); + g_free(action); + g_free(name); + + g_free(path); } GtkWidget * @@ -1818,6 +1911,19 @@ create_menu(void) return NULL; } +#if defined(SUPPORT_STATSAVE) + if (np2oscfg.statsave) { + create_menu_statsave(menu_hdl.ui_manager, NSTATSAVE); + } +#endif + if (np2cfg.fddequip) { + for (i = 0; i < 4; i++) { + if (np2cfg.fddequip & (1 << i)) { + equip_fddrive(menu_hdl.ui_manager, i); + } + } + } + xmenu_toggle_item(NULL, "dispvsync", np2cfg.DISPSYNC); xmenu_toggle_item(NULL, "joyrapid", np2cfg.BTN_RAPID); xmenu_toggle_item(NULL, "joyreverse", np2cfg.BTN_MODE); @@ -1844,23 +1950,16 @@ 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) { - for (i = 0; i < 4; i++) { - if (np2cfg.fddequip & (1 << i)) { - equip_fddrive(menu_hdl.ui_manager, i); - } - } - } - 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_CALLBACK(enter_notify_evhandler), NULL); g_signal_connect(GTK_OBJECT(menubar), "leave_notify_event", - GTK_SIGNAL_FUNC(leave_notify_evhandler), NULL); + G_CALLBACK(leave_notify_evhandler), NULL); return menubar; } @@ -1883,7 +1982,7 @@ void xmenu_toggle_menu(void) { - if (GTK_WIDGET_VISIBLE(menubar)) + if (gtk_widget_get_visible(menubar)) xmenu_hide(); else xmenu_show();