[Pkg-nethack-devel] nethack/win/X11 winX.c,1.1.1.1,1.2 winmap.c,1.1.1.1,1.2 winmisc.c,1.1.1.1,1.2

[Joshua Kwan]

Update of /cvsroot/pkg-nethack/nethack/win/X11
In directory quantz:/tmp/cvs-serv9687/win/X11

Modified Files:
	winX.c winmap.c winmisc.c 
Log Message:
Merge Nethack 3.4.3 upstream source.


Index: winX.c
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/win/X11/winX.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- winX.c	7 Oct 2003 19:00:47 -0000	1.1.1.1
+++ winX.c	9 Dec 2003 16:14:45 -0000	1.2
@@ -653,7 +653,7 @@
 	    create_text_window(wp);
 	    break;
 	default:
-	    panic("create_nhwindow: unknown type [%d]\n", type);
+	    panic("create_nhwindow: unknown type [%d]", type);
 	    break;
     }
     return window;
@@ -677,7 +677,7 @@
 	    /* do nothing for these window types */
 	    break;
 	default:
-	    panic("clear_nhwindow: unknown window type [%d]\n", wp->type);
+	    panic("clear_nhwindow: unknown window type [%d]", wp->type);
 	    break;
     }
 }
@@ -740,7 +740,7 @@
 	    display_text_window(wp, blocking);	/* pop up text window */
 	    break;
 	default:
-	    panic("display_nhwindow: unknown window type [%d]\n", wp->type);
+	    panic("display_nhwindow: unknown window type [%d]", wp->type);
 	    break;
     }
 }
@@ -864,7 +864,7 @@
     if (wp->type == NHW_TEXT) {
 	wp->text_information->is_rip = TRUE;
     } else {
-	panic("ripout on non-text window (window type [%d])\n", wp->type);
+	panic("ripout on non-text window (window type [%d])", wp->type);
     }
 
     calculate_rip_text(how);

Index: winmisc.c
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/win/X11/winmisc.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- winmisc.c	7 Oct 2003 19:00:47 -0000	1.1.1.1
+++ winmisc.c	9 Dec 2003 16:14:45 -0000	1.2
@@ -34,7 +34,7 @@
 #include "winX.h"
 
 
-static Widget extended_command_popup;
+static Widget extended_command_popup = 0;
 static Widget extended_command_form;
 static Widget *extended_commands = 0;
 static int extended_command_selected;	/* index of the selected command; */
@@ -67,6 +67,7 @@
     "#override\n\
      <Key>: algn_key()";
 
+static void FDECL(popup_delete, (Widget, XEvent*, String*, Cardinal*));
 static void NDECL(ec_dismiss);
 static Widget FDECL(make_menu, (const char *,const char *,const char *,
 				const char *,XtCallbackProc,
@@ -326,7 +327,7 @@
 	} else if (ps_selected == PS_RANDOM) {
 	    flags.initrole = ROLE_RANDOM;
 	} else if (ps_selected < 0 || ps_selected >= num_roles) {
-	    panic("player_selection: bad role select value %d\n", ps_selected);
+	    panic("player_selection: bad role select value %d", ps_selected);
 	} else {
 	    flags.initrole = ps_selected;
 	}
@@ -391,7 +392,7 @@
 	    } else if (ps_selected == PS_RANDOM) {
 		flags.initrace = ROLE_RANDOM;
 	    } else if (ps_selected < 0 || ps_selected >= num_races) {
-		panic("player_selection: bad race select value %d\n", ps_selected);
+		panic("player_selection: bad race select value %d", ps_selected);
 	    } else {
 		flags.initrace = ps_selected;
 	    }
@@ -456,7 +457,7 @@
 	    } else if (ps_selected == PS_RANDOM) {
 		flags.initgend = ROLE_RANDOM;
 	    } else if (ps_selected < 0 || ps_selected >= num_gends) {
-		panic("player_selection: bad gender select value %d\n", ps_selected);
+		panic("player_selection: bad gender select value %d", ps_selected);
 	    } else {
 		flags.initgend = ps_selected;
 	    }
@@ -520,7 +521,7 @@
 	    } else if (ps_selected == PS_RANDOM) {
 		flags.initalign = ROLE_RANDOM;
 	    } else if (ps_selected < 0 || ps_selected >= num_algns) {
-		panic("player_selection: bad alignment select value %d\n", ps_selected);
+		panic("player_selection: bad alignment select value %d", ps_selected);
 	    } else {
 		flags.initalign = ps_selected;
 	    }
@@ -606,7 +607,24 @@
     String *params;
     Cardinal *num_params;
 {
-    ec_dismiss();
+    if (w == extended_command_popup) {
+	ec_dismiss();
+    } else {
+	popup_delete(w, event, params, num_params);
+    }
+}
+
+/* ARGSUSED */
+static void
+popup_delete(w, event, params, num_params)
+    Widget w;
+    XEvent *event;
+    String *params;
+    Cardinal *num_params;
+{
+    ps_selected = PS_QUIT;
+    nh_XtPopdown(w);
+    exit_x_event = TRUE;		/* leave event loop */
 }
 
 static void

Index: winmap.c
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/win/X11/winmap.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- winmap.c	7 Oct 2003 19:00:47 -0000	1.1.1.1
+++ winmap.c	9 Dec 2003 16:14:45 -0000	1.2
@@ -1640,7 +1640,7 @@
 		}
 		break;
 	    default:
-		panic("x_event: unknown exit condition %d\n", exit_condition);
+		panic("x_event: unknown exit condition %d", exit_condition);
 		break;
 	}
     } while (keep_going);