===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/xdeb.c,v
retrieving revision 1.6
retrieving revision 1.14
diff -u -p -r1.6 -r1.14
--- OpenXM_contrib2/asir2000/parse/xdeb.c	2000/09/25 04:33:38	1.6
+++ OpenXM_contrib2/asir2000/parse/xdeb.c	2015/08/06 10:01:53	1.14
@@ -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.5 2000/09/23 05:45:49 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/xdeb.c,v 1.13 2004/03/01 05:48:24 noro Exp $ 
 */
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__)
 #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.
  *
@@ -114,11 +114,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 +132,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 +149,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,8 +161,14 @@ 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];
@@ -177,7 +177,10 @@ init_cmdwin()
 	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 )
@@ -198,10 +201,15 @@ init_cmdwin()
 		toplevel = XtAppCreateShell(0,title,applicationShellWidgetClass,
 			display,0,0);
 		n = 0;
+		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
 	 */
@@ -214,14 +222,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);
@@ -235,8 +246,7 @@ int on;
 	}
 }
 
-get_line(buf)
-char *buf;
+void get_line(char *buf)
 {
 	XEvent ev;
 
@@ -248,13 +258,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 */