Changeset 217

Timestamp:

06/24/07 01:54:38 (2 years ago)

Author:

ajps

Message:

A possibly misplaced attempt to make the options menus internally consistent and reliable and all that other good stuff.

Files:

• trunk/src/cmd4.c (modified) (24 diffs)
• trunk/src/externs.h (modified) (1 diff)
• trunk/src/squelch.c (modified) (11 diffs)

trunk/src/cmd4.c

@@ -210 +210 @@
-                                byte c, byte attr_top, byte char_left);
-
-
+, int row
-
-/*
@@ -2158 +2158 @@
-                case 'T':
-                case '5':
+                case '\n':
+                case '\r':
-                case '\xff':
-                {
@@ -2174 +2176 @@
-}
-
-
+toggle_
-{
-        0,
@@ -2221 +2223 @@
-                cx = menu_select(menu, &cursor_pos, EVT_MOVE);
-
-type == EVT_BACK || cx.
+
-                        break;
-                else if (cx.type == EVT_MOVE)
@@ -2352 +2354 @@
-
-                /* Toggle */
-
+ke.key == '\n') || (ke.key == '\r') || (
-                {
-                        /* Hack -- ignore the main window */
@@ -2575 +2577 @@
- *   Comments are generated automatically
- */
-
+, int row
-{
-        char ftmp[80];
-        char buf[1025];
-        FILE *fff;
-
-        int row = 15;
-
-        /* Prompt */
@@ -3022 +3022 @@
-
-                if (ESCAPE == c.key) break;
+                if (c.key == ARROW_LEFT || c.key == ARROW_RIGHT) continue;
-                evt = macro_actions[cursor].id;
-
@@ -3036 +3037 @@
-                {
-                        /* Dump the macros */
-
+, 15
-
-                        break;
@@ -3138 +3139 @@
-                {
-                        /* Dump the keymaps */
-
+, 15
-                        break;
-                }
@@ -3514 +3515 @@
-                        break;
-
+                if (key.key == ARROW_LEFT || key.key == ARROW_RIGHT)
+                        continue;
+
-                assert(cursor >= 0 && cursor < visual_menu.count);
-
@@ -3528 +3532 @@
-                else if (evt == DUMP_MON)
-                {
-
+, 15
-                }
-
-                else if (evt == DUMP_OBJ)
-                {
-
+, 15
-                }
-
-                else if (evt == DUMP_FEAT)
-                {
-
+, 15
-                }
-
@@ -3544 +3548 @@
-                else if (evt == DUMP_FLAV) 
-                {
-
+, 15
-                }
-
@@ -3686 +3690 @@
-                /* Done */
-                if (key.key == ESCAPE) break;
+
+                if (key.key == ARROW_RIGHT || key.key == ARROW_LEFT) continue;
+
-                evt = color_events[cursor].id;
-
@@ -3708 +3715 @@
-                else if (evt == DUMP_COL)
-                {
-
+, 15
-                }
-
@@ -3903 +3910 @@
-static void do_dump_options(void *unused, const char *title)
-{
-
+, 20
-}
-
@@ -3915 +3922 @@
- * XXX Too many entries.
- */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-};
-
-static menu_type option_menu;
+
+static char tag_opt_main(menu_type *menu, int oid)
+{
+        if (option_actions[oid].id)
+                return option_actions[oid].id;
+
+        return 0;
+}
+
+static int valid_opt_main(menu_type *menu, int oid)
+{
+        if (option_actions[oid].name)
+                return 1;
+
+        return 0;
+}
+
+static void display_opt_main(menu_type *menu, int oid, bool cursor, int row, int col, int width)
+{
+        byte attr = curs_attrs[CURS_KNOWN][(int)cursor];
+
+        if (option_actions[oid].name)
+                c_prt(attr, option_actions[oid].name, row, col);
+}
+
+
+static const menu_iter options_iter =
+{
+        0,
+        tag_opt_main,
+        valid_opt_main,
+        display_opt_main,
+        NULL
+};
-
-
@@ -3954 +3996 @@
-                clear_from(0);
-                c = menu_select(&option_menu, &cursor, 0);
+                if (c.type == EVT_SELECT && option_actions[cursor].action)
+                {
+                        option_actions[cursor].action(option_actions[cursor].data,
+                                                      option_actions[cursor].name);
+                }
-        }
-
@@ -4011 +4058 @@
-void init_cmd4_c(void)
-{
+        /* some useful standard command keys */
+        static const char cmd_keys[] = { ARROW_LEFT, ARROW_RIGHT, '\0' };
+
-        /* Initialize the menus */
-
+                 
-
-        /* options screen selection menu */
@@ -4020 +4070 @@
-        menu->title = "Options Menu";
-        menu->menu_data = option_actions;
+        menu->cmd_keys = cmd_keys;
-        menu->count = N_ELEMENTS(option_actions);
-(menu, MN_SCROLL, MN_ACT
+2(menu, find_menu_skin(MN_SCROLL), &options_iter
-
-        /* Initialize the options toggle menu */
@@ -4027 +4078 @@
-        WIPE(menu, menu_type);
-        menu->prompt = "Set option (y/n/t), '?' for information";
-NnTt";
+\n\rNnTt\x8C"; /* \x8c = ARROW_RIGHT */
-        menu->selections = "abcdefghijklmopqrsuvwxz";
-        menu->count = OPT_PAGE_PER;
-        menu->flags = MN_DBL_TAP;
-
+toggle_
-
-        /* macro menu */
@@ -4038 +4089 @@
-        menu_set_id(menu, MACRO_MENU);
-        menu->title = "Interact with macros";
+        menu->cmd_keys = cmd_keys;
-        menu->selections = default_choice;
-        menu->menu_data = macro_actions;
@@ -4048 +4100 @@
-        menu_set_id(menu, VISUAL_MENU);
-        menu->title = "Interact with visuals";
+        menu->cmd_keys = cmd_keys;
-        menu->selections = default_choice;
-        menu->menu_data = visual_menu_items;
@@ -4058 +4111 @@
-        menu_set_id(menu, COLOR_MENU);
-        menu->title = "Interact with colors";
+        menu->cmd_keys = cmd_keys;
-        menu->selections = default_choice;
-        menu->menu_data = color_events;
@@ -4130 +4184 @@
-        /* Silly message */
-        msg_format("You are playing %s %s.  Type '?' for more info.",
-
+    
-}
-

trunk/src/externs.h

@@ -597 +597 @@
-void squelch_set(object_type *o_ptr);
-void squelch_items(void);
-
+ *, cptr
-
-/* store.c */

trunk/src/squelch.c

@@ -363 +363 @@
-                        }
-
-      
+       
-                }
-
@@ -375 +375 @@
-                        }
-
-      
+       
-                }
-
@@ -381 +381 @@
-                {
-                        if ((feel == INSCRIP_BROKEN) || (feel == INSCRIP_TERRIBLE) ||
- 
+
-                            (feel == INSCRIP_AVERAGE) || (feel == INSCRIP_GOOD))
-                        {
@@ -407 +407 @@
-                {
-                        return TRUE;
-      
+       
-                }
-        }
@@ -645 +645 @@
-
-        /* Select an entry */
- && evt.type != EVT_BACK
+
-                evt = menu_select(&menu, &cursor, 0);
-
@@ -686 +686 @@
-
-        /* Toggle */
- 
+\n' || cmd == '\r
-        {
-                int idx = choice[oid];
@@ -696 +696 @@
-        return FALSE;
-}
+
-
-/*
@@ -759 +760 @@
-        text_out_c(TERM_L_GREEN, "ESC");
-        text_out(" to return to the previous menu.  ");
-Space
+Enter
-        text_out(" toggles the current setting.");
-
@@ -770 +771 @@
-
-        /* Select an entry */
- && evt.type != EVT_BACK
+
-                evt = menu_select(&menu, &cursor, 0);
-
@@ -782 +783 @@
-
-
+/* Returns TRUE if there's anything to display a menu of */
+static bool seen_tval(int tval)
+{
+        int i;
+
+        for (i = 1; i < z_info->k_max; i++)
+        {
+                object_kind *k_ptr = &k_info[i];
+
+                /* Skip empty objects, unseen objects, and incorrect tvals */
+                if (!k_ptr->name) continue;
+                if (!k_ptr->everseen) continue;
+                if (k_ptr->tval != tval) continue;
+
+                 return TRUE;
+        }
+
+
+        return FALSE;
+}
+
+
+/* Extra options on the "item options" menu */
+struct {
+        char tag;
+        char *name;
+        void (*action)(void);
+} extra_item_options[] = { {'Q', "Quality squelching options", quality_menu } };
+
+static char tag_options_item(menu_type *menu, int oid)
+{
+        if (oid < N_ELEMENTS(sval_dependent))
+                return I2A(oid);
+
+        /* Separator - blank line. */
+        if (oid == N_ELEMENTS(sval_dependent))
+                return 0;
+
+        oid = oid - N_ELEMENTS(sval_dependent);
+
+        if (oid - 1 < N_ELEMENTS(extra_item_options))
+                return extra_item_options[oid - 1].tag;
+
+        return 0;
+}
+
+static int valid_options_item(menu_type *menu, int oid)
+{
+        if (oid < N_ELEMENTS(sval_dependent))
+                return 1;
+
+        /* Separator - blank line. */
+        if (oid == N_ELEMENTS(sval_dependent))
+                return 0;
+
+        oid = oid - N_ELEMENTS(sval_dependent);
+
+        if (oid - 1 < N_ELEMENTS(extra_item_options))
+                return 1;
+
+        return 0;
+}
+
+static void display_options_item(menu_type *menu, int oid, bool cursor, int row, int col, int width)
+{
+        if (oid < N_ELEMENTS(sval_dependent))
+        {
+                bool known = seen_tval(sval_dependent[oid].tval);
+                byte attr = curs_attrs[known ? CURS_KNOWN: CURS_UNKNOWN][(int)cursor];
+
+                c_prt(attr, sval_dependent[oid].desc, row, col);
+        }
+        else
+        {
+                byte attr = curs_attrs[CURS_KNOWN][(int)cursor];
+
+                oid = oid - N_ELEMENTS(sval_dependent);
+    
+                if (oid - 1 < N_ELEMENTS(extra_item_options))
+                        c_prt(attr, extra_item_options[oid - 1].name, row, col);
+        }
+}
+
+
+static const menu_iter options_item_iter =
+{
+        0,
+        tag_options_item,
+        valid_options_item,
+        display_options_item,
+        NULL
+};
+
-
-/*
- * Display and handle the main squelching menu.
- */
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        /* Save and clear screen */
@@ -796 +900 @@
-        clear_from(0);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-                {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                }
-        }