np2/x11/gtk2/gtk_menu.c - diff

Return to gtk_menu.c CVS log

Up to [RetroPC.NET] / np2 / x11 / gtk2

Diff for /np2/x11/gtk2/gtk_menu.c between versions 1.12 and 1.20

version 1.12, 2008/03/13 16:27:39	version 1.20, 2011/12/17 14:32:52
Line 1	Line 1
/* $Id$ */

/*	/*
* Copyright (c) 2004 NONAKA Kimihiro (aw9k-nnk@asahi-net.or.jp)	* Copyright (c) 2004 NONAKA Kimihiro (aw9k-nnk@asahi-net.or.jp)
* All rights reserved.	* All rights reserved.
Line 60	Line 58
#include "gtk2/gtk_menu.h"	#include "gtk2/gtk_menu.h"
#include "gtk2/gtk_keyboard.h"	#include "gtk2/gtk_keyboard.h"

	#ifndef NSTATSAVE
	#define NSTATSAVE 10
	#endif

/* normal */	/* normal */
static void cb_bmpsave(GtkAction *action, gpointer user_data);	static void cb_bmpsave(GtkAction *action, gpointer user_data);
Line 341 static const gchar *ui_info =	Line 342 static const gchar *ui_info =
" <separator/>\n"	" <separator/>\n"
" <menuitem action='exit'/>\n"	" <menuitem action='exit'/>\n"
" </menu>\n"	" </menu>\n"
	#if defined(SUPPORT_STATSAVE)
	" <menu name='Stat' action='StatMenu'>\n"
	" </menu>\n"
	#endif
" <menu name='FDD' action='FDDMenu'>\n"	" <menu name='FDD' action='FDDMenu'>\n"
" </menu>\n"	" </menu>\n"
" <menu name='HardDisk' action='HardDiskMenu'>\n"	" <menu name='HardDisk' action='HardDiskMenu'>\n"
Line 468 static const gchar *ui_info =	Line 473 static const gchar *ui_info =
" <separator/>\n"	" <separator/>\n"
" <menuitem action='about'/>\n"	" <menuitem action='about'/>\n"
" </menu>\n"	" </menu>\n"
#if defined(SUPPORT_STATSAVE)
" <menu name='Stat' action='StatMenu'>\n"
" <menuitem action='stat00save'/>\n"
" <menuitem action='stat01save'/>\n"
" <menuitem action='stat02save'/>\n"
" <menuitem action='stat03save'/>\n"
" <menuitem action='stat04save'/>\n"
" <menuitem action='stat05save'/>\n"
" <menuitem action='stat06save'/>\n"
" <menuitem action='stat07save'/>\n"
" <menuitem action='stat08save'/>\n"
" <menuitem action='stat09save'/>\n"
" <separator/>\n"
" <menuitem action='stat00load'/>\n"
" <menuitem action='stat01load'/>\n"
" <menuitem action='stat02load'/>\n"
" <menuitem action='stat03load'/>\n"
" <menuitem action='stat04load'/>\n"
" <menuitem action='stat05load'/>\n"
" <menuitem action='stat06load'/>\n"
" <menuitem action='stat07load'/>\n"
" <menuitem action='stat08load'/>\n"
" <menuitem action='stat09load'/>\n"
" </menu>\n"
#endif
" </menubar>\n"	" </menubar>\n"
"</ui>\n";	"</ui>\n";

Line 582 cb_bmpsave(GtkAction *action, gpointer u	Line 562 cb_bmpsave(GtkAction *action, gpointer u
SCRNBMP bmp = NULL;	SCRNBMP bmp = NULL;
FILEH fh;	FILEH fh;

UNUSED(action);
UNUSED(user_data);

uninstall_idle_process();	uninstall_idle_process();

bmp = scrnbmp();	bmp = scrnbmp();
Line 599 cb_bmpsave(GtkAction *action, gpointer u	Line 576 cb_bmpsave(GtkAction *action, gpointer u
if (dialog == NULL)	if (dialog == NULL)
goto end;	goto end;

g_object_set(G_OBJECT(dialog), "show-hidden", TRUE, NULL);	gtk_file_chooser_set_show_hidden(GTK_FILE_CHOOSER(dialog), TRUE);
gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);	gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);
	gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog),
	TRUE);
if (strlen(bmpfilefolder) == 0) {	if (strlen(bmpfilefolder) == 0) {
g_strlcpy(bmpfilefolder, modulefile, sizeof(bmpfilefolder));	g_strlcpy(bmpfilefolder, modulefile, sizeof(bmpfilefolder));
file_cutname(bmpfilefolder);	file_cutname(bmpfilefolder);
Line 632 cb_bmpsave(GtkAction *action, gpointer u	Line 611 cb_bmpsave(GtkAction *action, gpointer u
if (utf8) {	if (utf8) {
path = g_filename_from_utf8(utf8, -1, NULL, NULL, NULL);	path = g_filename_from_utf8(utf8, -1, NULL, NULL, NULL);
if (path) {	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));	file_cpyname(bmpfilefolder, path, sizeof(bmpfilefolder));
sysmng_update(SYS_UPDATEOSCFG);	sysmng_update(SYS_UPDATEOSCFG);
fh = file_create(path);	fh = file_create(path);
Line 660 cb_change_font(GtkAction *action, gpoint	Line 645 cb_change_font(GtkAction *action, gpoint
gchar utf8, path;	gchar utf8, path;
struct stat sb;	struct stat sb;

UNUSED(action);
UNUSED(user_data);

uninstall_idle_process();	uninstall_idle_process();

dialog = gtk_file_chooser_dialog_new("Open a font file",	dialog = gtk_file_chooser_dialog_new("Open a font file",
Line 673 cb_change_font(GtkAction *action, gpoint	Line 655 cb_change_font(GtkAction *action, gpoint
if (dialog == NULL)	if (dialog == NULL)
goto end;	goto end;

g_object_set(G_OBJECT(dialog), "show-hidden", TRUE, NULL);	gtk_file_chooser_set_show_hidden(GTK_FILE_CHOOSER(dialog), TRUE);
gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);	gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);
utf8 = g_filename_to_utf8(np2cfg.fontfile, -1, NULL, NULL, NULL);	utf8 = g_filename_to_utf8(np2cfg.fontfile, -1, NULL, NULL, NULL);
if (utf8) {	if (utf8) {
Line 726 cb_diskeject(GtkAction *action, gpointer	Line 708 cb_diskeject(GtkAction *action, gpointer
const gchar *name = gtk_action_get_name(action);	const gchar *name = gtk_action_get_name(action);
guint drive;	guint drive;

UNUSED(user_data);

/* name = "disk?eject" */	/* name = "disk?eject" */
if ((strlen(name) >= 5) && (g_ascii_isdigit(name[4]))) {	if ((strlen(name) >= 5) && (g_ascii_isdigit(name[4]))) {
drive = g_ascii_digit_value(name[4]) - 1;	drive = g_ascii_digit_value(name[4]) - 1;
Line 748 cb_diskopen(GtkAction *action, gpointer	Line 728 cb_diskopen(GtkAction *action, gpointer
const gchar *name = gtk_action_get_name(action);	const gchar *name = gtk_action_get_name(action);
guint drive;	guint drive;

UNUSED(user_data);

if ((strlen(name) < 5) \|\| (!g_ascii_isdigit(name[4])))	if ((strlen(name) < 5) \|\| (!g_ascii_isdigit(name[4])))
return;	return;
drive = g_ascii_digit_value(name[4]) - 1;	drive = g_ascii_digit_value(name[4]) - 1;
Line 764 cb_diskopen(GtkAction *action, gpointer	Line 742 cb_diskopen(GtkAction *action, gpointer
if (dialog == NULL)	if (dialog == NULL)
goto end;	goto end;

g_object_set(G_OBJECT(dialog), "show-hidden", TRUE, NULL);	gtk_file_chooser_set_show_hidden(GTK_FILE_CHOOSER(dialog), TRUE);
gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);	gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);
utf8 = g_filename_to_utf8(fddfolder, -1, NULL, NULL, NULL);	utf8 = g_filename_to_utf8(fddfolder, -1, NULL, NULL, NULL);
if (utf8) {	if (utf8) {
Line 851 cb_ataopen(GtkAction *action, gpointer u	Line 829 cb_ataopen(GtkAction *action, gpointer u
const gchar *name = gtk_action_get_name(action);	const gchar *name = gtk_action_get_name(action);
guint channel, drive;	guint channel, drive;

UNUSED(user_data);

/* "ata??open" */	/* "ata??open" */
if ((strlen(name) < 5)	if ((strlen(name) < 5)
\|\| (!g_ascii_isdigit(name[3]))	\|\| (!g_ascii_isdigit(name[3]))
Line 875 cb_ataopen(GtkAction *action, gpointer u	Line 851 cb_ataopen(GtkAction *action, gpointer u
if (dialog == NULL)	if (dialog == NULL)
goto end;	goto end;

g_object_set(G_OBJECT(dialog), "show-hidden", TRUE, NULL);	gtk_file_chooser_set_show_hidden(GTK_FILE_CHOOSER(dialog), TRUE);
gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);	gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);
utf8 = g_filename_to_utf8(hddfolder, -1, NULL, NULL, NULL);	utf8 = g_filename_to_utf8(hddfolder, -1, NULL, NULL, NULL);
if (utf8) {	if (utf8) {
Line 928 cb_ataremove(GtkAction *action, gpointer	Line 904 cb_ataremove(GtkAction *action, gpointer
const gchar *name = gtk_action_get_name(GTK_ACTION(action));	const gchar *name = gtk_action_get_name(GTK_ACTION(action));
guint channel, drive;	guint channel, drive;

UNUSED(user_data);

/* "ata??open" */	/* "ata??open" */
if ((strlen(name) < 5)	if ((strlen(name) < 5)
\|\| (!g_ascii_isdigit(name[3]))	\|\| (!g_ascii_isdigit(name[3]))
Line 954 cb_atapiopen(GtkAction *action, gpointer	Line 928 cb_atapiopen(GtkAction *action, gpointer
gchar utf8, path;	gchar utf8, path;
struct stat sb;	struct stat sb;

UNUSED(action);
UNUSED(user_data);

uninstall_idle_process();	uninstall_idle_process();

dialog = gtk_file_chooser_dialog_new("Open a ATAPI CD-ROM image",	dialog = gtk_file_chooser_dialog_new("Open a ATAPI CD-ROM image",
Line 967 cb_atapiopen(GtkAction *action, gpointer	Line 938 cb_atapiopen(GtkAction *action, gpointer
if (dialog == NULL)	if (dialog == NULL)
goto end;	goto end;

g_object_set(G_OBJECT(dialog), "show-hidden", TRUE, NULL);	gtk_file_chooser_set_show_hidden(GTK_FILE_CHOOSER(dialog), TRUE);
gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);	gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);
utf8 = g_filename_to_utf8(hddfolder, -1, NULL, NULL, NULL);	utf8 = g_filename_to_utf8(hddfolder, -1, NULL, NULL, NULL);
if (utf8) {	if (utf8) {
Line 1022 static void	Line 993 static void
cb_atapiremove(GtkAction *action, gpointer user_data)	cb_atapiremove(GtkAction *action, gpointer user_data)
{	{

UNUSED(action);
UNUSED(user_data);

sxsi_devclose(0x02);	sxsi_devclose(0x02);
}	}
#endif /* SUPPORT_IDEIO */	#endif /* SUPPORT_IDEIO */
Line 1033 static void	Line 1001 static void
cb_midipanic(GtkAction *action, gpointer user_data)	cb_midipanic(GtkAction *action, gpointer user_data)
{	{

UNUSED(action);
UNUSED(user_data);

rs232c_midipanic();	rs232c_midipanic();
mpu98ii_midipanic();	mpu98ii_midipanic();
pc9861k_midipanic();	pc9861k_midipanic();
Line 1064 cb_newdisk(GtkAction *action, gpointer u	Line 1029 cb_newdisk(GtkAction *action, gpointer u
int kind;	int kind;
int i;	int i;

UNUSED(action);
UNUSED(user_data);

uninstall_idle_process();	uninstall_idle_process();

dialog = gtk_file_chooser_dialog_new("Create new disk image file",	dialog = gtk_file_chooser_dialog_new("Create new disk image file",
Line 1077 cb_newdisk(GtkAction *action, gpointer u	Line 1039 cb_newdisk(GtkAction *action, gpointer u
if (dialog == NULL)	if (dialog == NULL)
goto end;	goto end;

g_object_set(G_OBJECT(dialog), "show-hidden", TRUE, NULL);	gtk_file_chooser_set_show_hidden(GTK_FILE_CHOOSER(dialog), TRUE);
gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);	gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);
	gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog),
	TRUE);
if (strlen(fddfolder) == 0) {	if (strlen(fddfolder) == 0) {
g_strlcpy(fddfolder, modulefile, sizeof(fddfolder));	g_strlcpy(fddfolder, modulefile, sizeof(fddfolder));
file_cutname(fddfolder);	file_cutname(fddfolder);
Line 1096 cb_newdisk(GtkAction *action, gpointer u	Line 1060 cb_newdisk(GtkAction *action, gpointer u

filter[0] = gtk_file_filter_new();	filter[0] = gtk_file_filter_new();
if (filter[0]) {	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], "*.[dD]88");
gtk_file_filter_add_pattern(filter[0], "*.88[dD]");	gtk_file_filter_add_pattern(filter[0], "*.88[dD]");
gtk_file_filter_add_pattern(filter[0], "*.[dD]98");	gtk_file_filter_add_pattern(filter[0], "*.[dD]98");
Line 1105 cb_newdisk(GtkAction *action, gpointer u	Line 1069 cb_newdisk(GtkAction *action, gpointer u
}	}
filter[1] = gtk_file_filter_new();	filter[1] = gtk_file_filter_new();
if (filter[1]) {	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_filter_add_pattern(filter[1], "*.[hH][dD][iI]");
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter[1]);	gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter[1]);
}	}
filter[2] = gtk_file_filter_new();	filter[2] = gtk_file_filter_new();
if (filter[2]) {	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_filter_add_pattern(filter[2], "*.[tT][hH][dD]");
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter[2]);	gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter[2]);
}	}
filter[3] = gtk_file_filter_new();	filter[3] = gtk_file_filter_new();
if (filter[3]) {	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_filter_add_pattern(filter[3], "*.[nN][hH][dD]");
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter[3]);	gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter[3]);
}	}
Line 1190 static void	Line 1154 static void
cb_reset(GtkAction *action, gpointer user_data)	cb_reset(GtkAction *action, gpointer user_data)
{	{

UNUSED(action);
UNUSED(user_data);

pccore_cfgupdate();	pccore_cfgupdate();
pccore_reset();	pccore_reset();
}	}
Line 1208 cb_sasiopen(GtkAction *action, gpointer	Line 1169 cb_sasiopen(GtkAction *action, gpointer
const gchar *name = gtk_action_get_name(action);	const gchar *name = gtk_action_get_name(action);
guint drive;	guint drive;

UNUSED(user_data);

if ((strlen(name) < 5) \|\| (!g_ascii_isdigit(name[4])))	if ((strlen(name) < 5) \|\| (!g_ascii_isdigit(name[4])))
return;	return;
drive = g_ascii_digit_value(name[4]) - 1;	drive = g_ascii_digit_value(name[4]) - 1;
Line 1224 cb_sasiopen(GtkAction *action, gpointer	Line 1183 cb_sasiopen(GtkAction *action, gpointer
if (dialog == NULL)	if (dialog == NULL)
goto end;	goto end;

g_object_set(G_OBJECT(dialog), "show-hidden", TRUE, NULL);	gtk_file_chooser_set_show_hidden(GTK_FILE_CHOOSER(dialog), TRUE);
gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);	gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);
utf8 = g_filename_to_utf8(hddfolder, -1, NULL, NULL, NULL);	utf8 = g_filename_to_utf8(hddfolder, -1, NULL, NULL, NULL);
if (utf8) {	if (utf8) {
Line 1277 cb_sasiremove(GtkAction *action, gpointe	Line 1236 cb_sasiremove(GtkAction *action, gpointe
const gchar *name = gtk_action_get_name(GTK_ACTION(action));	const gchar *name = gtk_action_get_name(GTK_ACTION(action));
guint drive;	guint drive;

UNUSED(user_data);

/* name = "sasi?eject" */	/* name = "sasi?eject" */
if ((strlen(name) >= 5) && (g_ascii_isdigit(name[4]))) {	if ((strlen(name) >= 5) && (g_ascii_isdigit(name[4]))) {
drive = g_ascii_digit_value(name[4]) - 1;	drive = g_ascii_digit_value(name[4]) - 1;
Line 1297 cb_statsave(GtkAction *action, gpointer	Line 1254 cb_statsave(GtkAction *action, gpointer
char ext[4];	char ext[4];
guint n;	guint n;

UNUSED(user_data);

/* name = "stat??save" */	/* name = "stat??save" */
if ((strlen(name) >= 6)	if ((strlen(name) >= 6)
&& (g_ascii_isdigit(name[4]))	&& (g_ascii_isdigit(name[4]))
Line 1317 cb_statload(GtkAction *action, gpointer	Line 1272 cb_statload(GtkAction *action, gpointer
char ext[4];	char ext[4];
guint n;	guint n;

UNUSED(user_data);

/* name = "stat??load" */	/* name = "stat??load" */
if ((strlen(name) >= 6)	if ((strlen(name) >= 6)
&& (g_ascii_isdigit(name[4]))	&& (g_ascii_isdigit(name[4]))
Line 1336 cb_dialog(GtkAction *action, gpointer us	Line 1289 cb_dialog(GtkAction *action, gpointer us
{	{
const gchar *name = gtk_action_get_name(action);	const gchar *name = gtk_action_get_name(action);

UNUSED(user_data);

if (g_ascii_strcasecmp(name, "configure") == 0) {	if (g_ascii_strcasecmp(name, "configure") == 0) {
create_configure_dialog();	create_configure_dialog();
} else if (g_ascii_strcasecmp(name, "soundopt") == 0) {	} else if (g_ascii_strcasecmp(name, "soundopt") == 0) {
Line 1364 cb_clockdisp(GtkToggleAction *action, gp	Line 1315 cb_clockdisp(GtkToggleAction *action, gp
gboolean b = gtk_toggle_action_get_active(action);	gboolean b = gtk_toggle_action_get_active(action);
gboolean f;	gboolean f;

UNUSED(user_data);

f = (np2oscfg.DISPCLK & 1) ^ (b ? 1 : 0);	f = (np2oscfg.DISPCLK & 1) ^ (b ? 1 : 0);
if (f) {	if (f) {
np2oscfg.DISPCLK ^= 1;	np2oscfg.DISPCLK ^= 1;
Line 1381 cb_dispvsync(GtkToggleAction *action, gp	Line 1330 cb_dispvsync(GtkToggleAction *action, gp
gboolean b = gtk_toggle_action_get_active(action);	gboolean b = gtk_toggle_action_get_active(action);
gboolean f;	gboolean f;

UNUSED(user_data);

f = (np2cfg.DISPSYNC ? 1 : 0) ^ (b ? 1 : 0);	f = (np2cfg.DISPSYNC ? 1 : 0) ^ (b ? 1 : 0);
if (f) {	if (f) {
np2cfg.DISPSYNC = !np2cfg.DISPSYNC;	np2cfg.DISPSYNC = !np2cfg.DISPSYNC;
Line 1396 cb_framedisp(GtkToggleAction *action, gp	Line 1343 cb_framedisp(GtkToggleAction *action, gp
gboolean b = gtk_toggle_action_get_active(action);	gboolean b = gtk_toggle_action_get_active(action);
gboolean f;	gboolean f;

UNUSED(user_data);

f = (np2oscfg.DISPCLK & 2) ^ (b ? 2 : 0);	f = (np2oscfg.DISPCLK & 2) ^ (b ? 2 : 0);
if (f) {	if (f) {
np2oscfg.DISPCLK ^= 2;	np2oscfg.DISPCLK ^= 2;
Line 1413 cb_jastsound(GtkToggleAction *action, gp	Line 1358 cb_jastsound(GtkToggleAction *action, gp
gboolean b = gtk_toggle_action_get_active(action);	gboolean b = gtk_toggle_action_get_active(action);
gboolean f;	gboolean f;

UNUSED(user_data);

f = (np2oscfg.jastsnd ? 1 : 0) ^ (b ? 1 : 0);	f = (np2oscfg.jastsnd ? 1 : 0) ^ (b ? 1 : 0);
if (f) {	if (f) {
np2oscfg.jastsnd = !np2oscfg.jastsnd;	np2oscfg.jastsnd = !np2oscfg.jastsnd;
Line 1428 cb_joyrapid(GtkToggleAction *action, gpo	Line 1371 cb_joyrapid(GtkToggleAction *action, gpo
gboolean b = gtk_toggle_action_get_active(action);	gboolean b = gtk_toggle_action_get_active(action);
gboolean f;	gboolean f;

UNUSED(user_data);

f = (np2cfg.BTN_RAPID ? 1 : 0) ^ (b ? 1 : 0);	f = (np2cfg.BTN_RAPID ? 1 : 0) ^ (b ? 1 : 0);
if (f) {	if (f) {
np2cfg.BTN_RAPID = !np2cfg.BTN_RAPID;	np2cfg.BTN_RAPID = !np2cfg.BTN_RAPID;
Line 1443 cb_joyreverse(GtkToggleAction *action, g	Line 1384 cb_joyreverse(GtkToggleAction *action, g
gboolean b = gtk_toggle_action_get_active(action);	gboolean b = gtk_toggle_action_get_active(action);
gboolean f;	gboolean f;

UNUSED(user_data);

f = (np2cfg.BTN_MODE ? 1 : 0) ^ (b ? 1 : 0);	f = (np2cfg.BTN_MODE ? 1 : 0) ^ (b ? 1 : 0);
if (f) {	if (f) {
np2cfg.BTN_MODE = !np2cfg.BTN_MODE;	np2cfg.BTN_MODE = !np2cfg.BTN_MODE;
Line 1458 cb_keydisplay(GtkToggleAction *action, g	Line 1397 cb_keydisplay(GtkToggleAction *action, g
gboolean b = gtk_toggle_action_get_active(action);	gboolean b = gtk_toggle_action_get_active(action);
gboolean f;	gboolean f;

UNUSED(user_data);

f = (np2oscfg.keydisp ? 1 : 0) ^ (b ? 1 : 0);	f = (np2oscfg.keydisp ? 1 : 0) ^ (b ? 1 : 0);
if (f) {	if (f) {
np2oscfg.keydisp = !np2oscfg.keydisp;	np2oscfg.keydisp = !np2oscfg.keydisp;
Line 1478 cb_mousemode(GtkToggleAction *action, gp	Line 1415 cb_mousemode(GtkToggleAction *action, gp
gboolean b = gtk_toggle_action_get_active(action);	gboolean b = gtk_toggle_action_get_active(action);
gboolean f;	gboolean f;

UNUSED(user_data);

f = (np2oscfg.MOUSE_SW ? 1 : 0) ^ (b ? 1 : 0);	f = (np2oscfg.MOUSE_SW ? 1 : 0) ^ (b ? 1 : 0);
if (f) {	if (f) {
mouse_running(MOUSE_XOR);	mouse_running(MOUSE_XOR);
Line 1494 cb_mouserapid(GtkToggleAction *action, g	Line 1429 cb_mouserapid(GtkToggleAction *action, g
gboolean b = gtk_toggle_action_get_active(action);	gboolean b = gtk_toggle_action_get_active(action);
gboolean f;	gboolean f;

UNUSED(user_data);

f = (np2cfg.MOUSERAPID ? 1 : 0) ^ (b ? 1 : 0);	f = (np2cfg.MOUSERAPID ? 1 : 0) ^ (b ? 1 : 0);
if (f) {	if (f) {
np2cfg.MOUSERAPID = !np2cfg.MOUSERAPID;	np2cfg.MOUSERAPID = !np2cfg.MOUSERAPID;
Line 1509 cb_nowait(GtkToggleAction *action, gpoin	Line 1442 cb_nowait(GtkToggleAction *action, gpoin
gboolean b = gtk_toggle_action_get_active(action);	gboolean b = gtk_toggle_action_get_active(action);
gboolean f;	gboolean f;

UNUSED(user_data);

f = (np2oscfg.NOWAIT ? 1 : 0) ^ (b ? 1 : 0);	f = (np2oscfg.NOWAIT ? 1 : 0) ^ (b ? 1 : 0);
if (f) {	if (f) {
np2oscfg.NOWAIT = !np2oscfg.NOWAIT;	np2oscfg.NOWAIT = !np2oscfg.NOWAIT;
Line 1524 cb_realpalettes(GtkToggleAction *action,	Line 1455 cb_realpalettes(GtkToggleAction *action,
gboolean b = gtk_toggle_action_get_active(action);	gboolean b = gtk_toggle_action_get_active(action);
gboolean f;	gboolean f;

UNUSED(user_data);

f = (np2cfg.RASTER ? 1 : 0) ^ (b ? 1 : 0);	f = (np2cfg.RASTER ? 1 : 0) ^ (b ? 1 : 0);
if (f) {	if (f) {
np2cfg.RASTER = !np2cfg.RASTER;	np2cfg.RASTER = !np2cfg.RASTER;
Line 1541 cb_s98logging(GtkToggleAction *action, g	Line 1470 cb_s98logging(GtkToggleAction *action, g
gboolean b = gtk_toggle_action_get_active(action);	gboolean b = gtk_toggle_action_get_active(action);
gboolean f;	gboolean f;

UNUSED(user_data);

f = (s98logging ? 1 : 0) ^ (b ? 1 : 0);	f = (s98logging ? 1 : 0) ^ (b ? 1 : 0);
if (f) {	if (f) {
s98logging = !s98logging;	s98logging = !s98logging;
Line 1564 cb_seeksound(GtkToggleAction *action, gp	Line 1491 cb_seeksound(GtkToggleAction *action, gp
gboolean b = gtk_toggle_action_get_active(action);	gboolean b = gtk_toggle_action_get_active(action);
gboolean f;	gboolean f;

UNUSED(user_data);

f = (np2cfg.MOTOR ? 1 : 0) ^ (b ? 1 : 0);	f = (np2cfg.MOTOR ? 1 : 0) ^ (b ? 1 : 0);
if (f) {	if (f) {
np2cfg.MOTOR = !np2cfg.MOTOR;	np2cfg.MOTOR = !np2cfg.MOTOR;
Line 1579 cb_softkeyboard(GtkToggleAction *action,	Line 1504 cb_softkeyboard(GtkToggleAction *action,
gboolean b = gtk_toggle_action_get_active(action);	gboolean b = gtk_toggle_action_get_active(action);
gboolean f;	gboolean f;

UNUSED(user_data);

f = (np2oscfg.softkbd ? 1 : 0) ^ (b ? 1 : 0);	f = (np2oscfg.softkbd ? 1 : 0) ^ (b ? 1 : 0);
if (f) {	if (f) {
np2oscfg.softkbd = !np2oscfg.softkbd;	np2oscfg.softkbd = !np2oscfg.softkbd;
Line 1599 cb_toolwindow(GtkToggleAction *action, g	Line 1522 cb_toolwindow(GtkToggleAction *action, g
gboolean b = gtk_toggle_action_get_active(action);	gboolean b = gtk_toggle_action_get_active(action);
gboolean f;	gboolean f;

UNUSED(user_data);

f = (np2oscfg.toolwin ? 1 : 0) ^ (b ? 1 : 0);	f = (np2oscfg.toolwin ? 1 : 0) ^ (b ? 1 : 0);
if (f) {	if (f) {
np2oscfg.toolwin = !np2oscfg.toolwin;	np2oscfg.toolwin = !np2oscfg.toolwin;
Line 1619 cb_xctrlkey(GtkToggleAction *action, gpo	Line 1540 cb_xctrlkey(GtkToggleAction *action, gpo
gboolean b = gtk_toggle_action_get_active(action);	gboolean b = gtk_toggle_action_get_active(action);
gboolean f;	gboolean f;

UNUSED(user_data);

f = (np2cfg.XSHIFT & 2) ^ (b ? 2 : 0);	f = (np2cfg.XSHIFT & 2) ^ (b ? 2 : 0);
if (f) {	if (f) {
np2cfg.XSHIFT ^= 2;	np2cfg.XSHIFT ^= 2;
Line 1635 cb_xgrphkey(GtkToggleAction *action, gpo	Line 1554 cb_xgrphkey(GtkToggleAction *action, gpo
gboolean b = gtk_toggle_action_get_active(action);	gboolean b = gtk_toggle_action_get_active(action);
gboolean f;	gboolean f;

UNUSED(user_data);

f = (np2cfg.XSHIFT & 4) ^ (b ? 4 : 0);	f = (np2cfg.XSHIFT & 4) ^ (b ? 4 : 0);
if (f) {	if (f) {
np2cfg.XSHIFT ^= 4;	np2cfg.XSHIFT ^= 4;
Line 1651 cb_xshiftkey(GtkToggleAction *action, gp	Line 1568 cb_xshiftkey(GtkToggleAction *action, gp
gboolean b = gtk_toggle_action_get_active(action);	gboolean b = gtk_toggle_action_get_active(action);
gboolean f;	gboolean f;

UNUSED(user_data);

f = (np2cfg.XSHIFT & 1) ^ (b ? 1 : 0);	f = (np2cfg.XSHIFT & 1) ^ (b ? 1 : 0);
if (f) {	if (f) {
np2cfg.XSHIFT ^= 1;	np2cfg.XSHIFT ^= 1;
Line 1810 cb_radio(GtkRadioAction *action, GtkRadi	Line 1725 cb_radio(GtkRadioAction *action, GtkRadi
guint menu_idx = (guint)GPOINTER_TO_INT(user_data);	guint menu_idx = (guint)GPOINTER_TO_INT(user_data);
gint i;	gint i;

UNUSED(current); /* emitted item */

if (menu_idx < n_radiomenu_entries) {	if (menu_idx < n_radiomenu_entries) {
for (i = 0; i < radiomenu_entries[menu_idx].count; i++) {	for (i = 0; i < radiomenu_entries[menu_idx].count; i++) {
if (radiomenu_entries[menu_idx].entry[i].value == value)	if (radiomenu_entries[menu_idx].entry[i].value == value)
Line 1839 static gboolean	Line 1752 static gboolean
menubar_timeout(gpointer p)	menubar_timeout(gpointer p)
{	{

UNUSED(p);

if (menubar_timerid) {	if (menubar_timerid) {
g_source_remove(menubar_timerid);	g_source_remove(menubar_timerid);
menubar_timerid = 0;	menubar_timerid = 0;
Line 1861 static gboolean	Line 1772 static gboolean
enter_notify_evhandler(GtkWidget w, GdkEventCrossing ev, gpointer p)	enter_notify_evhandler(GtkWidget w, GdkEventCrossing ev, gpointer p)
{	{

UNUSED(w);
UNUSED(ev);
UNUSED(p);

if (menubar_timerid) {	if (menubar_timerid) {
g_source_remove(menubar_timerid);	g_source_remove(menubar_timerid);
menubar_timerid = 0;	menubar_timerid = 0;
Line 1881 static gboolean	Line 1788 static gboolean
leave_notify_evhandler(GtkWidget w, GdkEventCrossing ev, gpointer p)	leave_notify_evhandler(GtkWidget w, GdkEventCrossing ev, gpointer p)
{	{

UNUSED(w);
UNUSED(ev);
UNUSED(p);

if (menubar_timerid) {	if (menubar_timerid) {
g_source_remove(menubar_timerid);	g_source_remove(menubar_timerid);
menubar_timerid = 0;	menubar_timerid = 0;
Line 1897 leave_notify_evhandler(GtkWidget *w, Gdk	Line 1800 leave_notify_evhandler(GtkWidget *w, Gdk
return TRUE;	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	static void
equip_fddrive(GtkUIManager *ui_manager, guint no)	equip_fddrive(GtkUIManager *ui_manager, guint no)
{	{
char path[32], name[32], action[32];	char path, name, *action;
guint id;	guint id;

if (no >= 4)	if (no >= 4)
Line 1908 equip_fddrive(GtkUIManager *ui_manager,	Line 1851 equip_fddrive(GtkUIManager *ui_manager,
no++;	no++;

id = gtk_ui_manager_new_merge_id(ui_manager);	id = gtk_ui_manager_new_merge_id(ui_manager);
g_snprintf(name, sizeof(name), "Drive%d", no);	name = g_strdup_printf("Drive%d", no);
g_snprintf(action, sizeof(action), "Drive%dMenu", no);	action = g_strdup_printf("Drive%dMenu", no);
gtk_ui_manager_add_ui(ui_manager, id,	gtk_ui_manager_add_ui(ui_manager, id,
"/MainMenu/FDD", name, action, GTK_UI_MANAGER_MENU, FALSE);	"/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);	id = gtk_ui_manager_new_merge_id(ui_manager);
g_snprintf(name, sizeof(name), "Drive%dOpen", no);	name = g_strdup_printf("Drive%dOpen", no);
g_snprintf(action, sizeof(action), "disk%dopen", no);	action = g_strdup_printf("disk%dopen", no);
gtk_ui_manager_add_ui(ui_manager, id,	gtk_ui_manager_add_ui(ui_manager, id,
path, name, action, GTK_UI_MANAGER_MENUITEM, FALSE);	path, name, action, GTK_UI_MANAGER_MENUITEM, FALSE);
	g_free(action);
	g_free(name);

id = gtk_ui_manager_new_merge_id(ui_manager);	id = gtk_ui_manager_new_merge_id(ui_manager);
g_snprintf(name, sizeof(name), "Drive%dEject", no);	name = g_strdup_printf("Drive%dEject", no);
g_snprintf(action, sizeof(action), "disk%deject", no);	action = g_strdup_printf("disk%deject", no);
gtk_ui_manager_add_ui(ui_manager, id,	gtk_ui_manager_add_ui(ui_manager, id,
path, name, action, GTK_UI_MANAGER_MENUITEM, FALSE);	path, name, action, GTK_UI_MANAGER_MENUITEM, FALSE);
	g_free(action);
	g_free(name);

	g_free(path);
}	}

GtkWidget *	GtkWidget *
Line 1960 create_menu(void)	Line 1912 create_menu(void)
return NULL;	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, "dispvsync", np2cfg.DISPSYNC);
xmenu_toggle_item(NULL, "joyrapid", np2cfg.BTN_RAPID);	xmenu_toggle_item(NULL, "joyrapid", np2cfg.BTN_RAPID);
xmenu_toggle_item(NULL, "joyreverse", np2cfg.BTN_MODE);	xmenu_toggle_item(NULL, "joyreverse", np2cfg.BTN_MODE);
Line 1989 create_menu(void)	Line 1954 create_menu(void)
xmenu_select_screensize(SCREEN_DEFMUL);	xmenu_select_screensize(SCREEN_DEFMUL);
xmenu_select_soundboard(np2cfg.SOUND_SW);	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");	menubar = gtk_ui_manager_get_widget(menu_hdl.ui_manager, "/MainMenu");

gtk_widget_add_events(menubar, EVENT_MASK);	gtk_widget_add_events(menubar, EVENT_MASK);
g_signal_connect(GTK_OBJECT(menubar), "enter_notify_event",	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",	g_signal_connect(GTK_OBJECT(menubar), "leave_notify_event",
GTK_SIGNAL_FUNC(leave_notify_evhandler), NULL);	G_CALLBACK(leave_notify_evhandler), NULL);

return menubar;	return menubar;
}	}
Line 2026 void	Line 1983 void
xmenu_toggle_menu(void)	xmenu_toggle_menu(void)
{	{

if (GTK_WIDGET_VISIBLE(menubar))	if (gtk_widget_get_visible(menubar))
xmenu_hide();	xmenu_hide();
else	else
xmenu_show();	xmenu_show();

RetroPC.NET-CVS <cvs@retropc.net>

Removed from v.1.12
changed lines
	Added in v.1.20