fiddlerwoaroof/crawl - Change 2PAHDAPDO6PN4FNGB5N7CQNEGHSE3NOGPXYZMIAOJC4VW34FRVOAC

Menus are now tagged. Menu colours now only apply to a menu with a matching

tag, unless the menu colour tag is empty or "any". Menu colours are specified as tag:colour:pattern, where the "tag:" part is optional (default is empty tag, i.e., all menus.) The following menu tags exist: ability, description, equip, help, inventory, notes, resists, spell, stash. Default .crawlrc should probably be changed (and the docs, too…)

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2493 c06c8d41-db1a-0410-9941-cceddc491573

Created by haranp on October 19, 2007

2PAHDAPDO6PN4FNGB5N7CQNEGHSE3NOGPXYZMIAOJC4VW34FRVOAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/stash.cc at line 397 [7.147324]
[6.236]
[6.236]
```
        set_tag("stash");       // override "inventory" tag
```
Insertion in crawl-ref/source/stash.cc at line 1545 [7.147324]
[7.183081]
[7.183081]
```
    stashmenu.set_tag("stash");
```
Insertion in crawl-ref/source/spl-cast.cc at line 208 [8.293070]
[2.1698]
[8.296151]
```
    spell_menu.set_tag("spell");
```
Insertion in crawl-ref/source/output.cc at line 1001 [8.1088282]
[9.52347]
[10.1063]
```
    cmd_help.set_tag("help");
```

Replacement in crawl-ref/source/menu.h at line 51 [7.255942]

B:BD[3.2424] → [3.2424:2473]

                const std::string &prefix = "");

[3.2424]

[3.2473]

                const std::string &prefix = "",
                const std::string &tag = "");

Insertion in crawl-ref/source/menu.h at line 56 [7.255942]
[7.256730]
[7.256730]
```
    std::string tag;
```

Replacement in crawl-ref/source/menu.h at line 113 [7.255942]

B:BD[3.2522] → [3.2522:2564]

        return (menu_colour(get_text()));

[3.2522]

[3.2564]

        return (menu_colour(get_text(), "", tag));

Replacement in crawl-ref/source/menu.h at line 181 [7.255942]

B:BD[7.259378] → [7.259378:259418]

    Menu( int flags = MF_MULTISELECT );

[7.259378]

[7.259418]

    Menu( int flags = MF_MULTISELECT, const std::string& tagname = "" );

Insertion in crawl-ref/source/menu.h at line 192 [7.255942]
[11.561135]
[7.259586]
```
    void set_tag(const std::string& t) { tag = t; }
```
Insertion in crawl-ref/source/menu.h at line 232 [7.255942]
[7.260271]
[7.260271]
```
    std::string tag;
```
Replacement in crawl-ref/source/menu.cc at line 19 [7.261322]
B:BD[7.261397] → [7.261397:261422]
```
Menu::Menu( int _flags )
```
[7.261397]
[11.564818]
```
Menu::Menu( int _flags, const std::string& tagname )
```
Insertion in crawl-ref/source/menu.cc at line 25 [7.261322]
[7.261482]
[7.261482]
```
    tag(tagname),
```
Insertion in crawl-ref/source/menu.cc at line 96 [7.261322]
[7.262122]
[7.262122]
```
    entry->tag = tag;
```

Replacement in crawl-ref/source/menu.cc at line 1033 [7.261322]

B:BD[7.272389] → [3.2573:2641]

int menu_colour(const std::string &text, const std::string &prefix)

[7.272389]

[7.272430]

int menu_colour(const std::string &text, const std::string &prefix,
                const std::string &tag)

Replacement in crawl-ref/source/menu.cc at line 1036 [7.261322]
B:BD[7.272432] → [3.2642:2684]
```
    std::string tmp_text = prefix + text;
```
[7.272432]
[3.2684]
```
    const std::string tmp_text = prefix + text;
```

Replacement in crawl-ref/source/menu.cc at line 1038 [7.261322]

∅:D[3.2685] → [7.272432:272511]

B:BD[7.272432] → [7.272432:272511]

    for (int i = 0, size = Options.menu_colour_mappings.size(); i < size; ++i)

[3.2685]

[7.272511]

    for (unsigned int i = 0; i < Options.menu_colour_mappings.size(); ++i)

Replacement in crawl-ref/source/menu.cc at line 1040 [7.261322]

B:BD[7.272517] → [7.272517:272579]

B:BD[7.272579] → [3.2686:2728]

        colour_mapping &cm = Options.menu_colour_mappings[i];
        if (cm.pattern.matches(tmp_text))

[7.272517]

[7.272617]

        const colour_mapping &cm = Options.menu_colour_mappings[i];
        if ( (cm.tag.empty() || cm.tag == "any" || cm.tag == tag) &&
             cm.pattern.matches(tmp_text) )
        {

Insertion in crawl-ref/source/menu.cc at line 1045 [7.261322]
[7.272649]
[7.272649]
```
        }
```

Replacement in crawl-ref/source/menu.cc at line 1420 [7.261322]

B:BD[12.1368] → [12.1368:1423]

    if (first_entry + pagesize < (int) items.size() &&

[12.1368]

[12.1423]

    if (first_entry + pagesize < static_cast<int>(items.size()) &&

Replacement in crawl-ref/source/invent.h at line 92 [8.2919073]

B:BD[3.4756] → [3.4756:4834]

                           menu_colour_item_prefix( *( (item_def*) item) ) );

[3.4756]

[3.4834]

                           menu_colour_item_prefix( *( (item_def*) item) ),
                           tag );

Replacement in crawl-ref/source/invent.h at line 112 [8.2919073]

B:BD[11.768584] → [6.6644:6704]

        : Menu(mflags), type(MT_INVLIST), pre_select(NULL),

[11.768584]

[11.768646]

        : Menu(mflags, "inventory"), type(MT_INVLIST), pre_select(NULL),

Replacement in crawl-ref/source/initfile.cc at line 2456 [8.2957258]

∅:D[13.3245] → [7.423000:423105]

B:BD[7.423000] → [7.423000:423105]

B:BD[7.423105] → [13.3246:3289]

            const std::string &sub = seg[i];
            std::string::size_type cpos = sub.find(":", 0);
            if (cpos != std::string::npos)

[13.3245]

[13.3289]

            // format: tag:string:colour
            // FIXME: arrange so that you can use ':' inside a pattern
            std::vector<std::string> subseg = split_string(":", seg[i]);
            std::string tagname, patname, colname;
            if ( subseg.size() < 2 )
                continue;
            if ( subseg.size() >= 3 )
            {
                tagname = subseg[0];
                colname = subseg[1];
                patname = subseg[2];
            }
            else

Replacement in crawl-ref/source/initfile.cc at line 2470 [8.2957258]

∅:D[13.3303] → [7.423150:423358]

B:BD[7.423150] → [7.423150:423358]

B:BD[7.423358] → [11.810328:810389]

                colour_mapping mapping;
                mapping.pattern = sub.substr(cpos + 1);
                mapping.colour  = str_to_colour(sub.substr(0, cpos));
                if (mapping.colour != -1)
                    menu_colour_mappings.push_back(mapping);

[13.3303]

[7.423427]

                colname = subseg[0];
                patname = subseg[1];

Insertion in crawl-ref/source/initfile.cc at line 2473 [8.2957258]

[7.423441]

[8.2979297]


            colour_mapping mapping;
            mapping.tag = tagname;
            mapping.pattern = patname;
            mapping.colour = str_to_colour(colname);
            if (mapping.colour != -1)
                menu_colour_mappings.push_back(mapping);

Insertion in crawl-ref/source/externs.h at line 1351 [8.3270163]
[7.442329]
[7.442329]
```
    std::string tag;
```

Replacement in crawl-ref/source/command.cc at line 388 [8.4082507]

B:BD[3.8826] → [3.8826:8905]

                                 menu_colour_item_prefix(you.inv[armour_id]));

[3.8826]

[3.8905]

                                 menu_colour_item_prefix(you.inv[armour_id]),
                                 "equip");

Replacement in crawl-ref/source/command.cc at line 401 [8.4082507]

B:BD[3.8952] → [3.8952:8998]

            colour = menu_colour(estr.str());

[3.8952]

[3.8998]

            colour = menu_colour(estr.str(), "", "equip");

Replacement in crawl-ref/source/command.cc at line 430 [8.4082507]

B:BD[3.9215] → [3.9215:9269]

            colour = menu_colour(jstr.str(), prefix);

[3.9215]

[3.9269]

            colour = menu_colour(jstr.str(), prefix, "equip");

Replacement in crawl-ref/source/command.cc at line 438 [8.4082507]

B:BD[3.9316] → [3.9316:9362]

            colour = menu_colour(jstr.str());

[3.9316]

[3.9362]

            colour = menu_colour(jstr.str(), "", "equip");

Replacement in crawl-ref/source/command.cc at line 459 [8.4082507]

B:BD[3.9489] → [3.9489:9564]

                             menu_colour_item_prefix(you.inv[weapon_id]));

[3.9489]

[8.4093917]

                             menu_colour_item_prefix(you.inv[weapon_id]),
                             "equip");

Replacement in crawl-ref/source/command.cc at line 470 [8.4082507]
B:BD[14.26075] → [3.9565:9604]
```
        colour = menu_colour(wstring);
```
[14.26075]
[8.4094109]
```
        colour = menu_colour(wstring, "", "equip");
```

Replacement in crawl-ref/source/command.cc at line 496 [8.4082507]

B:BD[3.9731] → [3.9731:9802]

                                 menu_colour_item_prefix(you.inv[i]));

[3.9731]

[15.3422]

                                 menu_colour_item_prefix(you.inv[i]),
                                 "equip");

Replacement in crawl-ref/source/command.cc at line 503 [8.4082507]

B:BD[3.9840] → [3.9840:9883]

            colour = menu_colour(wstring);

[3.9840]

[8.4094680]

            colour = menu_colour(wstring, "", "equip");

Replacement in crawl-ref/source/command.cc at line 520 [8.4082507]

B:BD[3.10013] → [3.10013:10083]

                             menu_colour_item_prefix(you.inv[item]));

[3.10013]

[3.10083]

                             menu_colour_item_prefix(you.inv[item]),
                             "equip");

Replacement in crawl-ref/source/command.cc at line 525 [8.4082507]
B:BD[3.10122] → [3.10122:10161]
```
        colour = menu_colour(wstring);
```
[3.10122]
[3.10161]
```
        colour = menu_colour(wstring, "", "equip");
```
Insertion in crawl-ref/source/command.cc at line 1048 [8.4082507]
[16.10242]
[4.1341]
```
    desc_menu.set_tag("description");
```
Insertion in crawl-ref/source/command.cc at line 1154 [8.4082507]
[17.5325]
[18.2251]
```
    cmd_help.set_tag("help");
```
Insertion in crawl-ref/source/chardump.cc at line 1172 [8.4100336]
[19.15553]
[5.463]
```
    scr.set_tag("notes");
```
Insertion in crawl-ref/source/chardump.cc at line 1205 [8.4100336]
[19.16650]
[19.16650]
```
    scr.set_tag("resists");
```

Replacement in crawl-ref/source/abl-show.cc at line 1832 [8.4494389]

B:BD[20.16507] → [20.16507:16562]

    Menu abil_menu(MF_SINGLESELECT | MF_ANYPRINTABLE);

[20.16507]

[20.16562]

    Menu abil_menu(MF_SINGLESELECT | MF_ANYPRINTABLE, "ability");

Menus are now tagged. Menu colours now only apply to a menu with a matching

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/stash.cc at line 397 [7.147324]

Insertion in crawl-ref/source/stash.cc at line 1545 [7.147324]

Insertion in crawl-ref/source/spl-cast.cc at line 208 [8.293070]

Insertion in crawl-ref/source/output.cc at line 1001 [8.1088282]

Replacement in crawl-ref/source/menu.h at line 51 [7.255942]

Insertion in crawl-ref/source/menu.h at line 56 [7.255942]

Replacement in crawl-ref/source/menu.h at line 113 [7.255942]

Replacement in crawl-ref/source/menu.h at line 181 [7.255942]

Insertion in crawl-ref/source/menu.h at line 192 [7.255942]

Insertion in crawl-ref/source/menu.h at line 232 [7.255942]

Replacement in crawl-ref/source/menu.cc at line 19 [7.261322]

Insertion in crawl-ref/source/menu.cc at line 25 [7.261322]

Insertion in crawl-ref/source/menu.cc at line 96 [7.261322]

Replacement in crawl-ref/source/menu.cc at line 1033 [7.261322]

Replacement in crawl-ref/source/menu.cc at line 1036 [7.261322]

Replacement in crawl-ref/source/menu.cc at line 1038 [7.261322]

Replacement in crawl-ref/source/menu.cc at line 1040 [7.261322]

Insertion in crawl-ref/source/menu.cc at line 1045 [7.261322]

Replacement in crawl-ref/source/menu.cc at line 1420 [7.261322]

Replacement in crawl-ref/source/invent.h at line 92 [8.2919073]

Replacement in crawl-ref/source/invent.h at line 112 [8.2919073]

Replacement in crawl-ref/source/initfile.cc at line 2456 [8.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2470 [8.2957258]

Insertion in crawl-ref/source/initfile.cc at line 2473 [8.2957258]

Insertion in crawl-ref/source/externs.h at line 1351 [8.3270163]

Replacement in crawl-ref/source/command.cc at line 388 [8.4082507]

Replacement in crawl-ref/source/command.cc at line 401 [8.4082507]

Replacement in crawl-ref/source/command.cc at line 430 [8.4082507]

Replacement in crawl-ref/source/command.cc at line 438 [8.4082507]

Replacement in crawl-ref/source/command.cc at line 459 [8.4082507]

Replacement in crawl-ref/source/command.cc at line 470 [8.4082507]

Replacement in crawl-ref/source/command.cc at line 496 [8.4082507]

Replacement in crawl-ref/source/command.cc at line 503 [8.4082507]

Replacement in crawl-ref/source/command.cc at line 520 [8.4082507]

Replacement in crawl-ref/source/command.cc at line 525 [8.4082507]

Insertion in crawl-ref/source/command.cc at line 1048 [8.4082507]

Insertion in crawl-ref/source/command.cc at line 1154 [8.4082507]

Insertion in crawl-ref/source/chardump.cc at line 1172 [8.4100336]

Insertion in crawl-ref/source/chardump.cc at line 1205 [8.4100336]

Replacement in crawl-ref/source/abl-show.cc at line 1832 [8.4494389]