Changeset 698

Timestamp:

02/08/08 08:12:45 (8 months ago)

Author:

takkaria

Message:

Add Nick McConnell?'s mouse button patch. This adds FA-style buttons at the bottom of the screen, but it has a couple of problems related to redraw.

Files:

• trunk/src/Makefile.inc (modified) (1 diff)
• trunk/src/Makefile.src (modified) (1 diff)
• trunk/src/birth.c (modified) (16 diffs)
• trunk/src/button.c (added)
• trunk/src/cave.c (modified) (1 diff)
• trunk/src/cmd0.c (modified) (1 diff)
• trunk/src/cmd3.c (modified) (8 diffs)
• trunk/src/cmd5.c (modified) (1 diff)
• trunk/src/defines.h (modified) (1 diff)
• trunk/src/dungeon.c (modified) (1 diff)
• trunk/src/externs.h (modified) (1 diff)
• trunk/src/game-event.h (modified) (1 diff)
• trunk/src/init2.c (modified) (1 diff)
• trunk/src/obj-ui.c (modified) (10 diffs)
• trunk/src/option.c (modified) (2 diffs)
• trunk/src/option.h (modified) (2 diffs)
• trunk/src/spells2.c (modified) (2 diffs)
• trunk/src/types.h (modified) (1 diff)
• trunk/src/util.c (modified) (6 diffs)
• trunk/src/xtra1.c (modified) (1 diff)
• trunk/src/xtra3.c (modified) (3 diffs)

trunk/src/Makefile.inc

@@ -16 +16 @@
-attack.o: attack.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-birth.o: birth.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
+
+
+
+
-cave.o: cave.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-externs.h object
+object.h externs
-compress.o: compress.c compress.h h-basic.h
-cmd0.o: cmd0.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-externs.h object
+object.h externs
-  ui-menu.h
-cmd1.o: cmd1.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-externs.h object
+object.h externs
-cmd2.o: cmd2.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-externs.h object
+object.h externs
-cmd3.o: cmd3.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-externs.h object
+object.h externs
-cmd4.o: cmd4.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-externs.h object
+object.h externs
-cmd5.o: cmd5.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-externs.h object
+object.h externs
-cmd6.o: cmd6.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-externs.h object
+object.h externs
-cmd-obj.o: cmd-obj.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-death.o: death.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-externs.h object
+object.h externs
-debug.o: debug.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-externs.h object
+object.h externs
-dungeon.o: dungeon.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-effects.o: effects.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-files.o: files.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-externs.h object
+object.h externs
-game-cmd.o: game-cmd.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-game-event.o: game-event.c z-virt.h h-basic.h game-event.h
-generate.o: generate.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-history.o: history.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-init1.o: init1.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-externs.h object
+object.h externs
-init2.o: init2.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-externs.h object
+object.h externs
-  game-event.h game-cmd.h
-load.o: load.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-externs.h object
+object.h externs
-loadsave.o: loadsave.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-  z-blockfile.h z-smap.h
-melee1.o: melee1.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-melee2.o: melee2.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-monster1.o: monster1.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-monster2.o: monster2.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-obj-desc.o: obj-desc.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-obj-info.o: obj-info.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-  cmds.h
-obj-make.o: obj-make.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-obj-ui.o: obj-ui.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-obj-util.o: obj-util.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-option.o: option.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-randart.o: randart.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-  randname.h
-randname.o: randname.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-pathfind.o: pathfind.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-score.o: score.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-externs.h object
+object.h externs
-signals.o: signals.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-save.o: save.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-externs.h object
+object.h externs
-spells1.o: spells1.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-spells2.o: spells2.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-squelch.o: squelch.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-  ui-menu.h
-store.o: store.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-externs.h object
+object.h externs
-tables.o: tables.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+
+
+
+
-trap.o: trap.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-externs.h object
+object.h externs
-ui.o: ui.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-externs.h object
+object.h externs
-ui-event.o: ui-event.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-ui-menu.o: ui-menu.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-util.o: util.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-externs.h object
+object.h externs
-variable.o: variable.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-wiz-spoil.o: wiz-spoil.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-wiz-stats.o: wiz-stats.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-wizard.o: wizard.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-  cmds.h
-x-spell.o: x-spell.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-externs.h object
+object.h externs
-xtra1.o: xtra1.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-externs.h object
+object.h externs
-xtra2.o: xtra2.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-externs.h object
+object.h externs
-xtra3.o: xtra3.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-externs.h object
+object.h externs
-z-file.o: z-file.c z-file.h h-basic.h z-virt.h z-util.h z-form.h
-z-form.o: z-form.c z-form.h h-basic.h z-type.h z-util.h z-virt.h

trunk/src/Makefile.src

@@ -51 +51 @@
-        attack.o \
-        birth.o \
+        button.o \
-        cave.o \
-        compress.o \

trunk/src/birth.c

@@ -1115 +1115 @@
-
-        char ch;
+        ui_event_data ke;
-
-        char buf[80];
@@ -1223 +1224 @@
-                prt(buf, 0, 0);
-
+                /* Buttons */
+                clear_from(Term->hgt - 2);
+                button_kill_all();
+                button_add("[Back]", ESCAPE);
+                button_add("[Done]", '\r');
+                button_add("[Up]", '8');
+                button_add("[Down]", '2');
+                button_add("[Incr]", '6');
+                button_add("[Decr]", '4');
+                redraw_stuff();
+
-                /* Place cursor just after cost of current stat */
-                Term_gotoxy(col + 36, row + stat);
-
-                /* Get key */
-
+
+
-
-                if (ch == KTRL('X')) 
@@ -1274 +1287 @@
-
-
+        /* Kill buttons */
+        button_kill_all();
+        redraw_stuff();
+  
-        /* Done - advance a step*/
-        return +1;
@@ -1301 +1318 @@
-
-        char ch;
+        ui_event_data ke;
-
-        char b1 = '[';
@@ -1548 +1566 @@
-
-                                                /* Check for a keypress */
-in
+any
-                                        }
-                                }
@@ -1598 +1616 @@
-                        /* Display the player */
-                        display_player(0);
+
+                        /* Add buttons */
+                        button_add("[ESC]", ESCAPE);
+                        button_add("[Enter]", '\r');
+                        button_add("[r]", 'r');
+                        if (prev) button_add("[p]", 'p');
+                        clear_from(Term->hgt - 2);
+                        redraw_stuff();
-
-                        /* Prepare a prompt (must squeeze everything in) */
@@ -1608 +1634 @@
-
-                        /* Prompt and get a command */
-
+
+
-
-                        /* Go back to the start of the step, or the previous step */
@@ -1614 +1641 @@
-                        if (ch == ESCAPE) 
-                        {
+                                button_kill('r');
+                                button_kill('p');
-                                if (autoroll) 
-                                        return 0;
@@ -1646 +1675 @@
-                        bell("Illegal auto-roller command!");
-                }
+
+                /* Kill buttons */
+                button_kill(ESCAPE);
+                button_kill('\r');
+                button_kill('r');
+                button_kill('p');
+                redraw_stuff();
-
-                /* Are we done? */
@@ -1682 +1718 @@
-static void player_birth_aux(void)
-{
-char ch
+ui_event_data ke
-        cptr prompt = "['ESC' to step back, 'S' to start over, or any other key to continue]";
-        birth_stages state = BIRTH_QUESTIONS;
@@ -1742 +1778 @@
-                                prt(prompt, Term->hgt - 1, Term->wid / 2 - strlen(prompt) / 2);
-
+                                /* Buttons */
+                                button_kill_all();
+                                button_add("[Continue]", 'q');
+                                button_add("[ESC]", ESCAPE);
+                                button_add("[S]", 'S');
+                                redraw_stuff();
+            
-                                /* Get a key */
-ch = inkey
+ke = inkey_ex
-
-                                /* Start over */
-ch
+ke.key
-                                        state = BIRTH_RESTART;
-
-ch
+ke.key
-                                        quit(NULL);
-
-ch
+ke.key
-                                        state--;
-                                else
-                                        state++;
-
+                                /* Buttons */
+                                button_kill_all();
+                                redraw_stuff();
+            
-                                /* Clear prompt */
-                                clear_from(23);
@@ -1780 +1827 @@
-static bool player_birth_quick(void)
-{
-char ch
+ui_event_data ke
-        int i;
-        birther old_char;
@@ -1874 +1921 @@
-        prt("['CTRL-X' to quit, 'ESC' to start over, or any other key to continue]", 23, 5);
-
+        /* Buttons */
+        button_kill_all();
+        button_add("[Continue]", 'q');
+        button_add("[ESC]", ESCAPE);
+        button_add("[Exit]", KTRL('X'));
+        redraw_stuff();
+            
-        /* Get a key */
-ch = inkey
+ke = inkey_ex
-
-        /* Quit */
-ch
+ke.key
-
-        /* Start over */
-ch
+ke.key
-
-        /* Accept */
@@ -1898 +1952 @@
-{
-        bool quickstart = FALSE;
-char ch
+ui_event_data ke
-
-        /*
@@ -1911 +1965 @@
-
-                        put_str("Quick-start character based on previous one (y/n)? ", 2, 2);
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                                quit(NULL);
-ch == ESCAPE) || strchr("YyNn\r\n", ch
+ke.key == ESCAPE) || strchr("YyNn\r\n", ke.key
-                                break;
-ch
+ke.key
-                                (void)show_file("birth.hlp", NULL, 0, 0);
-                        else
@@ -1924 +1987 @@
-
-                /* Quick generation */
-ch == 'y') || (ch
+ke.key == 'y') || (ke.key
-                {
-                        if (player_birth_quick()) quickstart = TRUE;

trunk/src/cave.c

@@ -1637 +1637 @@
-
-        /* Get any key */
-in
+any
-
-        /* Load screen */

trunk/src/cmd0.c

@@ -390 +390 @@
-
-        /* Wait */
-in
+any
-
-        /* Return */

trunk/src/cmd3.c

@@ -835 +835 @@
-{
-        int i, n, r_idx;
-, query
+
-        char buf[128];
+
+        ui_event_data query;
-
-        bool all = FALSE;
@@ -917 +919 @@
-        }
-
+        /* Buttons */
+        button_add("[y]", 'y');
+        button_add("[k]", 'k');
+        /* Don't collide with the repeat button */
+        button_add("[n]", 'q'); 
+        redraw_stuff();
-
-        /* Prompt */
@@ -922 +930 @@
-
-        /* Query */
-
+_ex
-
-        /* Restore */
-        prt(buf, 0, 0);
-
+        /* Buttons */
+        button_kill('y');
+        button_kill('k');
+        button_kill('q');
+        redraw_stuff();
+
-        /* Interpret the response */
-
+.key
-        {
-                /* Sort by kills (and level) */
-                why = 4;
-        }
- == 'y' || quer
+.key == 'y' || query.ke
-        {
-                /* Sort by level; accept 'p' as legacy */
@@ -958 +972 @@
-        /* Start at the end */
-        i = n - 1;
+
+        /* Button */
+        button_add("[r]", 'r');
+        button_add("[-]", '-');
+        button_add("[+]", '+');
+        redraw_stuff();
-
-        /* Scan the monster memory */
@@ -994 +1014 @@
-
-                        /* Command */
-
+_ex
-
-                        /* Unrecall */
@@ -1004 +1024 @@
-
-                        /* Normal commands */
-
+.key
-
-                        /* Toggle recall */
@@ -1011 +1031 @@
-
-                /* Stop scanning */
-
+.key
-
-                /* Move to "prev" monster */
-
+.key
-                {
-                        if (++i == n)
@@ -1028 +1048 @@
-        }
-
+        /* Button */
+        button_kill('r');
+        button_kill('-');
+        button_kill('+');
+        redraw_stuff();
-
-        /* Re-display the identity */

trunk/src/cmd5.c

@@ -482 +482 @@
-
-        /* Wait for input */
-in
+any
-
-        /* Load screen */

trunk/src/defines.h

@@ -1628 +1628 @@
-#define PR_OBJECT               0x00800000L /* Display object recall */
-#define PR_MONLIST              0x01000000L /* Display monster list */
+#define PR_BUTTONS              0x02000000L     /* Display mouse buttons */
-
-/* Display Basic Info */

trunk/src/dungeon.c

@@ -1526 +1526 @@
-        /* Combine / Reorder the pack */
-        p_ptr->notice |= (PN_COMBINE | PN_REORDER);
+
+        /* Make basic mouse buttons */
+        (void) button_add("[ESC]", ESCAPE);
+        (void) button_add("[Ret]", '\r');
+        (void) button_add("[Spc]", ' ');
+        (void) button_add("[Rpt]", 'n');
+        (void) button_add("[Std]", ',');
+
+        /* Redraw buttons */
+        p_ptr->redraw |= (PR_BUTTONS);
-
-        /* Notice stuff */

trunk/src/externs.h

@@ -265 +265 @@
-extern void player_birth(void);
-
+/* button.c */
+int button_add_text(const char *label, unsigned char keypress);
+int button_add(char *label, unsigned char keypress);
+void button_backup_all(void);
+void button_restore(void);
+int button_kill_text(unsigned char keypress);
+int button_kill(unsigned char keypress);
+void button_kill_all(void);
+void button_init(button_add_f add, button_kill_f kill);
+char button_get_key(int x, int y);
+size_t button_print(int row, int col);
+
-/* cave.c */
-extern int distance(int y1, int x1, int y2, int x2);

trunk/src/game-event.h

@@ -25 +25 @@
-        EVENT_STATE,            /* The three 'R's: Resting, Repeating and
-                                   Searching */
+        EVENT_MOUSEBUTTONS,     /* Displayed mouse buttons need changing */
-
-        EVENT_PLAYERMOVED,

trunk/src/init2.c

@@ -1079 +1079 @@
-
-
+        /*** Prepare mouse buttons ***/
+
+        button_init(button_add_text, button_kill_text);
+
+
-        /*** Prepare quest array ***/
-

trunk/src/obj-ui.c

@@ -750 +750 @@
-        int px = p_ptr->px;
-
-char
+ui_event_data
-
-        int j, k;
@@ -981 +981 @@
-
-                        /* Indicate ability to "view" */
-
+
+
+
+
+
-
-                        /* Indicate legality of "toggle" */
-
+
+
+
+
+
-
-                        /* Indicate legality of the "floor" */
-
+
+
+
+
+
-
-                        /* Indicate that squelched items can be selected */
-
+
+
+
+
+
-                }
-
@@ -1014 +1030 @@
-
-                        /* Indicate ability to "view" */
-
+
+
+
+
+
-
-                        /* Indicate legality of "toggle" */
-
+
+
+
+
+
-
-                        /* Indicate legality of the "floor" */
-
+
+
+
+
+
-                }
-
@@ -1043 +1071 @@
-
-                        /* Indicate ability to "view" */
-
+
+
+
+
+
-
-                        /* Append */
-
+
+
+
+
+
-
-                        /* Append */
-
+
+
+
+
+
-
-                        /* Indicate that squelched items can be selected */
-
-
+
+
+
+
+
+
+
+
-
-                /* Finish the prompt */
@@ -1066 +1112 @@
-
-                /* Get a key */
-
+_ex
-
-                /* Parse it */
-
+.key
-                {
-                        case ESCAPE:
@@ -1218 +1264 @@
-                        {
-                                /* Look up the tag */
-
+.key
-                                {
-                                        bell("Illegal object choice (tag)!");
@@ -1331 +1377 @@
-
-                                /* Note verify */
-
+.key
-