fix typos
This commit is contained in:
+1
-1
@@ -96,7 +96,7 @@ aren't familiar, talk to your local X11 guru and read the man pages.
|
||||
|
||||
nethack.sh automatically adds HACKDIR to your font search path. If
|
||||
you (assuming you are a system administrator) can install the fonts in your
|
||||
standard X11 font directory the relevent lines in nethack.sh can be removed.
|
||||
standard X11 font directory the relevant lines in nethack.sh can be removed.
|
||||
Alternatively, all persons playing nethack must add that "xset fp+"
|
||||
command to their .xinitrc file, or whatever file they execute when starting
|
||||
X11. See the note below for the alternative installation procedure
|
||||
|
||||
+2
-2
@@ -68,7 +68,7 @@ NetHack*rip*foreground: black
|
||||
! questions is _not_ used. Single-character prompts appear in a fixed
|
||||
! position between the top of the map and the bottom of the messages.
|
||||
! If False, popups appear near where the pointer is positioned so tend to
|
||||
! meander around the screen depending upon where the last click ocurred.
|
||||
! meander around the screen depending upon where the last click occurred.
|
||||
! (The name 'slow' is misleading; this feature was originally necessitated
|
||||
! by window managers which were slow putting up popup windows, but the
|
||||
! fixed-position prompting can be just as useful for quick popups.)
|
||||
@@ -89,7 +89,7 @@ NetHack*highlight_prompt: False
|
||||
! The number of lines the message window will show without scrolling.
|
||||
!NetHack*message_lines: 12
|
||||
|
||||
! If True, the message window has a line that seperates old and new messages.
|
||||
! If True, the message window has a line that separates old and new messages.
|
||||
!NetHack*message_line: True
|
||||
|
||||
! If True, the default, use a "fancy" style status area below the map.
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@
|
||||
|
||||
#include "config.h" /* #define for const for non __STDC__ compilers */
|
||||
#include "lint.h" /* for nethack's nhStr() macro */
|
||||
#include "winX.h" /* to make sure protoypes match corresponding functions */
|
||||
#include "winX.h" /* to make sure prototypes match corresponding functions */
|
||||
|
||||
static XtResource resources[] = {
|
||||
#define offset(field) XtOffset(WindowWidget, window.field)
|
||||
|
||||
+3
-3
@@ -44,7 +44,7 @@
|
||||
* + Include nethack's lint.h to get nhStr() macro.
|
||||
* + Use nhStr() on string literals (or macros from <X11/StringDefs.h>
|
||||
* that hide string literals) to cast away implicit 'const' in order
|
||||
* to suppress "warning: assignment discards qualifers from pointer
|
||||
* to suppress "warning: assignment discards qualifiers from pointer
|
||||
* target type" issued by 'gcc -Wwrite-strings' as used by nethack.
|
||||
* (For this file, always the second parameter to XtSetArg().)
|
||||
*
|
||||
@@ -82,7 +82,7 @@
|
||||
#undef X11_BUILD
|
||||
|
||||
#include "lint.h" /* for nethack's nhStr() macro */
|
||||
#include "winX.h" /* to make sure protoypes match corresponding functions */
|
||||
#include "winX.h" /* to make sure prototypes match corresponding functions */
|
||||
|
||||
/* ":" added to both translations below to allow limited redefining of
|
||||
* keysyms before testing for keysym values -- dlc */
|
||||
@@ -257,7 +257,7 @@ GetDialogResponse(Widget w)
|
||||
return XtNewString(s);
|
||||
}
|
||||
|
||||
/* set the default reponse */
|
||||
/* set the default response */
|
||||
void
|
||||
SetDialogResponse(Widget w, String s, unsigned ln)
|
||||
{
|
||||
|
||||
+1
-1
@@ -3616,7 +3616,7 @@ fd00
|
||||
3800
|
||||
3600
|
||||
ENDCHAR
|
||||
STARTCHAR magic sheild 3
|
||||
STARTCHAR magic shield 3
|
||||
ENCODING 171
|
||||
SWIDTH 666 0
|
||||
DWIDTH 8 0
|
||||
|
||||
+6
-6
@@ -796,7 +796,7 @@ new_resource_macro(
|
||||
++q; /* skip whitespace between name and value */
|
||||
for (p = eos(q); --p > q && (*p == ' ' || *p == '\t'); )
|
||||
continue; /* discard trailing whitespace */
|
||||
*++p = '\0'; /* q..p containes macro value */
|
||||
*++p = '\0'; /* q..p contains macro value */
|
||||
def_rsrc_valu[numdefs] = dupstr(q);
|
||||
return TRUE;
|
||||
}
|
||||
@@ -2120,7 +2120,7 @@ static const char *yn_choices; /* string of acceptable input */
|
||||
static char yn_def;
|
||||
static char yn_return; /* return value */
|
||||
static char yn_esc_map; /* ESC maps to this char. */
|
||||
static Widget yn_popup; /* popup for the yn fuction (created once) */
|
||||
static Widget yn_popup; /* popup for the yn function (created once) */
|
||||
static Widget yn_label; /* label for yn function (created once) */
|
||||
static boolean yn_getting_num; /* TRUE if accepting digits */
|
||||
static boolean yn_preserve_case; /* default is to force yn to lower case */
|
||||
@@ -2146,7 +2146,7 @@ key_event_to_char(XKeyEvent *key)
|
||||
nbytes = XLookupString(key, keystring, MAX_KEY_STRING, (KeySym *) 0,
|
||||
(XComposeStatus *) 0);
|
||||
|
||||
/* Modifier keys return a zero lengh string when pressed. */
|
||||
/* Modifier keys return a zero length string when pressed. */
|
||||
if (nbytes == 0)
|
||||
return '\0';
|
||||
|
||||
@@ -2547,7 +2547,7 @@ highlight_yn(boolean init)
|
||||
if (!appResources.slow || !appResources.highlight_prompt)
|
||||
return;
|
||||
|
||||
/* first time through, WIN_MAP isn't fully initiialized yet */
|
||||
/* first time through, WIN_MAP isn't fully initialized yet */
|
||||
xmap = ((map_win != WIN_ERR) ? &window_list[map_win]
|
||||
: (WIN_MAP != WIN_ERR) ? &window_list[WIN_MAP] : 0);
|
||||
|
||||
@@ -2679,7 +2679,7 @@ init_standard_windows(void)
|
||||
XtSetValues(status, args, num_args);
|
||||
|
||||
/*
|
||||
* Realize the popup so that the status widget knows it's size.
|
||||
* Realize the popup so that the status widget knows its size.
|
||||
*
|
||||
* If we unset MappedWhenManaged then the DECwindow driver doesn't
|
||||
* attach the nethack toplevel to the highest virtual root window.
|
||||
@@ -2810,7 +2810,7 @@ void
|
||||
find_scrollbars(
|
||||
Widget w, /* widget of interest; scroll bars are probably attached
|
||||
to its parent or grandparent */
|
||||
Widget last_w, /* if non-zero, don't search ancestory beyond this point */
|
||||
Widget last_w, /* if non-zero, don't search ancestry beyond this point */
|
||||
Widget *horiz, /* output: horizontal scrollbar */
|
||||
Widget *vert) /* output: vertical scrollbar */
|
||||
{
|
||||
|
||||
+4
-4
@@ -706,7 +706,7 @@ check_cursor_visibility(struct xwindow *wp)
|
||||
/* All values are relative to currently visible area */
|
||||
|
||||
#define V_BORDER 0.25 /* if this far from vert edge, shift */
|
||||
#define H_BORDER 0.25 /* if this from from horiz edge, shift */
|
||||
#define H_BORDER 0.25 /* if this far from horiz edge, shift */
|
||||
|
||||
#define H_DELTA 0.25 /* distance of horiz shift */
|
||||
#define V_DELTA 0.25 /* distance of vert shift */
|
||||
@@ -857,7 +857,7 @@ map_check_size_change(struct xwindow *wp)
|
||||
if (new_width < map_info->viewport_width
|
||||
|| new_height < map_info->viewport_height) {
|
||||
/* [ALI] If the viewport was larger than the map (and so the map
|
||||
* widget was contrained to be larger than the actual map) then we
|
||||
* widget was constrained to be larger than the actual map) then we
|
||||
* may be able to shrink the map widget as the viewport shrinks.
|
||||
*/
|
||||
if (map_info->is_tile) {
|
||||
@@ -890,7 +890,7 @@ map_check_size_change(struct xwindow *wp)
|
||||
|
||||
/*
|
||||
* Fill in parameters "regular" and "inverse" with newly created GCs.
|
||||
* Using the given background pixel and the foreground pixel optained
|
||||
* Using the given background pixel and the foreground pixel obtained
|
||||
* by querying the widget with the resource name.
|
||||
*/
|
||||
static void
|
||||
@@ -1089,7 +1089,7 @@ clear_map_window(struct xwindow *wp)
|
||||
}
|
||||
|
||||
/*
|
||||
* Retreive the font associated with the map window and save attributes
|
||||
* Retrieve the font associated with the map window and save attributes
|
||||
* that are used when updating it.
|
||||
*/
|
||||
static void
|
||||
|
||||
+3
-3
@@ -648,7 +648,7 @@ menu_scrollmask(struct xwindow *wp)
|
||||
return scrlmask;
|
||||
}
|
||||
|
||||
/* if a menu is scrolled vertically and/horizontallty, return it to the top
|
||||
/* if a menu is scrolled vertically and/horizontally, return it to the top
|
||||
and far left */
|
||||
static void
|
||||
menu_unscroll(struct xwindow *wp)
|
||||
@@ -715,7 +715,7 @@ x11_scroll_perminv(int arg UNUSED) /* arg is always 1 */
|
||||
* We accept some extra characters that menus usually ignore:
|
||||
* ^C will be treated like <escape>, leaving menu positioned as-is
|
||||
* and returning to play; <delete> or <backspace> will be treated
|
||||
* like <return> and <space>, reseting the menu to its top and
|
||||
* like <return> and <space>, resetting the menu to its top and
|
||||
* returning to play; other characters will either be rejected by
|
||||
* yn_function or stay here for scrolling.
|
||||
*/
|
||||
@@ -779,7 +779,7 @@ X11_start_menu(winid window, unsigned long mbehavior UNUSED)
|
||||
wp = &window_list[window];
|
||||
|
||||
if (wp->menu_information->is_menu) {
|
||||
/* make sure we'ere starting with a clean slate */
|
||||
/* make sure we're starting with a clean slate */
|
||||
free_menu(&wp->menu_information->new_menu);
|
||||
} else {
|
||||
wp->menu_information->is_menu = TRUE;
|
||||
|
||||
+4
-4
@@ -383,7 +383,7 @@ split(char *s,
|
||||
}
|
||||
|
||||
/*
|
||||
* Add a line of text to the window. The first line in the curcular list
|
||||
* Add a line of text to the window. The first line in the circular list
|
||||
* becomes the last. So all we have to do is copy the new line over the
|
||||
* old one. If the line buffer is too small, then allocate a new, larger
|
||||
* one.
|
||||
@@ -410,7 +410,7 @@ add_line(struct mesg_info_t *mesg_info, const char *s)
|
||||
}
|
||||
|
||||
/*
|
||||
* Save a position in the text buffer so we can draw a line to seperate
|
||||
* Save a position in the text buffer so we can draw a line to separate
|
||||
* text from the last time this function was called.
|
||||
*
|
||||
* Save the head position, since it is the line "after" the last displayed
|
||||
@@ -455,7 +455,7 @@ redraw_message_window(struct xwindow *wp)
|
||||
* Do this the cheap and easy way. Clear the window and just redraw
|
||||
* the whole thing.
|
||||
*
|
||||
* This could be done more effecently with one call to XDrawText() instead
|
||||
* This could be done more efficiently with one call to XDrawText() instead
|
||||
* of many calls to XDrawString(). Maybe later.
|
||||
*
|
||||
* Only need to clear if window has new text.
|
||||
@@ -567,7 +567,7 @@ get_gc(Widget w, struct mesg_info_t *mesg_info)
|
||||
|
||||
/*
|
||||
* Handle resizes on a message window. Correct saved pixel height and width.
|
||||
* Adjust circle buffer to accomidate the new size.
|
||||
* Adjust circle buffer to accommodate the new size.
|
||||
*
|
||||
* Problem: If the resize decreases the width of the window such that
|
||||
* some lines are now longer than the window, they will be cut off by
|
||||
|
||||
+2
-2
@@ -1704,7 +1704,7 @@ ec_scroll_to_view(int ec_indx) /* might be greater than extended_cmd_selected */
|
||||
* If the extended command menu needs to be scrolled in order to move
|
||||
* either the highlighted entry (extended_cmd_selected) or the target
|
||||
* entry (ec_indx) into view, we want to make both end up visible.
|
||||
* [Highligthed one is the first matching entry when the user types
|
||||
* [Highlighted one is the first matching entry when the user types
|
||||
* something, such as "adjust" after typing 'a', and will be chosen
|
||||
* by pressing <return>. Target entry is one past the last matching
|
||||
* entry (or last matching entry itself if at end of command list),
|
||||
@@ -1886,7 +1886,7 @@ ec_key(Widget w, XEvent *event, String *params, Cardinal *num_params)
|
||||
swap_fg_bg(extended_commands[extended_cmd_selected]);
|
||||
}
|
||||
/* advance to one past last matching entry, so that all
|
||||
ambiguous choices, plus one to show thare aren't any
|
||||
ambiguous choices, plus one to show there aren't any
|
||||
more such, will scroll into view */
|
||||
do {
|
||||
if (!command_list[i + 1])
|
||||
|
||||
+1
-1
@@ -78,7 +78,7 @@ delete_text(Widget w, XEvent *event, String *params, Cardinal *num_params)
|
||||
}
|
||||
|
||||
/*
|
||||
* Callback used for all text windows. The window is poped down on any key
|
||||
* Callback used for all text windows. The window is popped down on any key
|
||||
* or button down event. It is destroyed if the main nethack code is done
|
||||
* with it.
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user