Changeset 256

Timestamp:

07/03/07 19:17:14 (1 year ago)

Author:

ajps

Message:

Added caseless tag selections to menu code - used new flag in the main options menu.

Files:

• trunk/src/cmd4.c (modified) (1 diff)
• trunk/src/ui.c (modified) (4 diffs)
• trunk/src/ui.h (modified) (2 diffs)

trunk/src/cmd4.c

@@ -4147 +4147 @@
-        menu->title = "Options Menu";
-        menu->menu_data = option_actions;
+        menu->flags = MN_CASELESS_TAGS;
-        menu->cmd_keys = cmd_keys;
-        menu->count = N_ELEMENTS(option_actions);

trunk/src/ui.c

@@ -495 +495 @@
-        int n = menu->filter_count;
-
+        if (MN_CASELESS_TAGS)
+                key = toupper((unsigned char) key);
+
-        if (menu->flags & MN_NO_TAGS)
-        {
@@ -504 +507 @@
-                {
-                        char c = menu->skin->get_tag(menu, i);
+
+                        if ((menu->flags & MN_CASELESS_TAGS) && c)
+                                c = toupper((unsigned char) c);
+
-                        if (c && c == key)
-                                return i + menu->top;
@@ -512 +519 @@
-                for (i = 0; menu->selections[i]; i++)
-                {
-
+
+
+
+
+
+
-                                return i;
-                }
@@ -522 +534 @@
-                        int oid = menu->object_list ? menu->object_list[i] : i;
-                        char c = menu->row_funcs->get_tag(menu, oid);
+
+                        if ((menu->flags & MN_CASELESS_TAGS) && c)
+                                c = toupper((unsigned char) c);
+
-                        if (c && c == key)
-                                return i;

trunk/src/ui.h

@@ -221 +221 @@
-        MN_NO_TAGS      = 0x0200, /* No tags -- movement key and mouse browsing only */
-        MN_PVT_TAGS = 0x0400, /* Tags to be generated by the display function */
+        MN_CASELESS_TAGS = 0x0800, /* Tag selections can be made regardless of the case of the key pressed. - i.e. 'a' activates the line tagges 'A'. */
-
-        MN_DBL_TAP      = 0x1000, /* double tap for selection; single tap is cursor movement */
@@ -234 +235 @@
-        MN_SELECTABLE   = 0x0800000,    /* Row is permitted to be selected */
-        MN_HIDDEN               = 0x1000000             /* Row is hidden, but may be selected via */
-(Useful for lower case alternante)
+
-} menu_flags;
-