nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

more X11 memory management

Browse Source 
Free askname's widgets after use and free getlin's and yn_function's
persistent widgets at end of game.

When loading an entire text file into one long string in memory,
use strcpy on a pointer to the end of the string instead of having
strcat repeatedly churn through the entire string as it grows for
each line.  [Since that's only used for small help files (biggest
is dat/history), this optimization is probably not noticeable.]

Also, a handful of new comments and quite a bit of reformatting.
This commit is contained in:
PatR
2016-02-04 17:55:20 -08:00
parent 93c00d5c82
commit ea21f384ba
1 changed files with 206 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/X11/winX.c
+206 -169
View File
@@ -1,5 +1,5 @@
/* NetHack 3.6 winX.c $NHDT-Date: 1453446819 2016/01/22 07:13:39 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.35 $ */ /* NetHack 3.6 winX.c $NHDT-Date: 1454637315 2016/02/05 01:55:15 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.36 $ */
/* Copyright (c) Dean Luick, 1992 */ /* Copyright (c) Dean Luick, 1992 */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
/* /*
@@ -144,7 +144,9 @@ static void FDECL(yn_key, (Widget, XEvent *, String *, Cardinal *));
static void FDECL(yn_delete, (Widget, XEvent *, String *, Cardinal *)); static void FDECL(yn_delete, (Widget, XEvent *, String *, Cardinal *));
static void FDECL(askname_delete, (Widget, XEvent *, String *, Cardinal *)); static void FDECL(askname_delete, (Widget, XEvent *, String *, Cardinal *));
static void FDECL(getline_delete, (Widget, XEvent *, String *, Cardinal *)); static void FDECL(getline_delete, (Widget, XEvent *, String *, Cardinal *));
static void NDECL(release_getline_widgets);
static void FDECL(X11_hangup, (Widget, XEvent *, String *, Cardinal *)); static void FDECL(X11_hangup, (Widget, XEvent *, String *, Cardinal *));
static void NDECL(release_yn_widgets);
static int FDECL(input_event, (int)); static int FDECL(input_event, (int));
static void FDECL(win_visible, (Widget, XtPointer, XEvent *, Boolean *)); static void FDECL(win_visible, (Widget, XtPointer, XEvent *, Boolean *));
static void NDECL(init_standard_windows); static void NDECL(init_standard_windows);
@@ -156,12 +158,11 @@ static void FDECL(X11_sig_cb, (XtPointer, XtSignalId *));
/* /*
* Local variables. * Local variables.
*/ */
static boolean x_inited = FALSE; /* TRUE if window system is set up. */ static boolean x_inited = FALSE; /* TRUE if window system is set up. */
static winid message_win = WIN_ERR, /* These are the winids of the */ static winid message_win = WIN_ERR, /* These are the winids of the message, */
map_win = WIN_ERR, /* message, map, and status */ map_win = WIN_ERR, /* map, and status windows, when they */
status_win = WIN_ERR; /* windows, when they are created */ status_win = WIN_ERR; /* are created in init_windows(). */
/* in init_windows(). */ static Pixmap icon_pixmap = None; /* Pixmap for icon. */
static Pixmap icon_pixmap = None; /* Pixmap for icon. */
/* /*
* Find the window structure that corresponds to the given widget. Note * Find the window structure that corresponds to the given widget. Note
@@ -174,8 +175,10 @@ Widget w;
int windex; int windex;
struct xwindow *wp; struct xwindow *wp;
/* Search to find the corresponding window. Look at the main widget, */ /*
/* popup, the parent of the main widget, then parent of the widget. */ * Search to find the corresponding window. Look at the main widget,
* popup, the parent of the main widget, then parent of the widget.
*/
for (windex = 0, wp = window_list; windex < MAX_WINDOWS; windex++, wp++) for (windex = 0, wp = window_list; windex < MAX_WINDOWS; windex++, wp++)
if (wp->type != NHW_NONE && (wp->w == w || wp->popup == w if (wp->type != NHW_NONE && (wp->w == w || wp->popup == w
|| (wp->w && (XtParent(wp->w)) == w) || (wp->w && (XtParent(wp->w)) == w)
@@ -237,9 +240,9 @@ XtConvertArgRec const nhcolorConvertArgs[] = {
} }
/* /*
* Find a color that approximates the color named in "str". The "str" color * Find a color that approximates the color named in "str".
* may be a color name ("red") or number ("#7f0000"). If str == NULL, then * The "str" color may be a color name ("red") or number ("#7f0000").
* "color" is assumed to contain the RGB color wanted. * If str is Null, then "color" is assumed to contain the RGB color wanted.
* The approximate color found is returned in color as well. * The approximate color found is returned in color as well.
* Return True if something close was found. * Return True if something close was found.
*/ */
@@ -257,8 +260,8 @@ XColor *color; /* the X color structure; changed only if successful */
register int i, j; register int i, j;
register long tdiff; register long tdiff;
/* if the screen doesn't have a big colormap, don't waste our time */ /* if the screen doesn't have a big colormap, don't waste our time
/* or if it's huge, and _some_ match should have been possible */ or if it's huge, and _some_ match should have been possible */
if ((ncells = CellsOfScreen(screen)) < 256 || ncells > 4096) if ((ncells = CellsOfScreen(screen)) < 256 || ncells > 4096)
return False; return False;
@@ -277,9 +280,9 @@ XColor *color; /* the X color structure; changed only if successful */
XQueryColors(DisplayOfScreen(screen), colormap, table, ncells); XQueryColors(DisplayOfScreen(screen), colormap, table, ncells);
} }
/* go thru cells and look for the one with smallest diff */ /* go thru cells and look for the one with smallest diff */
/* diff is calculated abs(reddiff)+abs(greendiff)+abs(bluediff) */ /* diff is calculated abs(reddiff)+abs(greendiff)+abs(bluediff) */
/* a more knowledgeable color person might improve this -dlc */ /* a more knowledgeable color person might improve this -dlc */
try_again: try_again:
for (i = 0; i < ncells; i++) { for (i = 0; i < ncells; i++) {
if (table[i].flags == tmp.flags) { if (table[i].flags == tmp.flags) {
@@ -339,10 +342,10 @@ XtPointer *closure_ret;
Cardinal num_params = 1; Cardinal num_params = 1;
if (*num_args != 2) { if (*num_args != 2) {
XtAppWarningMsg( XtAppWarningMsg(app, "wrongParameters",
app, "wrongParameters", "cvtStringToPixel", "XtToolkitError", "cvtStringToPixel", "XtToolkitError",
"String to pixel conversion needs screen and colormap arguments", "String to pixel conversion needs screen and colormap arguments",
(String *) 0, (Cardinal *) 0); (String *) 0, (Cardinal *) 0);
return False; return False;
} }
@@ -426,10 +429,9 @@ Cardinal *num_args;
Colormap colormap; Colormap colormap;
if (*num_args != 2) { if (*num_args != 2) {
XtAppWarningMsg( XtAppWarningMsg(app, "wrongParameters", "freePixel", "XtToolkitError",
app, "wrongParameters", "freePixel", "XtToolkitError", "Freeing a pixel requires screen and colormap arguments",
"Freeing a pixel requires screen and colormap arguments", (String *) 0, (Cardinal *) 0);
(String *) 0, (Cardinal *) 0);
return; return;
} }
@@ -445,9 +447,11 @@ Cardinal *num_args;
/* [ALI] Utility function to ask Xaw for font height, since the previous /* [ALI] Utility function to ask Xaw for font height, since the previous
* assumption of ascent + descent is not always valid. * assumption of ascent + descent is not always valid.
*/ */
Dimension nhFontHeight(w) Widget w; Dimension
#ifdef _XawTextSink_h nhFontHeight(w)
Widget w;
{ {
#ifdef _XawTextSink_h
Widget sink; Widget sink;
XawTextPosition pos = 0; XawTextPosition pos = 0;
int resWidth, resHeight; int resWidth, resHeight;
@@ -458,9 +462,7 @@ Dimension nhFontHeight(w) Widget w;
XawTextSinkFindPosition(sink, pos, 0, 0, 0, &pos, &resWidth, &resHeight); XawTextSinkFindPosition(sink, pos, 0, 0, 0, &pos, &resWidth, &resHeight);
return resHeight; return resHeight;
}
#else #else
{
XFontStruct *fs; XFontStruct *fs;
Arg args[1]; Arg args[1];
@@ -469,8 +471,8 @@ Dimension nhFontHeight(w) Widget w;
/* Assume font height is ascent + descent. */ /* Assume font height is ascent + descent. */
return = fs->ascent + fs->descent; return = fs->ascent + fs->descent;
}
#endif #endif
}
/* Global Functions ======================================================== /* Global Functions ========================================================
*/ */
@@ -715,19 +717,20 @@ boolean blocking;
if (wp->popup) if (wp->popup)
nh_XtPopup(wp->popup, (int) XtGrabNone, wp->w); nh_XtPopup(wp->popup, (int) XtGrabNone, wp->w);
display_map_window(wp); /* flush map */ display_map_window(wp); /* flush map */
/*
* We need to flush the message window here due to the way the tty /*
* port is set up. To flush a window, you need to call this * We need to flush the message window here due to the way the tty
* routine. However, the tty port _pauses_ with a --more-- if we * port is set up. To flush a window, you need to call this
* do a display_nhwindow(WIN_MESSAGE, FALSE). Thus, we can't call * routine. However, the tty port _pauses_ with a --more-- if we
* display_nhwindow(WIN_MESSAGE,FALSE) in parse() because then we * do a display_nhwindow(WIN_MESSAGE, FALSE). Thus, we can't call
* get a --more-- after every line. * display_nhwindow(WIN_MESSAGE,FALSE) in parse() because then we
* * get a --more-- after every line.
* Perhaps the window document should mention that when the map *
* is flushed, everything on the three main windows should be * Perhaps the window document should mention that when the map
* flushed. Note: we don't need to flush the status window * is flushed, everything on the three main windows should be
* because we don't buffer changes. * flushed. Note: we don't need to flush the status window
*/ * because we don't buffer changes.
*/
if (WIN_MESSAGE != WIN_ERR) if (WIN_MESSAGE != WIN_ERR)
display_message_window(&window_list[WIN_MESSAGE]); display_message_window(&window_list[WIN_MESSAGE]);
if (blocking) if (blocking)
@@ -882,7 +885,8 @@ const char *str;
/* Under X, we don't need to initialize the number pad. */ /* Under X, we don't need to initialize the number pad. */
/* ARGSUSED */ /* ARGSUSED */
void X11_number_pad(state) /* called from options.c */ void
X11_number_pad(state) /* called from options.c */
int state; int state;
{ {
nhUse(state); nhUse(state);
@@ -890,16 +894,19 @@ int state;
return; return;
} }
/* called from setftty() in unixtty.c */
void void
X11_start_screen() X11_start_screen()
{ {
return; return;
} /* called from setftty() in unixtty.c */ }
/* called from settty() in unixtty.c */
void void
X11_end_screen() X11_end_screen()
{ {
return; return;
} /* called from settty() in unixtty.c */ }
#ifdef GRAPHIC_TOMBSTONE #ifdef GRAPHIC_TOMBSTONE
void void
@@ -935,8 +942,7 @@ static XtActionsRec actions[] = {
{ nhStr("delete_file"), delete_file }, /* file delete-window */ { nhStr("delete_file"), delete_file }, /* file delete-window */
{ nhStr("dismiss_text"), dismiss_text }, /* text widget button action */ { nhStr("dismiss_text"), dismiss_text }, /* text widget button action */
{ nhStr("delete_text"), delete_text }, /* text widget delete action */ { nhStr("delete_text"), delete_text }, /* text widget delete action */
{ nhStr("key_dismiss_text"), { nhStr("key_dismiss_text"), key_dismiss_text }, /* text key action */
key_dismiss_text }, /* text widget key action */
#ifdef GRAPHIC_TOMBSTONE #ifdef GRAPHIC_TOMBSTONE
{ nhStr("rip_dismiss_text"), rip_dismiss_text }, /* rip in text widget */ { nhStr("rip_dismiss_text"), rip_dismiss_text }, /* rip in text widget */
#endif #endif
@@ -1030,19 +1036,22 @@ char **argv;
XSetIOErrorHandler((XIOErrorHandler) hangup); XSetIOErrorHandler((XIOErrorHandler) hangup);
num_args = 0; num_args = 0;
XtSetArg(args[num_args], XtNallowShellResize, True); XtSetArg(args[num_args], XtNallowShellResize, True); num_args++;
num_args++;
toplevel =
XtAppInitialize(&app_context, "NetHack", /* application class */
(XrmOptionDescList) 0, 0, /* options list */
argcp, (String *) argv, /* command line args */
(String *) 0, /* fallback resources */
(ArgList) args, num_args);
XtOverrideTranslations(
toplevel,
XtParseTranslationTable("<Message>WM_PROTOCOLS: X11_hangup()"));
/* We don't need to realize the top level widget. */ /*
* TODO? Find and load NetHack.ad (installation puts a template copy
* in the playground directory) if the server doesn't already have it.
*/
toplevel = XtAppInitialize(&app_context, "NetHack", /* application */
(XrmOptionDescList) 0, 0, /* options list */
argcp, (String *) argv, /* command line */
(String *) 0, /* fallback resources */
(ArgList) args, num_args);
XtOverrideTranslations(toplevel,
XtParseTranslationTable("<Message>WM_PROTOCOLS: X11_hangup()"));
/* We don't need to realize the top level widget. */
#ifdef TEXTCOLOR #ifdef TEXTCOLOR
/* add new color converter to deal with overused colormaps */ /* add new color converter to deal with overused colormaps */
@@ -1123,10 +1132,14 @@ const char *dummy;
X11_destroy_nhwindow(WIN_MAP); X11_destroy_nhwindow(WIN_MAP);
if (WIN_MESSAGE != WIN_ERR) if (WIN_MESSAGE != WIN_ERR)
X11_destroy_nhwindow(WIN_MESSAGE); X11_destroy_nhwindow(WIN_MESSAGE);
release_getline_widgets();
release_yn_widgets();
} }
#ifdef X11_HANGUP_SIGNAL #ifdef X11_HANGUP_SIGNAL
static void X11_sig(sig) /* Unix signal handler */ static void
X11_sig(sig) /* Unix signal handler */
int sig; int sig;
{ {
XtNoticeSignal(X11_sig_id); XtNoticeSignal(X11_sig_id);
@@ -1249,7 +1262,7 @@ Widget w;
XtPointer client_data; XtPointer client_data;
XtPointer call_data; XtPointer call_data;
{ {
int len; unsigned len;
char *s; char *s;
Widget dialog = (Widget) client_data; Widget dialog = (Widget) client_data;
@@ -1258,15 +1271,15 @@ XtPointer call_data;
s = (char *) GetDialogResponse(dialog); s = (char *) GetDialogResponse(dialog);
len = (int) strlen(s); len = strlen(s);
if (len == 0) { if (len == 0) {
X11_nhbell(); X11_nhbell();
return; return;
} }
/* Truncate name if necessary */ /* Truncate name if necessary */
if (len >= (int) sizeof(plname) - 1) if (len >= sizeof plname - 1)
len = (int) sizeof(plname) - 1; len = sizeof plname - 1;
(void) strncpy(plname, s, len); (void) strncpy(plname, s, len);
plname[len] = '\0'; plname[len] = '\0';
@@ -1276,6 +1289,8 @@ XtPointer call_data;
exit_x_event = TRUE; exit_x_event = TRUE;
} }
/* ask player for character's name to replace generic name "player" (or other
values; see config.h) after 'nethack -u player' or OPTIONS=name:player */
void void
X11_askname() X11_askname()
{ {
@@ -1286,9 +1301,8 @@ X11_askname()
popup = XtCreatePopupShell("askname", transientShellWidgetClass, toplevel, popup = XtCreatePopupShell("askname", transientShellWidgetClass, toplevel,
args, ONE); args, ONE);
XtOverrideTranslations( XtOverrideTranslations(popup,
popup, XtParseTranslationTable("<Message>WM_PROTOCOLS: askname_delete()"));
XtParseTranslationTable("<Message>WM_PROTOCOLS: askname_delete()"));
dialog = CreateDialog(popup, nhStr("dialog"), askname_done, dialog = CreateDialog(popup, nhStr("dialog"), askname_done,
(XtCallbackProc) 0); (XtCallbackProc) 0);
@@ -1303,6 +1317,9 @@ X11_askname()
/* The callback will enable the event loop exit. */ /* The callback will enable the event loop exit. */
(void) x_event(EXIT_ON_EXIT); (void) x_event(EXIT_ON_EXIT);
XtDestroyWidget(dialog);
XtDestroyWidget(popup);
} }
/* getline ----------------------------------------------------------------- /* getline -----------------------------------------------------------------
@@ -1379,21 +1396,26 @@ XtPointer call_data;
exit_x_event = TRUE; exit_x_event = TRUE;
} }
static void
release_getline_widgets()
{
if (getline_dialog)
XtDestroyWidget(getline_dialog), getline_dialog = (Widget) 0;
if (getline_popup)
XtDestroyWidget(getline_popup), getline_popup = (Widget) 0;
}
void void
X11_getlin(question, input) X11_getlin(question, input)
const char *question; const char *question;
char *input; char *input;
{ {
static boolean need_to_init = True;
getline_input = input; getline_input = input;
flush_screen(1); flush_screen(1);
if (need_to_init) { if (!getline_popup) {
Arg args[1]; Arg args[1];
need_to_init = False;
XtSetArg(args[0], XtNallowShellResize, True); XtSetArg(args[0], XtNallowShellResize, True);
getline_popup = XtCreatePopupShell("getline", getline_popup = XtCreatePopupShell("getline",
@@ -1411,6 +1433,12 @@ char *input;
&wm_delete_window, 1); &wm_delete_window, 1);
} }
SetDialogPrompt(getline_dialog, (String) question); /* set prompt */ SetDialogPrompt(getline_dialog, (String) question); /* set prompt */
/* 60: make the answer widget be wide enough to hold 60 characters,
or the length of the prompt string, whichever is bigger. User's
response can be longer--when limit is reached, value-so-far will
slide left hiding some chars at the beginning of the response but
making room to type more. [Prior to 3.6.1, width wasn't specifiable
and answer box always got sized to match the width of the prompt.] */
SetDialogResponse(getline_dialog, nhStr(""), 60); /* set default answer */ SetDialogResponse(getline_dialog, nhStr(""), 60); /* set default answer */
positionpopup(getline_popup, TRUE); /* center,bottom */ positionpopup(getline_popup, TRUE); /* center,bottom */
@@ -1478,7 +1506,7 @@ boolean complain;
#define LLEN 128 #define LLEN 128
char line[LLEN]; char line[LLEN];
int num_lines; int num_lines;
char *textlines; char *textlines, *bp;
int charcount; int charcount;
/* Use the port-independent file opener to see if the file exists. */ /* Use the port-independent file opener to see if the file exists. */
@@ -1487,7 +1515,6 @@ boolean complain;
if (!fp) { if (!fp) {
if (complain) if (complain)
pline("Cannot open %s. Sorry.", str); pline("Cannot open %s. Sorry.", str);
return; /* it doesn't exist, ignore */ return; /* it doesn't exist, ignore */
} }
@@ -1520,56 +1547,45 @@ boolean complain;
fp = dlb_fopen(str, RDTMODE); fp = dlb_fopen(str, RDTMODE);
bp = textlines;
while (dlb_fgets(line, LLEN, fp)) { while (dlb_fgets(line, LLEN, fp)) {
(void) strcat(textlines, line); Strcpy((bp = eos(bp)), line);
} }
(void) dlb_fclose(fp); (void) dlb_fclose(fp);
num_args = 0; num_args = 0;
XtSetArg(args[num_args], nhStr(XtNtitle), str); XtSetArg(args[num_args], nhStr(XtNtitle), str); num_args++;
num_args++;
popup = XtCreatePopupShell("display_file", topLevelShellWidgetClass, popup = XtCreatePopupShell("display_file", topLevelShellWidgetClass,
toplevel, args, num_args); toplevel, args, num_args);
XtOverrideTranslations( XtOverrideTranslations(popup,
popup,
XtParseTranslationTable("<Message>WM_PROTOCOLS: delete_file()")); XtParseTranslationTable("<Message>WM_PROTOCOLS: delete_file()"));
num_args = 0; num_args = 0;
XtSetArg(args[num_args], nhStr(XtNscrollHorizontal), XtSetArg(args[num_args], nhStr(XtNscrollHorizontal),
XawtextScrollWhenNeeded); XawtextScrollWhenNeeded); num_args++;
num_args++;
XtSetArg(args[num_args], nhStr(XtNscrollVertical), XawtextScrollAlways); XtSetArg(args[num_args], nhStr(XtNscrollVertical), XawtextScrollAlways);
num_args++; num_args++;
XtSetArg(args[num_args], nhStr(XtNtype), XawAsciiString); XtSetArg(args[num_args], nhStr(XtNtype), XawAsciiString); num_args++;
num_args++; XtSetArg(args[num_args], nhStr(XtNstring), textlines); num_args++;
XtSetArg(args[num_args], nhStr(XtNstring), textlines); XtSetArg(args[num_args], nhStr(XtNdisplayCaret), False); num_args++;
num_args++;
XtSetArg(args[num_args], nhStr(XtNdisplayCaret), False);
num_args++;
XtSetArg(args[num_args], nhStr(XtNtranslations), XtSetArg(args[num_args], nhStr(XtNtranslations),
XtParseTranslationTable(display_translations)); XtParseTranslationTable(display_translations)); num_args++;
num_args++;
dispfile = dispfile = XtCreateManagedWidget("text", /* name */
XtCreateManagedWidget("text", /* name */ asciiTextWidgetClass, popup, /* parent */
asciiTextWidgetClass, popup, /* parent widget */ args, num_args);
args, /* set some values */
num_args); /* number of values to set */
/* Get font and border information. */ /* Get font and border information. */
num_args = 0; num_args = 0;
XtSetArg(args[num_args], nhStr(XtNfont), &fs); XtSetArg(args[num_args], nhStr(XtNfont), &fs); num_args++;
num_args++; XtSetArg(args[num_args], nhStr(XtNtopMargin), &top_margin); num_args++;
XtSetArg(args[num_args], nhStr(XtNtopMargin), &top_margin);
num_args++;
XtSetArg(args[num_args], nhStr(XtNbottomMargin), &bottom_margin); XtSetArg(args[num_args], nhStr(XtNbottomMargin), &bottom_margin);
num_args++; num_args++;
XtSetArg(args[num_args], nhStr(XtNleftMargin), &left_margin); XtSetArg(args[num_args], nhStr(XtNleftMargin), &left_margin); num_args++;
num_args++;
XtSetArg(args[num_args], nhStr(XtNrightMargin), &right_margin); XtSetArg(args[num_args], nhStr(XtNrightMargin), &right_margin);
num_args++; num_args++;
XtGetValues(dispfile, args, num_args); XtGetValues(dispfile, args, num_args);
/* /*
@@ -1582,10 +1598,8 @@ boolean complain;
/* Set the new width and height. */ /* Set the new width and height. */
num_args = 0; num_args = 0;
XtSetArg(args[num_args], XtNwidth, new_width); XtSetArg(args[num_args], XtNwidth, new_width); num_args++;
num_args++; XtSetArg(args[num_args], XtNheight, new_height); num_args++;
XtSetArg(args[num_args], XtNheight, new_height);
num_args++;
XtSetValues(dispfile, args, num_args); XtSetValues(dispfile, args, num_args);
nh_XtPopup(popup, (int) XtGrabNone, (Widget) 0); nh_XtPopup(popup, (int) XtGrabNone, (Widget) 0);
@@ -1731,21 +1745,32 @@ Cardinal *num_params;
exit_x_event = TRUE; /* exit our event handler */ exit_x_event = TRUE; /* exit our event handler */
} }
/* called at exit time */
static void
release_yn_widgets()
{
if (yn_label)
XtDestroyWidget(yn_label), yn_label = (Widget) 0;
if (yn_popup)
XtDestroyWidget(yn_popup), yn_popup = (Widget) 0;
}
/* X11-specific edition of yn_function(), the routine called by the core
to show a prompt and get a single keystroke answer, often 'y' vs 'n' */
char char
X11_yn_function(ques, choices, def) X11_yn_function(ques, choices, def)
const char *ques; const char *ques;
const char *choices; const char *choices; /* string of possible response chars; any char if Null */
char def; char def; /* default response if user hits <space> or <return> */
{ {
static Boolean need_to_init = True;
char buf[BUFSZ]; char buf[BUFSZ];
Arg args[4]; Arg args[4];
Cardinal num_args; Cardinal num_args;
yn_choices = choices; /* set up globals for callback to use */ yn_choices = choices; /* set up globals for callback to use */
yn_def = def; yn_def = def;
yn_preserve_case = yn_preserve_case = !choices; /* preserve case when an arbitrary
!choices; /* preserve when arbitrary response allowed */ response is allowed */
/* /*
* This is sort of a kludge. There are quite a few places in the main * This is sort of a kludge. There are quite a few places in the main
@@ -1782,8 +1807,9 @@ char def;
Strcat(buf, " "); Strcat(buf, " ");
/* escape maps to 'q' or 'n' or default, in that order */ /* escape maps to 'q' or 'n' or default, in that order */
yn_esc_map = yn_esc_map = (index(choices, 'q') ? 'q'
(index(choices, 'q') ? 'q' : (index(choices, 'n') ? 'n' : def)); : index(choices, 'n') ? 'n'
: def);
} else { } else {
if ((int) (1 + strlen(ques) + 1) >= BUFSZ) if ((int) (1 + strlen(ques) + 1) >= BUFSZ)
panic("X11_yn_function: question too long"); panic("X11_yn_function: question too long");
@@ -1791,20 +1817,40 @@ char def;
Strcat(buf, " "); Strcat(buf, " ");
} }
if (!appResources.slow && need_to_init) { /*
need_to_init = False; * The 'slow' resource is misleadingly named. When it is True, we
* re-use the same one-line widget above the map for all yn prompt
* responses instead of re-using a popup widget for each one. It's
* crucial for client/server configs where the server is slow putting
* up a popup or requires click-to-focus to respond to the popup, but
* is also useful for players who just want to be able to look at the
* same location to read questions they're being asked to answer.
*/
if (appResources.slow) {
/*
* 'slow': the yn_label widget was created when the map and
* status widgets were, and is positioned between them. It
* will persist until end of game. All we need to do for
* yn_function is direct keystroke input to the yn response
* handler and reset its label to be the prompt text (below).
*/
input_func = yn_key;
} else if (!yn_label) {
/*
* Not 'slow'; create a persistent widget that will be popped up
* as needed, then down again, and last until end of game. The
* associated yn_label widget is used to track whether it exists.
*/
XtSetArg(args[0], XtNallowShellResize, True); XtSetArg(args[0], XtNallowShellResize, True);
yn_popup = XtCreatePopupShell("query", transientShellWidgetClass, yn_popup = XtCreatePopupShell("query", transientShellWidgetClass,
toplevel, args, ONE); toplevel, args, ONE);
XtOverrideTranslations( XtOverrideTranslations(yn_popup,
yn_popup, XtParseTranslationTable("<Message>WM_PROTOCOLS: yn_delete()"));
XtParseTranslationTable("<Message>WM_PROTOCOLS: yn_delete()"));
num_args = 0; num_args = 0;
XtSetArg(args[num_args], XtNtranslations, XtSetArg(args[num_args], XtNtranslations,
XtParseTranslationTable(yn_translations)); XtParseTranslationTable(yn_translations)); num_args++;
num_args++;
yn_label = XtCreateManagedWidget("yn_label", labelWidgetClass, yn_label = XtCreateManagedWidget("yn_label", labelWidgetClass,
yn_popup, args, num_args); yn_popup, args, num_args);
@@ -1813,12 +1859,9 @@ char def;
&wm_delete_window, 1); &wm_delete_window, 1);
} }
if (appResources.slow) /* set the label of the yn widget to be the prompt text */
input_func = yn_key;
num_args = 0; num_args = 0;
XtSetArg(args[num_args], XtNlabel, buf); XtSetArg(args[num_args], XtNlabel, buf); num_args++;
num_args++;
XtSetValues(yn_label, args, num_args); XtSetValues(yn_label, args, num_args);
if (!appResources.slow) { if (!appResources.slow) {
@@ -1827,8 +1870,7 @@ char def;
* need to set the label twice to get the size to change. * need to set the label twice to get the size to change.
*/ */
num_args = 0; num_args = 0;
XtSetArg(args[num_args], XtNlabel, buf); XtSetArg(args[num_args], XtNlabel, buf); num_args++;
num_args++;
XtSetValues(yn_label, args, num_args); XtSetValues(yn_label, args, num_args);
positionpopup(yn_popup, TRUE); positionpopup(yn_popup, TRUE);
@@ -1836,13 +1878,14 @@ char def;
} }
yn_getting_num = FALSE; yn_getting_num = FALSE;
(void) x_event(EXIT_ON_EXIT); (void) x_event(EXIT_ON_EXIT); /* get keystroke(s) */
if (appResources.slow) { if (appResources.slow) {
/* keystrokes now belong to the map */
input_func = 0; input_func = 0;
/* erase the prompt */
num_args = 0; num_args = 0;
XtSetArg(args[num_args], XtNlabel, " "); XtSetArg(args[num_args], XtNlabel, " "); num_args++;
num_args++;
XtSetValues(yn_label, args, num_args); XtSetValues(yn_label, args, num_args);
} else { } else {
nh_XtPopdown(yn_popup); /* this removes the event grab */ nh_XtPopdown(yn_popup); /* this removes the event grab */
@@ -1851,7 +1894,8 @@ char def;
return yn_return; return yn_return;
} }
/*ARGSUSED*/ /* used when processing window-capability-specific run-time options;
we support toggling tiles on and off via iflags.wc_tiled_map */
void void
X11_preference_update(pref) X11_preference_update(pref)
const char *pref; const char *pref;
@@ -1898,8 +1942,10 @@ XEvent *event;
map_input(window_list[WIN_MAP].w, event, (String *) 0, &num); map_input(window_list[WIN_MAP].w, event, (String *) 0, &num);
} }
/* only called for autofocus */
/*ARGSUSED*/ /*ARGSUSED*/
static void win_visible(w, data, event, flag) /* only called for autofocus */ static void
win_visible(w, data, event, flag)
Widget w; Widget w;
XtPointer data; /* client_data not used */ XtPointer data; /* client_data not used */
XEvent *event; XEvent *event;
@@ -1922,6 +1968,11 @@ Boolean *flag; /* continue_to_dispatch flag not used */
/* /*
* Set up the playing console. This has three major parts: the * Set up the playing console. This has three major parts: the
* message window, the map, and the status window. * message window, the map, and the status window.
*
* For configs specifying the 'slow' resource, the yn_label widget
* is placed above the map and below the message window. Prompts
* requiring a single character response are displayed there rather
* than using a popup.
*/ */
static void static void
init_standard_windows() init_standard_windows()
@@ -1934,8 +1985,7 @@ init_standard_windows()
struct xwindow *wp; struct xwindow *wp;
num_args = 0; num_args = 0;
XtSetArg(args[num_args], XtNallowShellResize, True); XtSetArg(args[num_args], XtNallowShellResize, True); num_args++;
num_args++;
form = XtCreateManagedWidget("nethack", panedWidgetClass, toplevel, args, form = XtCreateManagedWidget("nethack", panedWidgetClass, toplevel, args,
num_args); num_args);
@@ -1958,30 +2008,24 @@ init_standard_windows()
/* Tell the form that contains it that resizes are OK. */ /* Tell the form that contains it that resizes are OK. */
num_args = 0; num_args = 0;
XtSetArg(args[num_args], nhStr(XtNresizable), True); XtSetArg(args[num_args], nhStr(XtNresizable), True); num_args++;
num_args++; XtSetArg(args[num_args], nhStr(XtNleft), XtChainLeft); num_args++;
XtSetArg(args[num_args], nhStr(XtNleft), XtChainLeft); XtSetArg(args[num_args], nhStr(XtNtop), XtChainTop); num_args++;
num_args++;
XtSetArg(args[num_args], nhStr(XtNtop), XtChainTop);
num_args++;
XtSetValues(message_viewport, args, num_args); XtSetValues(message_viewport, args, num_args);
if (appResources.slow) { if (appResources.slow) {
num_args = 0; num_args = 0;
XtSetArg(args[num_args], XtNtranslations, XtSetArg(args[num_args], XtNtranslations,
XtParseTranslationTable(yn_translations)); XtParseTranslationTable(yn_translations)); num_args++;
num_args++;
yn_label = XtCreateManagedWidget("yn_label", labelWidgetClass, form, yn_label = XtCreateManagedWidget("yn_label", labelWidgetClass, form,
args, num_args); args, num_args);
num_args = 0; num_args = 0;
XtSetArg(args[num_args], nhStr(XtNfromVert), message_viewport); XtSetArg(args[num_args], nhStr(XtNfromVert), message_viewport);
num_args++; num_args++;
XtSetArg(args[num_args], nhStr(XtNjustify), XtJustifyLeft); XtSetArg(args[num_args], nhStr(XtNjustify), XtJustifyLeft);
num_args++; num_args++;
XtSetArg(args[num_args], nhStr(XtNresizable), True); XtSetArg(args[num_args], nhStr(XtNresizable), True); num_args++;
num_args++; XtSetArg(args[num_args], nhStr(XtNlabel), " "); num_args++;
XtSetArg(args[num_args], nhStr(XtNlabel), " ");
num_args++;
XtSetValues(yn_label, args, num_args); XtSetValues(yn_label, args, num_args);
} }
@@ -1999,14 +2043,12 @@ init_standard_windows()
/* Chain beneath message_viewport or yn window. */ /* Chain beneath message_viewport or yn window. */
num_args = 0; num_args = 0;
if (appResources.slow) { if (appResources.slow) {
XtSetArg(args[num_args], nhStr(XtNfromVert), yn_label); XtSetArg(args[num_args], nhStr(XtNfromVert), yn_label); num_args++;
num_args++;
} else { } else {
XtSetArg(args[num_args], nhStr(XtNfromVert), message_viewport); XtSetArg(args[num_args], nhStr(XtNfromVert), message_viewport);
num_args++; num_args++;
} }
XtSetArg(args[num_args], nhStr(XtNbottom), XtChainBottom); XtSetArg(args[num_args], nhStr(XtNbottom), XtChainBottom); num_args++;
num_args++;
XtSetValues(map_viewport, args, num_args); XtSetValues(map_viewport, args, num_args);
/* Create the status window, with the form as it's parent. */ /* Create the status window, with the form as it's parent. */
@@ -2025,16 +2067,11 @@ init_standard_windows()
* will never expand or contract. * will never expand or contract.
*/ */
num_args = 0; num_args = 0;
XtSetArg(args[num_args], nhStr(XtNfromVert), map_viewport); XtSetArg(args[num_args], nhStr(XtNfromVert), map_viewport); num_args++;
num_args++; XtSetArg(args[num_args], nhStr(XtNleft), XtChainLeft); num_args++;
XtSetArg(args[num_args], nhStr(XtNleft), XtChainLeft); XtSetArg(args[num_args], nhStr(XtNright), XtChainLeft); num_args++;
num_args++; XtSetArg(args[num_args], nhStr(XtNtop), XtChainBottom); num_args++;
XtSetArg(args[num_args], nhStr(XtNright), XtChainLeft); XtSetArg(args[num_args], nhStr(XtNbottom), XtChainBottom); num_args++;
num_args++;
XtSetArg(args[num_args], nhStr(XtNtop), XtChainBottom);
num_args++;
XtSetArg(args[num_args], nhStr(XtNbottom), XtChainBottom);
num_args++;
XtSetValues(status, args, num_args); XtSetValues(status, args, num_args);
/* /*
@@ -2046,8 +2083,8 @@ init_standard_windows()
*/ */
/* XtSetMappedWhenManaged(toplevel, False); */ /* XtSetMappedWhenManaged(toplevel, False); */
XtRealizeWidget(toplevel); XtRealizeWidget(toplevel);
wm_delete_window = wm_delete_window = XInternAtom(XtDisplay(toplevel),
XInternAtom(XtDisplay(toplevel), "WM_DELETE_WINDOW", False); "WM_DELETE_WINDOW", False);
XSetWMProtocols(XtDisplay(toplevel), XtWindow(toplevel), XSetWMProtocols(XtDisplay(toplevel), XtWindow(toplevel),
&wm_delete_window, 1); &wm_delete_window, 1);
@@ -2170,8 +2207,7 @@ int dir;
* libXmu.sa.4.0, but not in libXmu.so.4.0. Rather than fiddle with * libXmu.sa.4.0, but not in libXmu.so.4.0. Rather than fiddle with
* static linking, we do this. * static linking, we do this.
*/ */
if (rn2(2) > 2) { if (rn2(2) > 2) { /* i.e., FALSE that an optimizer probably can't find */
/* i.e., FALSE that an optimizer probably can't find */
get_wmShellWidgetClass(); get_wmShellWidgetClass();
get_applicationShellWidgetClass(); get_applicationShellWidgetClass();
} }
@@ -2211,6 +2247,7 @@ Cardinal *num_params;
/* Perhaps the widget enclosing this has scrollbars (could use while) /* Perhaps the widget enclosing this has scrollbars (could use while)
*/ */
Widget parent = XtParent(viewport); Widget parent = XtParent(viewport);
if (parent) { if (parent) {
horiz_sb = XtNameToWidget(parent, "horizontal"); horiz_sb = XtNameToWidget(parent, "horizontal");
vert_sb = XtNameToWidget(parent, "vertical"); vert_sb = XtNameToWidget(parent, "vertical");