===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/xdeb.c,v
retrieving revision 1.5
retrieving revision 1.16
diff -u -p -r1.5 -r1.16
--- OpenXM_contrib2/asir2000/parse/xdeb.c	2000/09/23 05:45:49	1.5
+++ OpenXM_contrib2/asir2000/parse/xdeb.c	2016/08/24 00:52:51	1.16
@@ -45,9 +45,9 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/parse/xdeb.c,v 1.4 2000/08/22 05:04:28 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/xdeb.c,v 1.15 2015/08/14 13:51:56 fujimoto Exp $ 
 */
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 #if defined(VISUAL_LIB)
 #include <stdio.h>
 #include <stdlib.h>
@@ -90,7 +90,7 @@ void show_debug_window(int on)
 {}
 #endif
 #else /* VISUAL */
-#if DO_PLOT
+#if defined(DO_PLOT)
 /*
  *	xdeb.c --- Asir Debug interface.
  *
@@ -101,6 +101,7 @@ void show_debug_window(int on)
 #include <X11/Shell.h>
 #include <X11/Xaw/Dialog.h>
 #include	<stdio.h>
+#include <stdlib.h>
 
 static XrmOptionDescRec options[] = {
 	{"-reverse","*reverse",XrmoptionNoArg,"on"},
@@ -114,11 +115,13 @@ static String fallback[] = {
 };
 
 static void Done();
+static void Quit();
 static void SetSelected();
 static void SetDismiss();
 
 static XtActionsRec actions_table[] = {
 	{"done",Done},
+	{"quit",Quit},
 };
 
 char debug_cmd[BUFSIZ];
@@ -130,18 +133,12 @@ static Display *display;
 
 void get_cmd();
 
-static void Done(w,e,p,n)
-Widget w;
-XEvent *e;
-String *p;
-Cardinal *n;
+static void Done(Widget w,XEvent *e,String *p,Cardinal *n)
 {
 	SetSelected(w,0,0);
 }
 
-static void SetSelected(w,cld,cad)
-Widget w;
-XtPointer cld,cad;
+static void SetSelected(Widget w,XtPointer cld,XtPointer cad)
 {
 	Arg		arg[5];
 	char *cmd;
@@ -153,9 +150,7 @@ XtPointer cld,cad;
 	XtSetValues(cmdwin, arg, 1);
 }
 
-static void SetDismiss(w,cld,cad)
-Widget w;
-XtPointer cld,cad;
+static void SetDismiss(Widget w,XtPointer cld,XtPointer cad)
 {
 	Arg		arg[5];
 	char *cmd;
@@ -167,16 +162,26 @@ XtPointer cld,cad;
 	XtSetValues(cmdwin, arg, 1);
 }
 
-init_cmdwin()
+static Atom wm_delete_window;
+static void Quit(Widget w, XEvent *ev, String *params,Cardinal *nparams)
 {
+	XBell(XtDisplay(w),0);
+}
+
+void init_cmdwin()
+{
 	Arg		arg[5];
 	int argc=0;
 	char *argv[1];
 	int n;
 	char *d;
+	char hostname[BUFSIZ],title[BUFSIZ];
 	extern char displayname[];
 	extern int do_server_in_X11;
+	static int is_init = 0;
 
+	if ( is_init )
+		return;
 	if ( !displayname[0] ) {
 		d = (char *)getenv("DISPLAY");
 		if ( d )
@@ -184,21 +189,28 @@ init_cmdwin()
 		else
 			do_server_in_X11 = 0;
 	}
+	gethostname(hostname, BUFSIZ);
+	sprintf(title,"Asir debugger:%s",hostname);
 	if ( displayname[0] ) {
 		argv[0] = 0;
 		XtToolkitInitialize();
 		app_con = XtCreateApplicationContext();
 		XtAppAddActions(app_con,actions_table, XtNumber(actions_table));
 		XtAppSetFallbackResources(app_con,fallback);
-		display = XtOpenDisplay(app_con,displayname,"ox_asir_debug_window","ox_asir_debug_window",
+		display = XtOpenDisplay(app_con,displayname,title,title,
 			options,XtNumber(options),&argc,argv);
-		toplevel = XtAppCreateShell(0,"ox_asir_debug_window",applicationShellWidgetClass,
+		toplevel = XtAppCreateShell(0,title,applicationShellWidgetClass,
 			display,0,0);
 		n = 0;
-		XtSetArg(arg[n],XtNiconName,"ox_asir_debug_window"); n++;
-		XtSetArg(arg[n], XtNwidth, 200); n++;
+		wm_delete_window = XInternAtom(XtDisplay(toplevel), "WM_DELETE_WINDOW",
+			False);
+
+		XtSetArg(arg[n],XtNiconName,title); n++;
+		XtSetArg(arg[n], XtNwidth, 360); n++;
 		mainwin = XtCreatePopupShell("shell",topLevelShellWidgetClass,
 			toplevel,arg,n);
+		XtOverrideTranslations(mainwin, 
+					XtParseTranslationTable("<Message>WM_PROTOCOLS: quit()"));
 	/*
 	 *	Command line
 	 */
@@ -211,14 +223,17 @@ init_cmdwin()
 		XtSetArg(arg[n], XtNvalue, ""); n++;
 		XtSetValues(cmdwin, arg, n);
 		XtRealizeWidget(mainwin);
+		XSetWMProtocols(XtDisplay(mainwin),XtWindow(mainwin),
+			&wm_delete_window,1);
 	}
+	is_init = 1;
 }
 
-show_debug_window(on)
-int on;
+void show_debug_window(int on)
 {
 	XEvent ev;
 
+	init_cmdwin();
 	if ( mainwin ) {
 		if ( on )
 			XtPopup(mainwin,XtGrabNone);
@@ -232,8 +247,7 @@ int on;
 	}
 }
 
-get_line(buf)
-char *buf;
+void get_line(char *buf)
 {
 	XEvent ev;
 
@@ -245,13 +259,12 @@ char *buf;
 	strcpy(buf,debug_cmd);
 }
 #else /* DO_PLOT */
-init_cmdwin() {}
+void init_cmdwin() {}
 
-show_debug_window(on)
-int on;
+void show_debug_window(int on)
 {}
 
-get_line(buf)
+void get_line(buf)
 char *buf;
 {}
 #endif /* DO_PLOT */