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

B14005 cmdassist font

Browse Source 
<Someone> wrote:
	I happened to be playing under X11 for a change this weekend, and I
	noticed that, since the direction help of cmdassist uses (sort of)
	ASCII art, it looks rather peculiar in a proportional font. Could it
	be made to use the menu font instead?
This commit is contained in:
nethack.allison
2003-01-02 03:07:46 +00:00
parent 133566ff1b
commit da912b0780
1 changed files with 66 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cmd.c
+66 -31
View File
@@ -150,6 +150,8 @@ static const char* readchar_queue="";
STATIC_DCL char *NDECL(parse); STATIC_DCL char *NDECL(parse);
STATIC_DCL boolean FDECL(help_dir, (CHAR_P, char *)); STATIC_DCL boolean FDECL(help_dir, (CHAR_P, char *));
STATIC_DCL void FDECL(help_out, (winid, char *, BOOLEAN_P));
#ifdef OVL1 #ifdef OVL1
@@ -2023,6 +2025,22 @@ const char *s;
return 1; return 1;
} }
STATIC_OVL void
help_out(win, str, use_menu)
winid win;
char *str;
boolean use_menu;
{
if (use_menu) {
anything any;
any.a_void = 0;
add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, str, MENU_UNSELECTED);
} else {
putstr(win, 0, str);
}
return;
}
STATIC_OVL boolean STATIC_OVL boolean
help_dir(sym, msg) help_dir(sym, msg)
char sym; char sym;
@@ -2031,14 +2049,24 @@ char *msg;
char ctrl; char ctrl;
winid win; winid win;
char *wiz_only_list = "EFGIOVW"; char *wiz_only_list = "EFGIOVW";
menu_item *selected;
char buf[BUFSZ], buf2[BUFSZ], *expl; char buf[BUFSZ], buf2[BUFSZ], *expl;
boolean use_menu = FALSE;
win = create_nhwindow(NHW_TEXT); /* use menu window rather than text to display the help */
if (!win) return FALSE; if (!strncmpi(windowprocs.name, "x11", 3))
if (msg) { use_menu = TRUE;
if (!use_menu && msg) {
win = create_nhwindow(NHW_TEXT);
if (!win) return FALSE;
Sprintf(buf, "cmdassist: %s", msg); Sprintf(buf, "cmdassist: %s", msg);
putstr(win, 0, buf); help_out(win, buf, use_menu);
putstr(win, 0, ""); help_out(win, "", use_menu);
} else {
win = create_nhwindow(NHW_MENU);
if (!win) return FALSE;
start_menu(win);
} }
if (letter(sym)) { if (letter(sym)) {
sym = highc(sym); sym = highc(sym);
@@ -2052,39 +2080,46 @@ char *msg;
Sprintf(buf, "Are you trying to use ^%c%s?", sym, Sprintf(buf, "Are you trying to use ^%c%s?", sym,
index(wiz_only_list, sym) ? "" : index(wiz_only_list, sym) ? "" :
" as specified in the Guidebook"); " as specified in the Guidebook");
putstr(win, 0, buf); help_out(win, buf, use_menu);
putstr(win, 0, ""); help_out(win, "", use_menu);
putstr(win, 0, expl); help_out(win, expl, use_menu);
putstr(win, 0, ""); help_out(win, "", use_menu);
putstr(win, 0, "To use that command, you press"); help_out(win, "To use that command, you press", use_menu);
Sprintf(buf, Sprintf(buf,
"the <Ctrl> key, and the <%c> key at the same time.", sym); "the <Ctrl> key, and the <%c> key at the same time.", sym);
putstr(win, 0, buf); help_out(win, buf, use_menu);
putstr(win, 0, ""); help_out(win, "", use_menu);
} }
} }
if (iflags.num_pad) { if (iflags.num_pad) {
putstr(win, 0, "Valid direction keys (with number_pad on) are:"); help_out(win, "Valid direction keys (with number_pad on) are:", use_menu);
putstr(win, 0, " 7 8 9"); help_out(win, " 7 8 9", use_menu);
putstr(win, 0, " \\ | / "); help_out(win, " \\ | / ", use_menu);
putstr(win, 0, " 4- . -6"); help_out(win, " 4- . -6", use_menu);
putstr(win, 0, " / | \\ "); help_out(win, " / | \\ ", use_menu);
putstr(win, 0, " 1 2 3"); help_out(win, " 1 2 3", use_menu);
} else { } else {
putstr(win, 0, "Valid direction keys are:"); help_out(win, "Valid direction keys are:", use_menu);
putstr(win, 0, " y k u"); help_out(win, " y k u", use_menu);
putstr(win, 0, " \\ | / "); help_out(win, " \\ | / ", use_menu);
putstr(win, 0, " h- . -l"); help_out(win, " h- . -l", use_menu);
putstr(win, 0, " / | \\ "); help_out(win, " / | \\ ", use_menu);
putstr(win, 0, " b j n"); help_out(win, " b j n", use_menu);
}; };
putstr(win, 0, ""); help_out(win, "", use_menu);
putstr(win, 0, " < up"); help_out(win, " < up", use_menu);
putstr(win, 0, " > down"); help_out(win, " > down", use_menu);
putstr(win, 0, " . direct at yourself"); help_out(win, " . direct at yourself", use_menu);
putstr(win, 0, ""); help_out(win, "", use_menu);
putstr(win, 0, "(Suppress this message with !cmdassist in config file.)"); help_out(win, "(Suppress this message with !cmdassist in config file.)", use_menu);
display_nhwindow(win, FALSE); if (use_menu) {
if (msg) Sprintf(buf, "cmdassist: %s", msg);
else buf[0] = '\0';
end_menu(win, buf);
(void) select_menu(win, PICK_NONE, &selected);
} else {
display_nhwindow(win, FALSE);
}
destroy_nhwindow(win); destroy_nhwindow(win);
return TRUE; return TRUE;
} }