fiddlerwoaroof/crawl - Change 3NUVKRHPHENI7JNHDDIHZ4FESSZ2Z5XJZVB56ZCXPGMP7O3JCM3QC

For David. Menu's draw_title_suffix can now accept a formatted_string

instead of a string. See example in StashSearchMenu::draw_title. If you want everything in cyan, you might want to figure out who sets the StashSearchMenu's title->color and change that, too.

Added formatted_string::substr(). Lightly tested, seems to work fine.

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

Created by pauldubois on April 7, 2008

3NUVKRHPHENI7JNHDDIHZ4FESSZ2Z5XJZVB56ZCXPGMP7O3JCM3QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/stash.cc at line 1608 [3.147324]

B:BD[2.2643] → [2.2643:2709]

                 "  [a-z: %s  ?: change action  /: change sort]",

[2.2643]

[2.2709]

                 "<lightgrey>  [<w>a-z</w>: %s  <w>?</w>: change action  <w>/</w>: change sort]",

Replacement in crawl-ref/source/stash.cc at line 1611 [3.147324]

B:BD[3.182436] → [2.2778:2817]

        draw_title_suffix(buf, false);

[3.182436]

[3.182612]

        draw_title_suffix(formatted_string::parse_string(buf), false);

Insertion in crawl-ref/source/menu.h at line 21 [3.255942]
[3.256101]
[3.256101]
```
class formatted_string;
```

Insertion in crawl-ref/source/menu.h at line 223 [3.255942]

[3.259667]

    bool draw_title_suffix( const formatted_string &fs, bool titlefirst = true );

Insertion in crawl-ref/source/menu.cc at line 431 [3.261322]

[3.265780]

[4.567808]

bool Menu::draw_title_suffix( const formatted_string &fs, bool titlefirst )
{
    int oldx = wherex(), oldy = wherey();
    if (titlefirst)
        draw_title();
    int x = wherex();
    if (x > get_number_of_cols() || x < 1)
    {
        cgotoxy(oldx, oldy);
        return false;
    }
    // Note: 1 <= x <= get_number_of_cols(); we have no fear of overflow.
    const unsigned int avail_width = get_number_of_cols() - x + 1;
    const unsigned int fs_length = fs.length();
    if (fs_length > avail_width)
    {
        formatted_string fs_trunc = fs.substr(0, avail_width);
        fs_trunc.display();
    }
    else
    {
        fs.display();
        if (fs_length < avail_width)
        {
            char fmt[20];
            sprintf(fmt, "%%%ds", avail_width-fs_length);
            cprintf(fmt, " ");
        }
    }
    
    cgotoxy( oldx, oldy );
    return true;
}

Insertion in crawl-ref/source/format.h at line 43 [5.242]

[5.1010]

    formatted_string substr(size_t index, size_t length=std::string::npos) const;

Insertion in crawl-ref/source/format.cc at line 407 [5.2166]

[5.6817]

}
formatted_string formatted_string::substr(size_t start, size_t substr_length) const
{
    const unsigned int NONE = (unsigned int)-1;
    unsigned int last_FSOP_COLOUR = NONE;
    unsigned int last_FSOP_CURSOR = NONE;
    // Find the first string to copy
    unsigned int i;
    for (i=0; i<ops.size(); ++i)
    {
        const fs_op& op = ops[i];
        if (op.type == FSOP_COLOUR)
            last_FSOP_CURSOR = i;
        else if (op.type == FSOP_CURSOR)
            last_FSOP_CURSOR = i;
        else if (op.type == FSOP_TEXT)
            if (op.text.length() > start)
                break;
            else
                start -= op.text.length();
    }
    if (i == ops.size())
        return formatted_string();
    formatted_string result;
    // set up the state
    if (last_FSOP_COLOUR != NONE)
        result.ops.push_back(ops[last_FSOP_COLOUR]);
    if (last_FSOP_CURSOR != NONE)
        result.ops.push_back(ops[last_FSOP_CURSOR]);
    // Copy the text
    for ( ; i<ops.size(); i++)
    {
        const fs_op& op = ops[i];
        if (op.type == FSOP_TEXT)
        {
            result.ops.push_back(op);
            std::string& new_string = result.ops[result.ops.size()-1].text;
            if (start > 0 || op.text.length() > substr_length)
                new_string = new_string.substr(start, substr_length);
            substr_length -= new_string.length();
            if (substr_length == 0)
                break;
        }
        else
        {
            result.ops.push_back(op);
        }
    }
    return result;