*/
#define FLG_ALL 0
#define FLG_COLLECTING 1
-#define FLG_UNIDENTIFIED 2
-#define FLG_IDENTIFIED 3
-#define FLG_STAR_IDENTIFIED 4
-#define FLG_BOOSTED 5
-#define FLG_MORE_THAN 6
-#define FLG_DICE 7
-#define FLG_MORE_BONUS 8
-#define FLG_MORE_BONUS2 9
-#define FLG_WORTHLESS 10
-#define FLG_ARTIFACT 11
-#define FLG_EGO 12
-#define FLG_NAMELESS 13
-#define FLG_UNAWARE 14
+#define FLG_UNAWARE 2
+#define FLG_UNIDENTIFIED 3
+#define FLG_IDENTIFIED 4
+#define FLG_STAR_IDENTIFIED 5
+#define FLG_BOOSTED 6
+#define FLG_MORE_THAN 7
+#define FLG_DICE 8
+#define FLG_MORE_BONUS 9
+#define FLG_MORE_BONUS2 10
+#define FLG_WORTHLESS 11
+#define FLG_ARTIFACT 12
+#define FLG_EGO 13
+#define FLG_NAMELESS 14
#define FLG_WANTED 15
#define FLG_UNIQUE 16
#define FLG_HUMAN 17
#define MAX_YANK MAX_LINELEN
+#define MARK_MARK 0x01
+#define MARK_BY_SHIFT 0x02
+
/*
* Struct for yank buffer
*/
int old_cy;
int old_upper, old_left;
int mx, my;
- bool mark;
+ byte mark;
+
object_type *search_o_ptr;
cptr search_str;
cptr last_destroyed;
+
chain_str_type *yank;
bool yank_eol;
+
cptr *lines_list;
+
byte dirty_flags;
int dirty_line;
int filename_mode;
{
/* Add? or Remove? */
if (!IS_FLG(flg)) add = TRUE;
- else add = TRUE;
+ else add = FALSE;
/* No more change */
fixed = TRUE;
}
- /* Remove all noun flag */
+ /* You can use only one noun flag */
if (FLG_NOUN_BEGIN <= flg && flg <= FLG_NOUN_END)
{
int i;
REM_FLG(i);
}
+ /* You can use only one identify state flag */
+ else if (FLG_UNAWARE <= flg && flg <= FLG_STAR_IDENTIFIED)
+ {
+ int i;
+ for (i = FLG_UNAWARE; i <= FLG_STAR_IDENTIFIED; i++)
+ REM_FLG(i);
+ }
+
+ /* You can use only one flag in artifact/ego/nameless */
+ else if (FLG_ARTIFACT <= flg && flg <= FLG_NAMELESS)
+ {
+ int i;
+ for (i = FLG_ARTIFACT; i <= FLG_NAMELESS; i++)
+ REM_FLG(i);
+ }
+
if (add) ADD_FLG(flg);
else REM_FLG(flg);
tb->lines_list[y] = autopick_line_from_entry_kill(entry);
/* Now dirty */
- tb->dirty_flags = DIRTY_ALL;
+ tb->dirty_flags |= DIRTY_ALL;
}
}
/*
- * Editor commands
+ * Editor command id's
*/
#define EC_QUIT 1
#define EC_REVERT 2
#define EC_CL_LEAVE 34
#define EC_CL_QUERY 35
#define EC_CL_NO_DISP 36
-#define EC_IK_UNAWARE 37
-#define EC_IK_UNIDENTIFIED 38
-#define EC_IK_IDENTIFIED 39
-#define EC_IK_STAR_IDENTIFIED 40
-#define EC_KK_WEAPONS 41
-#define EC_KK_FAVORITE 42
-#define EC_KK_ARMORS 43
-#define EC_KK_MISSILES 44
-#define EC_KK_DEVICES 45
-#define EC_KK_LIGHTS 46
-#define EC_KK_JUNKS 47
-#define EC_KK_SPELLBOOKS 48
-#define EC_KK_SHIELDS 49
-#define EC_KK_BOWS 50
-#define EC_KK_RINGS 51
-#define EC_KK_AMULETS 52
-#define EC_KK_SUITS 53
-#define EC_KK_CLOAKS 54
-#define EC_KK_HELMS 55
-#define EC_KK_GLOVES 56
-#define EC_KK_BOOTS 57
-#define EC_OK_COLLECTING 58
-#define EC_OK_BOOSTED 59
-#define EC_OK_MORE_THAN 60
-#define EC_OK_MORE_BONUS 61
-#define EC_OK_WORTHLESS 62
-#define EC_OK_ARTIFACT 63
-#define EC_OK_EGO 64
-#define EC_OK_NAMELESS 65
-#define EC_OK_WANTED 66
-#define EC_OK_UNIQUE 67
-#define EC_OK_HUMAN 68
-#define EC_OK_UNREADABLE 69
-#define EC_OK_REALM1 70
-#define EC_OK_REALM2 71
-#define EC_OK_FIRST 72
-#define EC_OK_SECOND 73
-#define EC_OK_THIRD 74
-#define EC_OK_FOURTH 75
+#define EC_OK_COLLECTING 37
+#define EC_IK_UNAWARE 38
+#define EC_IK_UNIDENTIFIED 39
+#define EC_IK_IDENTIFIED 40
+#define EC_IK_STAR_IDENTIFIED 41
+#define EC_OK_BOOSTED 42
+#define EC_OK_MORE_THAN 43
+#define EC_OK_MORE_BONUS 44
+#define EC_OK_WORTHLESS 45
+#define EC_OK_ARTIFACT 46
+#define EC_OK_EGO 47
+#define EC_OK_NAMELESS 48
+#define EC_OK_WANTED 49
+#define EC_OK_UNIQUE 50
+#define EC_OK_HUMAN 51
+#define EC_OK_UNREADABLE 52
+#define EC_OK_REALM1 53
+#define EC_OK_REALM2 54
+#define EC_OK_FIRST 55
+#define EC_OK_SECOND 56
+#define EC_OK_THIRD 57
+#define EC_OK_FOURTH 58
+#define EC_KK_WEAPONS 59
+#define EC_KK_FAVORITE 60
+#define EC_KK_ARMORS 61
+#define EC_KK_MISSILES 62
+#define EC_KK_DEVICES 63
+#define EC_KK_LIGHTS 64
+#define EC_KK_JUNKS 65
+#define EC_KK_SPELLBOOKS 66
+#define EC_KK_SHIELDS 67
+#define EC_KK_BOWS 68
+#define EC_KK_RINGS 69
+#define EC_KK_AMULETS 70
+#define EC_KK_SUITS 71
+#define EC_KK_CLOAKS 72
+#define EC_KK_HELMS 73
+#define EC_KK_GLOVES 74
+#define EC_KK_BOOTS 75
+
+
+/* Manu names */
+#ifdef JP
+
+#define MN_QUIT "¥»¡¼¥Ö¤·¤Æ½ªÎ»"
+#define MN_REVERT "Á´¤Æ¤ÎÊѹ¹¤òÇË´þ"
+#define MN_HELP "¥Ø¥ë¥×"
+
+#define MN_MOVE "¥«¡¼¥½¥ë°ÜÆ°"
+#define MN_LEFT "º¸"
+#define MN_DOWN "²¼"
+#define MN_UP "¾å"
+#define MN_RIGHT "±¦"
+#define MN_BOL "¹Ô¤ÎÀèƬ"
+#define MN_EOL "¹Ô¤Î½ªÃ¼"
+#define MN_PGUP "¾å¤Î¥Ú¡¼¥¸"
+#define MN_PGDOWN "²¼¤Î¥Ú¡¼¥¸"
+#define MN_TOP "1¹ÔÌܤذÜÆ°"
+#define MN_BOTTOM "ºÇ²¼¹Ô¤Ø°ÜÆ°"
+
+#define MN_EDIT "ÊÔ½¸"
+#define MN_CUT "ÁªÂòÈϰϤò¥«¥Ã¥È"
+#define MN_COPY "ÁªÂòÈϰϤò¥³¥Ô¡¼"
+#define MN_PASTE "¥Ú¡¼¥¹¥È"
+#define MN_BLOCK "ÁªÂòÈϰϤλØÄê"
+#define MN_KILL_LINE "¹Ô¤Î»Ä¤ê¤òºï½ü"
+#define MN_DELETE_CHAR "1ʸ»úºï½ü"
+#define MN_BACKSPACE "¥Ð¥Ã¥¯¥¹¥Ú¡¼¥¹"
+#define MN_RETURN "²þ¹Ô"
+#define MN_RETURN "²þ¹Ô"
+
+#define MN_SEARCH "¸¡º÷"
+#define MN_SEARCH_STR "ʸ»úÎó¤Ç¸¡º÷"
+#define MN_SEARCH_FORW "Á°Êý¤ØºÆ¸¡º÷"
+#define MN_SEARCH_BACK "¸åÊý¤ØºÆ¸¡º÷"
+#define MN_SEARCH_OBJ "¥¢¥¤¥Æ¥à¤òÁªÂò¤·¤Æ¸¡º÷"
+#define MN_SEARCH_DESTROYED "¼«Æ°Ç˲õ¤µ¤ì¤¿¥¢¥¤¥Æ¥à¤Ç¸¡º÷"
+
+#define MN_INSERT "¿§¡¹ÁÞÆþ"
+#define MN_INSERT_OBJECT "ÁªÂò¤·¤¿¥¢¥¤¥Æ¥à¤Î̾Á°¤òÁÞÆþ"
+#define MN_INSERT_DESTROYED "¼«Æ°Ç˲õ¤µ¤ì¤¿¥¢¥¤¥Æ¥à¤Î̾Á°¤òÁÞÆþ"
+#define MN_INSERT_BLOCK "¾ò·ïʬ´ô¥Ö¥í¥Ã¥¯¤ÎÎã¤òÁÞÆþ"
+#define MN_INSERT_MACRO "¥Þ¥¯¥íÄêµÁ¤òÁÞÆþ"
+#define MN_INSERT_KEYMAP "¥¡¼¥Þ¥Ã¥×ÄêµÁ¤òÁÞÆþ"
+
+#define MN_COMMAND_LETTER "½¦¤¤/Ç˲õ/ÊüÃÖ¤ÎÁªÂò"
+#define MN_CL_AUTOPICK "¡Ö ¡× (¼«Æ°½¦¤¤)"
+#define MN_CL_DESTROY "¡Ö!¡× (¼«Æ°Ç˲õ)"
+#define MN_CL_LEAVE "¡Ö~¡× (ÊüÃÖ)"
+#define MN_CL_QUERY "¡Ö;¡× (³Îǧ¤·¤Æ½¦¤¦)"
+#define MN_CL_NO_DISP "¡Ö(¡× (¥Þ¥Ã¥×¥³¥Þ¥ó¥É¤Çɽ¼¨¤·¤Ê¤¤)"
+
+#define MN_ADJECTIVE_GEN "·ÁÍÆ»ì(°ìÈÌ)¤ÎÁªÂò"
+
+#define MN_ADJECTIVE_SPECIAL "·ÁÍÆ»ì(Æüì)¤ÎÁªÂò"
+#define MN_BOOSTED "¥À¥¤¥¹Ìܤΰ㤦 (Éð´ï)"
+#define MN_MORE_THAN "¥À¥¤¥¹ÌÜ # °Ê¾å¤Î (Éð´ï)"
+#define MN_MORE_BONUS "½¤ÀµÃÍ # °Ê¾å¤Î (»ØÎØÅù)"
+#define MN_ARTIFACT "¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È (ÁõÈ÷)"
+#define MN_EGO "¥¨¥´ (ÁõÈ÷)"
+#define MN_NAMELESS "̵ÌäΠ(ÁõÈ÷)"
+#define MN_WANTED "¾Þ¶â¼ó¤Î (»àÂÎ)"
+#define MN_UNIQUE "¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤Î (»àÂÎ)"
+#define MN_HUMAN "¿Í´Ö¤Î (»àÂÎ)"
+#define MN_UNREADABLE "Æɤá¤Ê¤¤ (ËâË¡½ñ)"
+#define MN_REALM1 "Âè°ìÎΰè¤Î (ËâË¡½ñ)"
+#define MN_REALM2 "ÂèÆóÎΰè¤Î (ËâË¡½ñ)"
+#define MN_FIRST "1ºýÌܤΠ(ËâË¡½ñ)"
+#define MN_SECOND "2ºýÌܤΠ(ËâË¡½ñ)"
+#define MN_THIRD "3ºýÌܤΠ(ËâË¡½ñ)"
+#define MN_FOURTH "4ºýÌܤΠ(ËâË¡½ñ)"
+
+#define MN_NOUN "̾»ì¤ÎÁªÂò"
+
+#else
+
+#define MN_QUIT "Save & Quit"
+#define MN_REVERT "Revert all changes"
+#define MN_HELP "Help"
+
+#define MN_MOVE "Move cursor"
+#define MN_LEFT "Left"
+#define MN_DOWN "Down"
+#define MN_UP "Up"
+#define MN_RIGHT "Right"
+#define MN_BOL "Beggining of line"
+#define MN_EOL "End of line"
+#define MN_PGUP "Page up"
+#define MN_PGDOWN "Page down"
+#define MN_TOP "Top"
+#define MN_BOTTOM "Bottom"
+
+#define MN_EDIT "Edit"
+#define MN_CUT "Cut"
+#define MN_COPY "Copy"
+#define MN_PASTE "Paste"
+#define MN_BLOCK "Select block"
+#define MN_KILL_LINE "Kill rest of line"
+#define MN_DELETE_CHAR "Delete character"
+#define MN_BACKSPACE "Backspace"
+#define MN_RETURN "Return"
+#define MN_RETURN "Return"
+
+#define MN_SEARCH "Search"
+#define MN_SEARCH_STR "Search by string"
+#define MN_SEARCH_FORW "Search forward"
+#define MN_SEARCH_BACK "Search backward"
+#define MN_SEARCH_OBJ "Search by inventory object"
+#define MN_SEARCH_DESTROYED "Search by destroyed object"
+
+#define MN_INSERT "Insert..."
+#define MN_INSERT_OBJECT "Insert name of choosen object"
+#define MN_INSERT_DESTROYED "Insert name of destroyed object"
+#define MN_INSERT_BLOCK "Insert conditional block"
+#define MN_INSERT_MACRO "Insert a macro definition"
+#define MN_INSERT_KEYMAP "Insert a keymap definition"
+
+#define MN_COMMAND_LETTER "Command letter"
+#define MN_CL_AUTOPICK "' ' (Auto pick)"
+#define MN_CL_DESTROY "'!' (Auto destroy)"
+#define MN_CL_LEAVE "'~' (Leave it on the floor)"
+#define MN_CL_QUERY "';' (Query to pick up)"
+#define MN_CL_NO_DISP "'(' (No display on the large map)"
+
+#define MN_ADJECTIVE_GEN "Adjective (general)"
+
+#define MN_ADJECTIVE_SPECIAL "Adjective (special)"
+#define MN_BOOSTED "dice boosted (weapons)"
+#define MN_MORE_THAN "more than # dice (weapons)"
+#define MN_MORE_BONUS "more bonus than # (rings etc.)"
+#define MN_ARTIFACT "artifact (equipments)"
+#define MN_EGO "ego (equipments)"
+#define MN_NAMELESS "nameless (equipments)"
+#define MN_WANTED "wanted (corpse)"
+#define MN_UNIQUE "unique (corpse)"
+#define MN_HUMAN "human (corpse)"
+#define MN_UNREADABLE "unreadable (spellbooks)"
+#define MN_REALM1 "realm1 (spellbooks)"
+#define MN_REALM2 "realm2 (spellbooks)"
+#define MN_FIRST "first (spellbooks)"
+#define MN_SECOND "second (spellbooks)"
+#define MN_THIRD "third (spellbooks)"
+#define MN_FOURTH "fourth (spellbooks)"
+
+#define MN_NOUN "Keywords (noun)"
+
+#endif
typedef struct {
+ cptr name;
int level;
int key;
int com_id;
command_menu_type menu_data[] =
{
- {0, KTRL('q'), EC_QUIT},
- {0, KTRL('z'), EC_REVERT},
- {0, -1, EC_HELP},
-
- {0, -1, -1},
- {1, KTRL('b'), EC_LEFT},
- {1, KTRL('n'), EC_DOWN},
- {1, KTRL('p'), EC_UP},
- {1, KTRL('f'), EC_RIGHT},
- {1, KTRL('a'), EC_BOL},
- {1, KTRL('e'), EC_EOL},
- {1, KTRL('o'), EC_PGUP},
- {1, KTRL('l'), EC_PGDOWN},
- {1, KTRL('y'), EC_TOP},
- {1, KTRL('u'), EC_BOTTOM},
-
- {0, -1, -1},
- {1, KTRL('x'), EC_CUT},
- {1, KTRL('c'), EC_COPY},
- {1, KTRL('v'), EC_PASTE},
- {1, KTRL('g'), EC_BLOCK},
- {1, KTRL('k'), EC_KILL_LINE},
- {1, KTRL('d'), EC_DELETE_CHAR},
- {1, KTRL('h'), EC_BACKSPACE},
- {1, KTRL('j'), EC_RETURN},
- {1, KTRL('m'), EC_RETURN},
-
- {0, -1, -1},
- {1, KTRL('s'), EC_SEARCH_STR},
- {1, -1, EC_SEARCH_FORW},
- {1, KTRL('r'), EC_SEARCH_BACK},
- {1, -1, EC_SEARCH_OBJ},
- {1, -1, EC_SEARCH_DESTROYED},
-
- {0, -1, -1},
- {1, KTRL('i'), EC_INSERT_OBJECT},
- {1, -1, EC_INSERT_DESTROYED},
- {1, -1, EC_INSERT_BLOCK},
- {1, -1, EC_INSERT_MACRO},
- {1, -1, EC_INSERT_KEYMAP},
-
- {0, -1, -1},
- {1, -1, EC_CL_AUTOPICK},
- {1, -1, EC_CL_DESTROY},
- {1, -1, EC_CL_LEAVE},
- {1, -1, EC_CL_QUERY},
- {1, -1, EC_CL_NO_DISP},
-
- {0, -1, -1},
- {1, -1, EC_IK_UNAWARE},
- {1, -1, EC_IK_UNIDENTIFIED},
- {1, -1, EC_IK_IDENTIFIED},
- {1, -1, EC_IK_STAR_IDENTIFIED},
-
- {0, -1, -1},
- {1, -1, EC_KK_WEAPONS},
- {1, -1, EC_KK_FAVORITE},
- {1, -1, EC_KK_ARMORS},
- {1, -1, EC_KK_MISSILES},
- {1, -1, EC_KK_DEVICES},
- {1, -1, EC_KK_LIGHTS},
- {1, -1, EC_KK_JUNKS},
- {1, -1, EC_KK_SPELLBOOKS},
- {1, -1, EC_KK_SHIELDS},
- {1, -1, EC_KK_BOWS},
- {1, -1, EC_KK_RINGS},
- {1, -1, EC_KK_AMULETS},
- {1, -1, EC_KK_SUITS},
- {1, -1, EC_KK_CLOAKS},
- {1, -1, EC_KK_HELMS},
- {1, -1, EC_KK_GLOVES},
- {1, -1, EC_KK_BOOTS},
-
- {0, -1, -1},
- {1, -1, EC_OK_COLLECTING},
- {1, -1, EC_OK_BOOSTED},
- {1, -1, EC_OK_MORE_THAN},
- {1, -1, EC_OK_MORE_BONUS},
- {1, -1, EC_OK_WORTHLESS},
- {1, -1, EC_OK_ARTIFACT},
- {1, -1, EC_OK_EGO},
- {1, -1, EC_OK_NAMELESS},
- {1, -1, EC_OK_WANTED},
- {1, -1, EC_OK_UNIQUE},
- {1, -1, EC_OK_HUMAN},
- {1, -1, EC_OK_UNREADABLE},
- {1, -1, EC_OK_REALM1},
- {1, -1, EC_OK_REALM2},
- {1, -1, EC_OK_FIRST},
- {1, -1, EC_OK_SECOND},
- {1, -1, EC_OK_THIRD},
- {1, -1, EC_OK_FOURTH},
-
- {-1, -1, 0}
+ {MN_QUIT, 0, KTRL('q'), EC_QUIT},
+ {MN_REVERT, 0, KTRL('z'), EC_REVERT},
+ {MN_HELP, 0, -1, EC_HELP},
+
+ {MN_MOVE, 0, -1, -1},
+ {MN_LEFT, 1, KTRL('b'), EC_LEFT},
+ {MN_DOWN, 1, KTRL('n'), EC_DOWN},
+ {MN_UP, 1, KTRL('p'), EC_UP},
+ {MN_RIGHT, 1, KTRL('f'), EC_RIGHT},
+ {MN_BOL, 1, KTRL('a'), EC_BOL},
+ {MN_EOL, 1, KTRL('e'), EC_EOL},
+ {MN_PGUP, 1, KTRL('o'), EC_PGUP},
+ {MN_PGDOWN, 1, KTRL('l'), EC_PGDOWN},
+ {MN_TOP, 1, KTRL('y'), EC_TOP},
+ {MN_BOTTOM, 1, KTRL('u'), EC_BOTTOM},
+
+ {MN_EDIT, 0, -1, -1},
+ {MN_CUT, 1, KTRL('x'), EC_CUT},
+ {MN_COPY, 1, KTRL('c'), EC_COPY},
+ {MN_PASTE, 1, KTRL('v'), EC_PASTE},
+ {MN_BLOCK, 1, KTRL('g'), EC_BLOCK},
+ {MN_KILL_LINE, 1, KTRL('k'), EC_KILL_LINE},
+ {MN_DELETE_CHAR, 1, KTRL('d'), EC_DELETE_CHAR},
+ {MN_BACKSPACE, 1, KTRL('h'), EC_BACKSPACE},
+ {MN_RETURN, 1, KTRL('j'), EC_RETURN},
+ {MN_RETURN, 1, KTRL('m'), EC_RETURN},
+
+ {MN_SEARCH, 0, -1, -1},
+ {MN_SEARCH_STR, 1, KTRL('s'), EC_SEARCH_STR},
+ {MN_SEARCH_FORW, 1, -1, EC_SEARCH_FORW},
+ {MN_SEARCH_BACK, 1, KTRL('r'), EC_SEARCH_BACK},
+ {MN_SEARCH_OBJ, 1, -1, EC_SEARCH_OBJ},
+ {MN_SEARCH_DESTROYED, 1, -1, EC_SEARCH_DESTROYED},
+
+ {MN_INSERT, 0, -1, -1},
+ {MN_INSERT_OBJECT, 1, KTRL('i'), EC_INSERT_OBJECT},
+ {MN_INSERT_DESTROYED, 1, -1, EC_INSERT_DESTROYED},
+ {MN_INSERT_BLOCK, 1, -1, EC_INSERT_BLOCK},
+ {MN_INSERT_MACRO, 1, -1, EC_INSERT_MACRO},
+ {MN_INSERT_KEYMAP, 1, -1, EC_INSERT_KEYMAP},
+
+ {MN_COMMAND_LETTER, 0, -1, -1},
+ {MN_CL_AUTOPICK, 1, -1, EC_CL_AUTOPICK},
+ {MN_CL_DESTROY, 1, -1, EC_CL_DESTROY},
+ {MN_CL_LEAVE, 1, -1, EC_CL_LEAVE},
+ {MN_CL_QUERY, 1, -1, EC_CL_QUERY},
+ {MN_CL_NO_DISP, 1, -1, EC_CL_NO_DISP},
+
+ {MN_ADJECTIVE_GEN, 0, -1, -1},
+ {KEY_UNAWARE, 1, -1, EC_IK_UNAWARE},
+ {KEY_UNIDENTIFIED, 1, -1, EC_IK_UNIDENTIFIED},
+ {KEY_IDENTIFIED, 1, -1, EC_IK_IDENTIFIED},
+ {KEY_STAR_IDENTIFIED, 1, -1, EC_IK_STAR_IDENTIFIED},
+ {KEY_COLLECTING, 1, -1, EC_OK_COLLECTING},
+ {KEY_WORTHLESS, 1, -1, EC_OK_WORTHLESS},
+
+ {MN_ADJECTIVE_SPECIAL, 0, -1, -1},
+ {MN_BOOSTED, 1, -1, EC_OK_BOOSTED},
+ {MN_MORE_THAN, 1, -1, EC_OK_MORE_THAN},
+ {MN_MORE_BONUS, 1, -1, EC_OK_MORE_BONUS},
+ {MN_ARTIFACT, 1, -1, EC_OK_ARTIFACT},
+ {MN_EGO, 1, -1, EC_OK_EGO},
+ {MN_NAMELESS, 1, -1, EC_OK_NAMELESS},
+ {MN_WANTED, 1, -1, EC_OK_WANTED},
+ {MN_UNIQUE, 1, -1, EC_OK_UNIQUE},
+ {MN_HUMAN, 1, -1, EC_OK_HUMAN},
+ {MN_UNREADABLE, 1, -1, EC_OK_UNREADABLE},
+ {MN_REALM1, 1, -1, EC_OK_REALM1},
+ {MN_REALM2, 1, -1, EC_OK_REALM2},
+ {MN_FIRST, 1, -1, EC_OK_FIRST},
+ {MN_SECOND, 1, -1, EC_OK_SECOND},
+ {MN_THIRD, 1, -1, EC_OK_THIRD},
+ {MN_FOURTH, 1, -1, EC_OK_FOURTH},
+
+ {MN_NOUN, 0, -1, -1},
+ {KEY_WEAPONS, 1, -1, EC_KK_WEAPONS},
+ {KEY_FAVORITE, 1, -1, EC_KK_FAVORITE},
+ {KEY_ARMORS, 1, -1, EC_KK_ARMORS},
+ {KEY_MISSILES, 1, -1, EC_KK_MISSILES},
+ {KEY_DEVICES, 1, -1, EC_KK_DEVICES},
+ {KEY_LIGHTS, 1, -1, EC_KK_LIGHTS},
+ {KEY_JUNKS, 1, -1, EC_KK_JUNKS},
+ {KEY_SPELLBOOKS, 1, -1, EC_KK_SPELLBOOKS},
+ {KEY_SHIELDS, 1, -1, EC_KK_SHIELDS},
+ {KEY_BOWS, 1, -1, EC_KK_BOWS},
+ {KEY_RINGS, 1, -1, EC_KK_RINGS},
+ {KEY_AMULETS, 1, -1, EC_KK_AMULETS},
+ {KEY_SUITS, 1, -1, EC_KK_SUITS},
+ {KEY_CLOAKS, 1, -1, EC_KK_CLOAKS},
+ {KEY_HELMS, 1, -1, EC_KK_HELMS},
+ {KEY_GLOVES, 1, -1, EC_KK_GLOVES},
+ {KEY_BOOTS, 1, -1, EC_KK_BOOTS},
+
+ {NULL, -1, -1, 0}
};
-cptr menu_name[] =
-#ifdef JP
-{
- "¥»¡¼¥Ö¤·¤Æ½ªÎ»",
- "Á´¤Æ¤ÎÊѹ¹¤òÇË´þ",
- "¥Ø¥ë¥×",
-
- "¥«¡¼¥½¥ë°ÜÆ°",
- "º¸",
- "²¼",
- "¾å",
- "±¦",
- "¹Ô¤ÎÀèƬ",
- "¹Ô¤Î½ªÃ¼",
- "¾å¤Î¥Ú¡¼¥¸",
- "²¼¤Î¥Ú¡¼¥¸",
- "1¹ÔÌܤذÜÆ°",
- "ºÇ²¼¹Ô¤Ø°ÜÆ°",
-
- "ÊÔ½¸",
- "ÁªÂòÈϰϤò¥«¥Ã¥È",
- "ÁªÂòÈϰϤò¥³¥Ô¡¼",
- "¥Ú¡¼¥¹¥È",
- "ÁªÂòÈϰϤλØÄê",
- "¹Ô¤Î»Ä¤ê¤òºï½ü",
- "1ʸ»úºï½ü",
- "¥Ð¥Ã¥¯¥¹¥Ú¡¼¥¹",
- "²þ¹Ô",
- "²þ¹Ô",
-
- "¸¡º÷",
- "ʸ»úÎó¤Ç¸¡º÷",
- "Á°Êý¤ØºÆ¸¡º÷",
- "¸åÊý¤ØºÆ¸¡º÷",
- "¥¢¥¤¥Æ¥à¤òÁªÂò¤·¤Æ¸¡º÷",
- "¼«Æ°Ç˲õ¤µ¤ì¤¿¥¢¥¤¥Æ¥à¤Ç¸¡º÷",
-
- "¿§¡¹ÁÞÆþ...",
- "ÁªÂò¤·¤¿¥¢¥¤¥Æ¥à¤Î̾Á°¤òÁÞÆþ",
- "¼«Æ°Ç˲õ¤µ¤ì¤¿¥¢¥¤¥Æ¥à¤Î̾Á°¤òÁÞÆþ",
- "¾ò·ïʬ´ô¥Ö¥í¥Ã¥¯¤ÎÎã¤òÁÞÆþ",
- "¥Þ¥¯¥íÄêµÁ¤òÁÞÆþ",
- "¥¡¼¥Þ¥Ã¥×ÄêµÁ¤òÁÞÆþ",
-
- "½¦¤¤/Ç˲õ/ÊüÃÖ¤ÎÁªÂò",
- "¡Ö ¡× (¼«Æ°½¦¤¤)",
- "¡Ö!¡× (¼«Æ°Ç˲õ)",
- "¡Ö~¡× (ÊüÃÖ)",
- "¡Ö;¡× (³Îǧ¤·¤Æ½¦¤¦)",
- "¡Ö(¡× (¥Þ¥Ã¥×¥³¥Þ¥ó¥É¤Çɽ¼¨¤·¤Ê¤¤)",
-
- "¼±Ê̾õÂÖ¥¡¼¥ï¡¼¥É",
- "̤ȽÌÀ",
- "̤´ÕÄê",
- "´ÕÄêºÑ¤ß",
- "*´ÕÄê*ºÑ¤ß",
-
- "¥¡¼¥ï¡¼¥É (̾»ì)",
- "Éð´ï",
- "ÆÀ°ÕÉð´ï",
- "Ëɶñ",
- "Ìð",
- "ËâË¡¥¢¥¤¥Æ¥à",
- "¸÷¸»",
- "¤¬¤é¤¯¤¿",
- "ËâË¡½ñ",
- "½â",
- "µÝ",
- "»ØÎØ",
- "¥¢¥ß¥å¥ì¥Ã¥È",
- "³»",
- "¥¯¥í¡¼¥¯",
- "³õ",
- "äƼê",
- "·¤",
-
- "¥¡¼¥ï¡¼¥É (·ÁÍÆ»ì)",
- "¼ý½¸Ãæ¤Î",
- "¥À¥¤¥¹Ìܤΰ㤦 (Éð´ï)",
- "¥À¥¤¥¹ÌÜ # °Ê¾å¤Î (Éð´ï)",
- "½¤ÀµÃÍ # °Ê¾å¤Î",
- "̵²ÁÃͤÎ",
- "¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È",
- "¥¨¥´ (ÁõÈ÷)",
- "̵ÌäΠ(ÁõÈ÷)",
- "¾Þ¶â¼ó¤Î",
- "¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤Î",
- "¿Í´Ö¤Î",
- "Æɤá¤Ê¤¤ (ËâË¡½ñ)",
- "Âè°ìÎΰè¤Î (ËâË¡½ñ)",
- "ÂèÆóÎΰè¤Î (ËâË¡½ñ)",
- "1ºýÌܤΠ(ËâË¡½ñ)",
- "2ºýÌܤΠ(ËâË¡½ñ)",
- "3ºýÌܤΠ(ËâË¡½ñ)",
- "4ºýÌܤΠ(ËâË¡½ñ)",
-};
-#else
-{
- "Save & Quit",
- "Revert all changes",
- "Help",
-
- "Move cursor",
- "Left",
- "Down",
- "Up",
- "Right",
- "Beggining of line",
- "End of line",
- "Page up",
- "Page down",
- "Top",
- "Bottom",
-
- "Edit",
- "Cut",
- "Copy",
- "Paste",
- "Select block",
- "Kill rest of line",
- "Delete character",
- "Backspace",
- "Return",
- "Return",
-
- "Search",
- "Search by string",
- "Search forward",
- "Search backward",
- "Search by inventory object",
- "Search by destroyed object",
-
- "Insert...",
- "Insert name of choosen object",
- "Insert name of destroyed object",
- "Insert conditional block",
- "Insert a macro definition",
- "Insert a keymap definition",
-
- "Command letter",
- "' ' (Auto pick)",
- "'!' (Auto destroy)",
- "'~' (Leave it on the floor)",
- "';' (Query to pick up)",
- "'(' (No display on the large map)",
-
- "Identify states",
- "unaware",
- "unidentified",
- "identified",
- "*identified*",
-
- "Keywords (noun)",
- "weapons",
- "favorite",
- "armors",
- "missiles",
- "devices",
- "lights",
- "junks",
- "spellbooks",
- "shields",
- "bows",
- "rings",
- "amulets",
- "suits",
- "cloaks",
- "helms",
- "gloves",
- "boots",
-
- "Keywords (adjective)",
- "collecting",
- "dice boosted (weapons)",
- "more than # dice (weapons)",
- "more bonus than #",
- "worthless",
- "artifact",
- "ego (equipments)",
- "nameless (equipments)",
- "wanted",
- "unique",
- "human",
- "unreadable (spellbooks)",
- "realm1 (spellbooks)",
- "realm2 (spellbooks)",
- "first (spellbooks)",
- "second (spellbooks)",
- "third (spellbooks)",
- "fourth (spellbooks)",
-};
-
-#endif
-
/*
* Find a command by 'key'.
*/
{
int i;
- for (i = 0; menu_name[i]; i++)
+ for (i = 0; menu_data[i].name; i++)
{
if (menu_data[i].key == key)
{
int i;
int max_len = 0;
int max_menu_wid;
- int col0 = 5 + level*4;
- int row0 = 1 + level*2;
+ int col0 = 5 + level*7;
+ int row0 = 1 + level*3;
byte menu_key = 0;
int menu_id_list[26];
bool redraw = TRUE;
/* Ignore lower level sub menus */
if (menu_data[i].level > level) continue;
- len = strlen(menu_name[i]);
+ len = strlen(menu_data[i].name);
if (len > max_len) max_len = len;
menu_id_list[menu_key] = i;
com_key_str[0] = '\0';
}
- str = format("| %c) %-*s %2s | ", menu_key + 'a', max_len, menu_name[i], com_key_str);
+ str = format("| %c) %-*s %2s | ", menu_key + 'a', max_len, menu_data[i].name, com_key_str);
Term_putstr(col0, row1++, -1, TERM_WHITE, str);
/* The menu was shown */
redraw = FALSE;
}
+#ifdef JP
prt(format("(a-%c) ¥³¥Þ¥ó¥É:", menu_key + 'a' - 1), 0, 0);
+#else
+ prt(format("(a-%c) Command:", menu_key + 'a' - 1), 0, 0);
+#endif
key = inkey();
if (key == ESCAPE) return 0;
if (com_id == -1)
{
com_id = do_command_menu(level + 1, menu_id + 1);
+
if (com_id) return com_id;
else redraw = TRUE;
}
/*
* Kill text in the block selection
*/
-static bool kill_text_in_selection(text_body_type *tb, bool force)
+static bool kill_text_in_selection(text_body_type *tb)
{
int by1, bx1, by2, bx2;
int y;
- if (!force && tb->mark == -1)
- {
- /* Don't kill auto selection block (by paste) */
- tb->mark = 0;
-
- /* Now dirty */
- tb->dirty_flags |= DIRTY_ALL;
-
- return FALSE;
- }
-
/* Correct cursor location */
if ((uint)tb->cx > strlen(tb->lines_list[tb->cy]))
tb->cx = (int)strlen(tb->lines_list[tb->cy]);
case EC_HELP:
/* Peruse the main help file */
#ifdef JP
- (void)show_file(TRUE, "jhelp.hlp", NULL, 0, 0);
+ (void)show_file(TRUE, "jeditor.txt", NULL, 0, 0);
#else
- (void)show_file(TRUE, "help.hlp", NULL, 0, 0);
+ (void)show_file(TRUE, "editor.txt", NULL, 0, 0);
#endif
/* Redraw all */
tb->dirty_flags |= DIRTY_SCREEN;
* If there is a selection, kill it, and replace it
* with return code.
*/
- if (tb->mark) kill_text_in_selection(tb, FALSE);
+ if (tb->mark) kill_text_in_selection(tb);
insert_return_code(tb->lines_list, tb->cx, tb->cy);
tb->cy++;
case EC_CUT:
{
- /* Need block selection */
- if (!tb->mark) break;
-
/* Copy the text first */
do_editor_command(tb, EC_COPY);
/* Kill all */
- kill_text_in_selection(tb, TRUE);
+ kill_text_in_selection(tb);
break;
}
int by1, bx1, by2, bx2;
int y;
- /* Need block selection */
- if (!tb->mark) break;
+ /* Use single line? */
+ if (!tb->mark)
+ {
+ tb->my = tb->cy;
+ tb->mx = 0;
+ if (!tb->lines_list[tb->cy])
+ {
+ /* Select bottom line */
+ tb->cx = strlen(tb->lines_list[tb->cy]);
+ }
+ else
+ {
+ /* Select a single line */
+ tb->cx = 0;
+ tb->cy++;
+ }
+ }
/* Correct cursor location */
if ((uint)tb->cx > strlen(tb->lines_list[tb->cy]))
* If there is a selection, kill text, and
* replace it with the yank text.
*/
- if (tb->mark) kill_text_in_selection(tb, FALSE);
-
- /* Auto select pasted text */
- tb->mark = -1;
- tb->mx = tb->cx;
- tb->my = tb->cy;
+ if (tb->mark) kill_text_in_selection(tb);
/* Paste text */
while (chain)
}
else
{
- tb->mark = 1;
+ tb->mark = MARK_MARK;
/* Repeating this command swaps cursor position */
if (com_id == tb->old_com_id)
/* If there is a selection, kill it */
if (tb->mark)
{
- if (kill_text_in_selection(tb, FALSE)) break;
+ if (kill_text_in_selection(tb)) break;
}
/* Correct cursor location */
/* If there is a selection, kill it */
if (tb->mark)
{
- if (kill_text_in_selection(tb, FALSE)) break;
+ if (kill_text_in_selection(tb)) break;
}
#ifdef JP
/* If there is a selection, kill it */
if (tb->mark)
{
- if (kill_text_in_selection(tb, FALSE)) break;
+ if (kill_text_in_selection(tb)) break;
}
len = strlen(tb->lines_list[tb->cy]);
/* Cursor key macroes to direction command */
- if (strlen(inkey_macro_trigger_string) > 1)
+ if (trig_len > 1)
{
switch (key)
{
break;
}
+ if (com_id)
+ {
+ /*
+ * Un-shifted cursor keys cancells
+ * selection created by shift+cursor.
+ */
+ if (tb->mark & MARK_BY_SHIFT)
+ {
+ tb->mark = 0;
+
+ /* Now dirty */
+ tb->dirty_flags |= DIRTY_ALL;
+ }
+ }
+
/* Mega Hack!!! Start selection with shift + cursor keys */
- if (!com_id)
+ else
{
char buf[1024];
/* Start selection */
if (!tb->mark)
{
- tb->mark = 1;
+ tb->mark = MARK_MARK | MARK_BY_SHIFT;
tb->my = tb->cy;
tb->mx = tb->cx;
/* Need to redraw text */
if (com_id == EC_UP || com_id == EC_DOWN)
{
- /* Now dirty */
+ /* Redraw all text */
tb->dirty_flags |= DIRTY_ALL;
}
+ else
+ {
+ tb->dirty_line = tb->cy;
+ }
}
}
}
{
com_id = do_command_menu(0, 0);
- /* Redraw all */
+ /* Redraw all text later */
tb->dirty_flags |= DIRTY_SCREEN;
}
* If there is a selection, kill text, and
* replace it with a single letter.
*/
- if (tb->mark) kill_text_in_selection(tb, FALSE);
+ if (tb->mark) kill_text_in_selection(tb);
insert_single_letter(tb, key);
OSDN Git Service
