X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;ds=sidebyside;f=win%2FX11%2FNetHack.ad;h=755fa58a78efb4511011ca2eb7f3234ac2950cac;hb=096152cd7d9acc1d7efcc0b6fa8028bab1ff3200;hp=f7ec106130846ade30774da6d84a1c4055e01ef2;hpb=d3b604a1ecccab7279648bd8d75569764c126439;p=jnethack%2Fsource.git diff --git a/win/X11/NetHack.ad b/win/X11/NetHack.ad index f7ec106..755fa58 100644 --- a/win/X11/NetHack.ad +++ b/win/X11/NetHack.ad @@ -1,4 +1,4 @@ -! $NHDT-Date: 1524689294 2018/04/25 20:48:14 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.15 $ +! $NHDT-Date: 1542244983 2018/11/15 01:23:03 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.20 $ ! Copyright (c) 2017 by Pasi Kallinen ! NetHack may be freely redistributed. See license for details. @@ -37,7 +37,7 @@ NetHack*text*borderWidth: 0 ! NetHack.tile_file: x11tiles !NetHack.double_tile_size: True -! + ! The annotation of pets. !NetHack.pet_mark_bitmap: pet_mark.xbm !NetHack.pet_mark_color: Red @@ -57,30 +57,25 @@ NetHack.tile_file: x11tiles ! The color to use for the text on the hero's tombstone NetHack*rip*foreground: black -! Translation tables. There are currently several actions in nethack, but -! the only one you should be using is "input()", which, with no parameters, -! uses XLookupString to translate your keypress into a command. You -! can optionally give it parameters to change the behavior, see the example -! below. Note that you have to specify the translations in every appropriate -! window. -NetHack*message*translations: : input() -! -! Example extra translations for the map window. -! -!NetHack*map*translations: #override \ -! !Left: input(h) \n\ -! !Right: input(l) \n\ -! !Up: input(k) \n\ -! !Down: input(j) -! ! The icon to use; supported values are nh72, nh56, and nh32; nh72 is the ! default. Some window managers may not support the larger icon sizes. ! It is not guaranteed that the window manager will honor the icon selection. !NetHack*icon: nh56 -! + ! If True, the default, a popup for single character prompts such as y/n -! questions is _not_ used. -NetHack*slow: True +! 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. +! (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.) +!NetHack*slow: False + +! If True, force keyboard to attach to popup windows. Some window managers +! enforce a click-to-focus-keyboard policy (e.g. the DECwindows wm). NetHack +! has a lot of popups and is almost unplayable without some kind of autofocus. +!NetHack*autofocus: True ! If 'slow' is True, setting 'highlight_prompt' to True will cause the line ! between map and message display that's used for prompting to be "hidden" @@ -91,15 +86,33 @@ 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. !NetHack*message_line: True + +! If True, the default, use a "fancy" style status area below the map. +! Fancy status has some highlighting but does not honor HILITE_STATUS. +! If False, use TTY-style status lines (two text lines below the map). +! TTY status honors HILITE_STATUS thresholds and colors, but for +! attributes only supports inverse (not bold, dim, blink, or underline). +! (As of this writing, fancy status looks better with a tiles map and +! tty-style status looks good with a text map but not with a tiles one.) +!NetHack*fancy_status: False + +! Translation tables. There are currently several actions in nethack, but +! the only one you should be using is "input()", which, with no parameters, +! uses XLookupString to translate your keypress into a command. You can +! optionally give it parameters to change the behavior, see the example below. +! Note that you have to specify the translations in every appropriate window. +NetHack*message*translations: : input() ! -! If True, force keyboard to attach to popup windows. Some window managers -! enforce a click-to-focus-keyboard policy (e.g. the DECwindows wm). NetHack -! has a lot of popups and is almost unplayable without some kind of autofocus. -!NetHack*autofocus: True -! +! Example extra translations for the map window. +!NetHack*map*translations: #override \ +! !Left: input(h) \n\ +! !Right: input(l) \n\ +! !Up: input(k) \n\ +! !Down: input(j) + ! Specify the number of rows and columns of the map window. The default ! is the standard 80x21 window. Note: this _does_not_ change nethack's ! level size, only what you see of it. @@ -170,80 +183,80 @@ NetHack*player_selection_dialog*play.cornerRoundPercent: NETHACK_BTN_ROUND ! role selection window (OPTIONS=player_selection:prompts) -NetHack*player_selection*random.foreground: NETHACK_CLR_RANDOM -NetHack*player_selection*random.background: black -NetHack*player_selection*random.borderColor: NETHACK_CLR_RANDOM -NetHack*player_selection*random.borderWidth: 1 -NetHack*player_selection*random.shapeStyle: NETHACK_BTN_SHAPE -NetHack*player_selection*random.cornerRoundPercent: NETHACK_BTN_ROUND -NetHack*player_selection*quit.foreground: NETHACK_CLR_QUIT -NetHack*player_selection*quit.borderColor: NETHACK_CLR_QUIT -NetHack*player_selection*quit.borderWidth: 1 -NetHack*player_selection*quit.shapeStyle: NETHACK_BTN_SHAPE -NetHack*player_selection*quit.cornerRoundPercent: NETHACK_BTN_ROUND +NetHack*player_selection*btn_random.foreground: NETHACK_CLR_RANDOM +NetHack*player_selection*btn_random.background: black +NetHack*player_selection*btn_random.borderColor: NETHACK_CLR_RANDOM +NetHack*player_selection*btn_random.borderWidth: 1 +NetHack*player_selection*btn_random.shapeStyle: NETHACK_BTN_SHAPE +NetHack*player_selection*btn_random.cornerRoundPercent: NETHACK_BTN_ROUND +NetHack*player_selection*btn_quit.foreground: NETHACK_CLR_QUIT +NetHack*player_selection*btn_quit.borderColor: NETHACK_CLR_QUIT +NetHack*player_selection*btn_quit.borderWidth: 1 +NetHack*player_selection*btn_quit.shapeStyle: NETHACK_BTN_SHAPE +NetHack*player_selection*btn_quit.cornerRoundPercent: NETHACK_BTN_ROUND NetHack*player_selection*Command.foreground: NETHACK_CLR_FG NetHack*player_selection*Command.borderColor: NETHACK_CLR_FG NetHack*player_selection*Command.borderWidth: NETHACK_CMD_BORDER ! race selection window -NetHack*race_selection*random.foreground: NETHACK_CLR_RANDOM -NetHack*race_selection*random.background: black -NetHack*race_selection*random.borderColor: NETHACK_CLR_RANDOM -NetHack*race_selection*random.borderWidth: 1 -NetHack*race_selection*random.shapeStyle: NETHACK_BTN_SHAPE -NetHack*race_selection*random.cornerRoundPercent: NETHACK_BTN_ROUND -NetHack*race_selection*quit.foreground: NETHACK_CLR_QUIT -NetHack*race_selection*quit.borderColor: NETHACK_CLR_QUIT -NetHack*race_selection*quit.borderWidth: 1 -NetHack*race_selection*quit.shapeStyle: NETHACK_BTN_SHAPE -NetHack*race_selection*quit.cornerRoundPercent: NETHACK_BTN_ROUND +NetHack*race_selection*btn_random.foreground: NETHACK_CLR_RANDOM +NetHack*race_selection*btn_random.background: black +NetHack*race_selection*btn_random.borderColor: NETHACK_CLR_RANDOM +NetHack*race_selection*btn_random.borderWidth: 1 +NetHack*race_selection*btn_random.shapeStyle: NETHACK_BTN_SHAPE +NetHack*race_selection*btn_random.cornerRoundPercent: NETHACK_BTN_ROUND +NetHack*race_selection*btn_quit.foreground: NETHACK_CLR_QUIT +NetHack*race_selection*btn_quit.borderColor: NETHACK_CLR_QUIT +NetHack*race_selection*btn_quit.borderWidth: 1 +NetHack*race_selection*btn_quit.shapeStyle: NETHACK_BTN_SHAPE +NetHack*race_selection*btn_quit.cornerRoundPercent: NETHACK_BTN_ROUND NetHack*race_selection*Command.foreground: NETHACK_CLR_FG NetHack*race_selection*Command.borderColor: NETHACK_CLR_FG NetHack*race_selection*Command.borderWidth: NETHACK_CMD_BORDER ! gender selection window -NetHack*gender_selection*random.foreground: NETHACK_CLR_RANDOM -NetHack*gender_selection*random.background: black -NetHack*gender_selection*random.borderColor: NETHACK_CLR_RANDOM -NetHack*gender_selection*random.borderWidth: 1 -NetHack*gender_selection*random.shapeStyle: NETHACK_BTN_SHAPE -NetHack*gender_selection*random.cornerRoundPercent: NETHACK_BTN_ROUND -NetHack*gender_selection*quit.foreground: NETHACK_CLR_QUIT -NetHack*gender_selection*quit.borderColor: NETHACK_CLR_QUIT -NetHack*gender_selection*quit.borderWidth: 1 -NetHack*gender_selection*quit.shapeStyle: NETHACK_BTN_SHAPE -NetHack*gender_selection*quit.cornerRoundPercent: NETHACK_BTN_ROUND +NetHack*gender_selection*btn_random.foreground: NETHACK_CLR_RANDOM +NetHack*gender_selection*btn_random.background: black +NetHack*gender_selection*btn_random.borderColor: NETHACK_CLR_RANDOM +NetHack*gender_selection*btn_random.borderWidth: 1 +NetHack*gender_selection*btn_random.shapeStyle: NETHACK_BTN_SHAPE +NetHack*gender_selection*btn_random.cornerRoundPercent: NETHACK_BTN_ROUND +NetHack*gender_selection*btn_quit.foreground: NETHACK_CLR_QUIT +NetHack*gender_selection*btn_quit.borderColor: NETHACK_CLR_QUIT +NetHack*gender_selection*btn_quit.borderWidth: 1 +NetHack*gender_selection*btn_quit.shapeStyle: NETHACK_BTN_SHAPE +NetHack*gender_selection*btn_quit.cornerRoundPercent: NETHACK_BTN_ROUND NetHack*gender_selection*Command.foreground: NETHACK_CLR_FG NetHack*gender_selection*Command.borderColor: NETHACK_CLR_FG NetHack*gender_selection*Command.borderWidth: NETHACK_CMD_BORDER ! alignment selection window -NetHack*alignment_selection*random.foreground: NETHACK_CLR_RANDOM -NetHack*alignment_selection*random.background: black -NetHack*alignment_selection*random.borderColor: NETHACK_CLR_RANDOM -NetHack*alignment_selection*random.borderWidth: 1 -NetHack*alignment_selection*random.shapeStyle: NETHACK_BTN_SHAPE -NetHack*alignment_selection*random.cornerRoundPercent: NETHACK_BTN_ROUND -NetHack*alignment_selection*quit.foreground: NETHACK_CLR_QUIT -NetHack*alignment_selection*quit.borderColor: NETHACK_CLR_QUIT -NetHack*alignment_selection*quit.borderWidth: 1 -NetHack*alignment_selection*quit.shapeStyle: NETHACK_BTN_SHAPE -NetHack*alignment_selection*quit.cornerRoundPercent: NETHACK_BTN_ROUND +NetHack*alignment_selection*btn_random.foreground: NETHACK_CLR_RANDOM +NetHack*alignment_selection*btn_random.background: black +NetHack*alignment_selection*btn_random.borderColor: NETHACK_CLR_RANDOM +NetHack*alignment_selection*btn_random.borderWidth: 1 +NetHack*alignment_selection*btn_random.shapeStyle: NETHACK_BTN_SHAPE +NetHack*alignment_selection*btn_random.cornerRoundPercent: NETHACK_BTN_ROUND +NetHack*alignment_selection*btn_quit.foreground: NETHACK_CLR_QUIT +NetHack*alignment_selection*btn_quit.borderColor: NETHACK_CLR_QUIT +NetHack*alignment_selection*btn_quit.borderWidth: 1 +NetHack*alignment_selection*btn_quit.shapeStyle: NETHACK_BTN_SHAPE +NetHack*alignment_selection*btn_quit.cornerRoundPercent: NETHACK_BTN_ROUND NetHack*alignment_selection*Command.foreground: NETHACK_CLR_FG NetHack*alignment_selection*Command.borderColor: NETHACK_CLR_FG NetHack*alignment_selection*Command.borderWidth: NETHACK_CMD_BORDER ! extended commands window -NetHack*extended_commands*dismiss.foreground: NETHACK_CLR_QUIT -NetHack*extended_commands*dismiss.borderColor: NETHACK_CLR_QUIT -NetHack*extended_commands*dismiss.borderWidth: 1 -NetHack*extended_commands*dismiss.shapeStyle: NETHACK_BTN_SHAPE -NetHack*extended_commands*dismiss.cornerRoundPercent: NETHACK_BTN_ROUND -NetHack*extended_commands*help.foreground: NETHACK_CLR_HELP -NetHack*extended_commands*help.borderColor: NETHACK_CLR_HELP -NetHack*extended_commands*help.borderWidth: 1 -NetHack*extended_commands*help.shapeStyle: NETHACK_BTN_SHAPE -NetHack*extended_commands*help.cornerRoundPercent: NETHACK_BTN_ROUND +NetHack*extended_commands*btn_dismiss.foreground: NETHACK_CLR_QUIT +NetHack*extended_commands*btn_dismiss.borderColor: NETHACK_CLR_QUIT +NetHack*extended_commands*btn_dismiss.borderWidth: 1 +NetHack*extended_commands*btn_dismiss.shapeStyle: NETHACK_BTN_SHAPE +NetHack*extended_commands*btn_dismiss.cornerRoundPercent: NETHACK_BTN_ROUND +NetHack*extended_commands*btn_help.foreground: NETHACK_CLR_HELP +NetHack*extended_commands*btn_help.borderColor: NETHACK_CLR_HELP +NetHack*extended_commands*btn_help.borderWidth: 1 +NetHack*extended_commands*btn_help.shapeStyle: NETHACK_BTN_SHAPE +NetHack*extended_commands*btn_help.cornerRoundPercent: NETHACK_BTN_ROUND NetHack*extended_commands*Command.foreground: NETHACK_CLR_FG NetHack*extended_commands*Command.borderColor: NETHACK_CLR_FG NetHack*extended_commands*Command.borderWidth: NETHACK_CMD_BORDER @@ -302,13 +315,13 @@ NetHack*map*green: green3 NetHack*map*brown: DarkOrange3 NetHack*map*blue: blue3 NetHack*map*magenta: magenta3 -NetHack*map*cyan: cyan3 +NetHack*map*cyan: Dark cyan NetHack*map*gray: gray50 -NetHack*map*orange: yellow +NetHack*map*orange: orange NetHack*map*bright_green: green NetHack*map*yellow: yellow -NetHack*map*bright_blue: blue -NetHack*map*bright_magenta: magenta +NetHack*map*bright_blue: Royal blue +NetHack*map*bright_magenta: Fuchsia NetHack*map*bright_cyan: cyan NetHack*map*white: white !