fiddlerwoaroof/crawl - Change CVC5FFFLGVRR3KPYDNB6RF4FNACV3LI3HPSR4MCUNZ4C3FSQYBDAC

When showing glyphs in messages (as in the tutorial), use stringize_glyph() to

convert Unicode glyphs to multibyte sequences.

Added multibyte_strlen to calculate string lengths correctly when dealing with multibyte strings.

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

Created by dshaligram on June 8, 2007

CVC5FFFLGVRR3KPYDNB6RF4FNACV3LI3HPSR4MCUNZ4C3FSQYBDAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.h at line 117 [5.13254]

B:BD[3.224] → [4.4:43]

int get_screen_glyph( int x, int y );

[3.224]

[2.125]

unsigned get_screen_glyph( int x, int y );
std::string stringize_glyph(unsigned glyph);
int multibyte_strlen(const std::string &s);

Replacement in crawl-ref/source/view.cc at line 3547 [5.16817]
B:BD[6.63656] → [4.2681:2719]
```
int get_screen_glyph( int x, int y ) 
```
[6.63656]
[6.63701]
```
unsigned get_screen_glyph( int x, int y ) 
```

Replacement in crawl-ref/source/view.cc at line 3549 [5.16817]

B:BD[6.63703] → [6.63703:63779]

    const int ex = x - you.x_pos + 9;
    const int ey = y - you.y_pos + 9;

[6.63703]

[5.102291]

    const coord_def ep = view2show(grid2view(coord_def(x,y)));

Replacement in crawl-ref/source/view.cc at line 3551 [5.16817]

B:BD[5.102292] → [6.63780:63878]

    int             object = env.show[ex][ey];
    unsigned short  colour = env.show_col[ex][ey];

[5.102292]

[2.7186]

    int             object = env.show(ep);
    unsigned short  colour = env.show_col(ep);

Insertion in crawl-ref/source/view.cc at line 3565 [5.16817]

[5.103245]

[6.64110]

std::string stringize_glyph(unsigned glyph)
{
    if (crawl_state.glyph2strfn)
        return (*crawl_state.glyph2strfn)(glyph);
    return std::string(1, glyph);
}
int multibyte_strlen(const std::string &s)
{
    if (crawl_state.multibyte_strlen)
        return (*crawl_state.multibyte_strlen)(s);
    return (s.length());
}

Replacement in crawl-ref/source/tutorial.cc at line 1054 [4.5936]

B:BD[7.39042] → [8.10661:10738]

          text << "The <yellow>" << static_cast<char>(get_screen_glyph(x,y))

[7.39042]

[8.10738]

          text << "The <yellow>" << stringize_glyph(get_screen_glyph(x,y))

Replacement in crawl-ref/source/tutorial.cc at line 1062 [4.5936]

B:BD[7.39298] → [8.10841:10913]

          text << "The <w>" << static_cast<char>(get_screen_glyph(x,y))

[7.39298]

[8.10913]

          text << "The <w>" << stringize_glyph(get_screen_glyph(x,y))

Replacement in crawl-ref/source/message.h at line 65 [5.1990888]
B:BD[9.3555] → [9.3555:3608]
```
void formatted_message_history(const std::string st,
```
[9.3555]
[9.3608]
```
void formatted_message_history(const std::string &st,
```
Deletion in crawl-ref/source/message.cc at line 558 [5.1993826]
B:BD[10.2292] → [10.2292:2293]

Replacement in crawl-ref/source/message.cc at line 569 [5.1993826]

B:BD[10.2608] → [10.2608:2655]

            curcol += fs.ops[i].text.length();

[10.2608]

[10.2655]

            curcol += multibyte_strlen(fs.ops[i].text);

Replacement in crawl-ref/source/message.cc at line 597 [5.1993826]

B:BD[9.6421] → [9.6421:6498]

void formatted_message_history(const std::string st, int channel, int param)

[9.6421]

[9.6498]

void formatted_message_history(const std::string &st, int channel, int param)

Replacement in crawl-ref/source/message.cc at line 789 [5.1993826]

B:BD[9.7838] → [9.7838:7897]

                        curcol += fs.ops[j].text.length();

[9.7838]

[9.7897]

                        curcol += multibyte_strlen(fs.ops[j].text);

Insertion in crawl-ref/source/libunix.cc at line 51 [5.2550041]
[2.13680]
[2.13680]
```
#include <wchar.h>
```

Insertion in crawl-ref/source/libunix.cc at line 171 [5.2550041]

[5.2554794]

#ifdef UNICODE_GLYPHS
static std::string unix_glyph2string(unsigned gly)
{
    char buf[50];  // Overkill, I know.
    wchar_t wcbuf[2];
    wcbuf[0] = gly;
    wcbuf[1] = 0;
    if (wcstombs(buf, wcbuf, sizeof buf) != (size_t) -1)
        return (buf);
    return std::string(1, gly);
}
static int unix_multibyte_strlen(const std::string &s)
{
    const char *cs = s.c_str();
    size_t len = mbsrtowcs(NULL, &cs, 0, NULL);
    return (len == (size_t) -1? s.length() : len);
}
#endif

Replacement in crawl-ref/source/libunix.cc at line 211 [5.2550041]

B:BD[2.13896] → [2.13896:13950]

    crawl_state.unicode_ok = !!setlocale(LC_ALL, "");

[2.13896]

[2.13950]

    if ((crawl_state.unicode_ok = !!setlocale(LC_ALL, "")))
    {
        crawl_state.glyph2strfn = unix_glyph2string;
        crawl_state.multibyte_strlen = unix_multibyte_strlen;
    }

Replacement in crawl-ref/source/libunix.cc at line 299 [5.2550041]
B:BD[11.2917] → [11.2917:2922]
```
    
```
[11.2917]
[11.2922]
Deletion in crawl-ref/source/libunix.cc at line 422 [5.2550041]
B:BD[5.2564774] → [5.2564774:2564775]

Insertion in crawl-ref/source/externs.h at line 1197 [5.3270163]

[5.3282781]

[12.2573]

    std::string (*glyph2strfn)(unsigned glyph);
    int (*multibyte_strlen)(const std::string &s);

Replacement in crawl-ref/source/externs.h at line 1202 [5.3270163]
B:BD[2.17986] → [2.17986:18012]
```
        unicode_ok(false)
```
[2.17986]
[12.2686]
```
        unicode_ok(false), glyph2strfn(NULL), multibyte_strlen(NULL)
```

Replacement in crawl-ref/source/direct.cc at line 1643 [5.3697945]

B:BD[13.1833] → [13.1833:1888]

    mprf("(%d,%d): %s", mx, my, feature_desc.c_str());

[13.1833]

[13.1888]

    mprf("(%d,%d): %s - %s", mx, my,
         stringize_glyph(get_screen_glyph(mx, my)).c_str(),
         feature_desc.c_str());