--- np2/x11/gtk/Attic/gtk_menu.c	2003/12/19 16:08:02	1.2
+++ np2/x11/gtk/Attic/gtk_menu.c	2004/06/16 12:50:49	1.5
@@ -48,6 +48,8 @@
 #include "kdispwin.h"
 #include "toolwin.h"
 #include "viewer.h"
+#include "debugwin.h"
+#include "skbdwin.h"
 
 #include "mousemng.h"
 #include "scrnmng.h"
@@ -57,7 +59,6 @@
 #include "gtk/gtk_menu.h"
 #include "gtk/gtk_keyboard.h"
 
-#include <gdk/gdkkeysyms.h>
 #include <gtk/gtkmenu.h>
 
 
@@ -132,6 +133,9 @@ static void memory_dump(GtkWidget *w, Gd
 #if defined(SUPPORT_VIEWER)
 static void debug_utility(GtkWidget *w, GdkEvent *e);
 #endif
+#if defined(CPUCORE_IA32) && defined(SUPPORT_MEMDBG32)
+static void memory_debug(GtkWidget *w, GdkEvent *e);
+#endif
 
 static void toggle(gpointer, guint, GtkWidget *);
 
@@ -231,8 +235,6 @@ static GtkItemFactoryEntry menu_items[] 
 { "/HardDisk/SASI-_2",		NULL, NULL, 0, "<Branch>" },
 { "/HardDisk/SASI-2/_Open...",	NULL, f(sasiopen), 1, NULL },
 { "/HardDisk/SASI-2/_Remove",	NULL, f(sasiremove), 1, NULL },
-{ "/HardDisk/sep1",		NULL, NULL, 0, "<Separator>" },
-{ "/HardDisk/_Remove All",	NULL, f(sasiremove), ~0, NULL },
 { "/Screen",			NULL, NULL, 0, "<Branch>" },
 { "/Screen/_Window",		NULL, NULL, 0, "<RadioItem>" },
 { "/Screen/_FullScreen",	NULL, NULL, 0, "/Screen/Window" },
@@ -318,6 +320,7 @@ static GtkItemFactoryEntry menu_items[] 
 { "/Other/sep1",		NULL, NULL, 0, "<Separator>" },
 { "/Other/_Tool Window",	NULL, f(toggle), TOOL_WINDOW, "<ToggleItem>" },
 { "/Other/_Key Display",	NULL, f(toggle), KEY_DISPLAY, "<ToggleItem>" },
+{ "/Other/S_oftware Keyboard",	NULL, f(toggle), SOFT_KBD, "<ToggleItem>" },
 { "/Other/sep2",		NULL, NULL, 0, "<Separator>" },
 { "/Other/_About...",		NULL, f(_create_about_dialog), 0, NULL },
 };
@@ -347,6 +350,7 @@ static struct {
 	{ "/Other/S98 logging...",		0, 0 },
 	{ "/Other/Tool Window",			0, SYS_UPDATEOSCFG },
 	{ "/Other/Key Display",			0, SYS_UPDATEOSCFG },
+	{ "/Other/Software Keyboard",		0, SYS_UPDATEOSCFG },
 };
 
 static _MENU_HDL menu_hdl;
@@ -383,6 +387,7 @@ create_menu(GtkWidget *w)
 	xmenu_toggle_item(MOUSE_RAPID, np2cfg.MOUSERAPID, TRUE);
 	xmenu_toggle_item(TOOL_WINDOW, np2oscfg.toolwin, TRUE);
 	xmenu_toggle_item(KEY_DISPLAY, np2oscfg.keydisp, TRUE);
+	xmenu_toggle_item(SOFT_KBD, np2oscfg.softkbd, TRUE);
 
 	xmenu_select_framerate(np2oscfg.DRAW_SKIP);
 	xmenu_select_f12key(np2oscfg.F12KEY);
@@ -403,6 +408,9 @@ create_menu(GtkWidget *w)
 #if defined(SUPPORT_VIEWER)
 		GtkWidget *dbgutil_item;
 #endif
+#if defined(CPUCORE_IA32) && defined(SUPPORT_MEMDBG32)
+		GtkWidget *memdbg_item;
+#endif
 
 		debug_menu = gtk_menu_new();
 
@@ -426,6 +434,14 @@ create_menu(GtkWidget *w)
 		    GTK_SIGNAL_FUNC(debug_utility), (gpointer)0);
 #endif
 
+#if defined(CPUCORE_IA32) && defined(SUPPORT_MEMDBG32)
+		memdbg_item = gtk_menu_item_new_with_label("Memory Map");
+		gtk_widget_show(memdbg_item);
+		gtk_menu_append(GTK_MENU(debug_menu), memdbg_item);
+		gtk_signal_connect_object(GTK_OBJECT(memdbg_item), "activate",
+		    GTK_SIGNAL_FUNC(memory_debug), (gpointer)0);
+#endif
+
 		debug_item = gtk_menu_item_new_with_label("Debug");
 		gtk_menu_item_right_justify(GTK_MENU_ITEM(debug_item));
 		gtk_widget_show(debug_item);
@@ -492,8 +508,9 @@ xmenu_toggle_item(int arg, int onoff, in
 	if (arg < NELEMENTS(toggle_items)) {
 		if (onoff != toggle_items[arg].stat) {
 			toggle_items[arg].stat = onoff;
-			if (emitp)
+			if (emitp) {
 				xmenu_select_item(&menu_hdl, toggle_items[arg].name);
+			}
 			if (inited && arg != MOUSE_MODE) {
 				sysmng_update(toggle_items[arg].flag);
 			}
@@ -1109,6 +1126,18 @@ debug_utility(GtkWidget *w, GdkEvent *e)
 }
 #endif
 
+#if defined(CPUCORE_IA32) && defined(SUPPORT_MEMDBG32)
+static void
+memory_debug(GtkWidget *w, GdkEvent *e)
+{
+
+	UNUSED(w);
+	UNUSED(e);
+
+	debugwin_create();
+}
+#endif
+
 /* ----- toggle item */
 static void
 toggle(gpointer data, guint action, GtkWidget *w)
@@ -1236,6 +1265,15 @@ toggle(gpointer data, guint action, GtkW
 		}
 		break;
 
+	case SOFT_KBD:
+		np2oscfg.softkbd = !np2oscfg.softkbd;
+		xmenu_toggle_item(SOFT_KBD, np2oscfg.softkbd, FALSE);
+		if (np2oscfg.softkbd) {
+			skbdwin_create();
+		} else {
+			skbdwin_destroy();
+		}
+
 	case NUM_TOGGLE_ITEMS:
 	default:
 		break;