fiddlerwoaroof/crawl - Change XKNRIFG2ULQLAAQ5GC4RBZPOERV73DLCNILEA5EP37JLIX5EP3OQC

Improved Tile screen layout. Small screens get the message window overlaid on the dungeon. Even smaller screens get the graphics shrunk (and thus slightly blurry.) Added full screen options and several predefined layouts for older and newer Eee PC resolutions.

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

Created by ennewalker on August 4, 2008

XKNRIFG2ULQLAAQ5GC4RBZPOERV73DLCNILEA5EP37JLIX5EP3OQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 5152 [5.16817]
∅:D[3.51] → [4.983:1008]
B:BD[6.81] → [4.983:1008]
```
#define MSG_MIN_HEIGHT 7
```
[3.51]
[6.82]
```
// #define MSG_MIN_HEIGHT defined elsewhere
```
Insertion in crawl-ref/source/view.cc at line 5372 [5.16817]
[7.3137]
[7.3137]
```
    viewhalfsz = viewsz / 2;
    vbuf.size(viewsz);
```
Deletion in crawl-ref/source/view.cc at line 5476 [5.16817]
∅:D[8.6819] → [7.6573:6602]
B:BD[7.6573] → [7.6573:6602]
B:BD[7.6602] → [9.7458:7481]
```
    viewhalfsz = viewsz / 2;
    vbuf.size(viewsz);
```
Insertion in crawl-ref/source/tilesdl.h at line 100 [10.15441]
[10.17539]
[10.17539]
```
    int get_number_of_lines();
    int get_number_of_cols();
```

Deletion in crawl-ref/source/tilesdl.cc at line 312 [10.19415]

B:BD[10.26539] → [10.26539:26683]


    // TODO enne - need better resizing
    // View size in pixels is (m_viewsc * crawl_view.viewsz)
    m_viewsc.x = 32;
    m_viewsc.y = 32;

Replacement in crawl-ref/source/tilesdl.cc at line 645 [10.19415]

B:BD[10.35121] → [10.35121:35156]

    const int map_stat_buffer = 5;

[10.35121]

[10.35156]

    // View size in pixels is (m_viewsc * crawl_view.viewsz)
    m_viewsc.x = 32;
    m_viewsc.y = 32;

Replacement in crawl-ref/source/tilesdl.cc at line 649 [10.19415]
B:BD[10.35157] → [10.35157:35188]
```
    // TODO enne - use options
```
[10.35157]
[10.35188]
```
    const int map_stat_buffer = 4;
```

Replacement in crawl-ref/source/tilesdl.cc at line 654 [10.19415]

B:BD[10.35280] → [10.35280:35319]

    // Size regions that we know about

[10.35280]

[10.35319]

    crawl_view.viewsz.x = Options.view_max_width;
    crawl_view.viewsz.y = Options.view_max_height;
    crawl_view.msgsz.x = crt_width;
    // Initial sizes.
    m_region_tile->dx = m_viewsc.x;
    m_region_tile->dy = m_viewsc.y;

Insertion in crawl-ref/source/tilesdl.cc at line 666 [10.19415]
[10.35606]
[10.35606]
```
    m_region_menu_inv->resize(24, 1);
```
Deletion in crawl-ref/source/tilesdl.cc at line 668 [10.19415]
B:BD[10.35607] → [10.35607:35608]
Insertion in crawl-ref/source/tilesdl.cc at line 670 [10.19415]
[10.35672]
[10.35672]

Replacement in crawl-ref/source/tilesdl.cc at line 672 [10.19415]

B:BD[10.35712] → [10.35712:35767]

    m_region_msg->place(0, m_region_tile->ey, margin);

[10.35712]

[10.35767]

    m_region_msg->place(0, m_region_tile->ey - margin, margin);
    bool message_overlay = false;
    if (m_windowsz.y < m_region_tile->dy * VIEW_MIN_HEIGHT)
    {
        crawl_view.viewsz.x = VIEW_MIN_WIDTH;
        crawl_view.viewsz.y = VIEW_MIN_HEIGHT;
        m_region_tile->place(0, 0, 0);
        int factor = m_windowsz.y / crawl_view.viewsz.y;
        m_viewsc.x = m_viewsc.y = std::min(32, factor);
        m_region_tile->dx = m_viewsc.x;
        m_region_tile->dy = m_viewsc.y;
        m_region_tile->resize(crawl_view.viewsz.x, crawl_view.viewsz.y);
        m_region_msg->place(0, 0, 0);
        message_overlay = true;
    }
    else
    {
        // Shrink viewsz if too wide:
        while (m_region_tile->wx + m_region_stat->wx > m_windowsz.x
               && crawl_view.viewsz.x > VIEW_MIN_WIDTH)
        {
            crawl_view.viewsz.x -= 2;
            m_region_tile->mx = crawl_view.viewsz.x;
            m_region_tile->place(0, 0, margin);
            m_region_msg->place(0, m_region_tile->ex, margin);
        }

Replacement in crawl-ref/source/tilesdl.cc at line 701 [10.19415]

B:BD[10.35768] → [10.35768:35824]

    int stat_col = m_region_tile->ex + map_stat_buffer;

[10.35768]

[10.35824]

        // Shrink viewsz if too tall:
        while (m_region_tile->wy + m_region_msg->wy > m_windowsz.y
               && crawl_view.viewsz.y > VIEW_MIN_HEIGHT)
        {
            crawl_view.viewsz.y -= 2;
            m_region_tile->my = crawl_view.viewsz.y;
            m_region_tile->place(0, 0, margin);
            m_region_msg->place(0, m_region_tile->ey, margin);
        }

Replacement in crawl-ref/source/tilesdl.cc at line 711 [10.19415]

B:BD[10.35825] → [10.35825:35867]

    m_region_stat->place(stat_col, 0, 0);

[10.35825]

[10.35867]

        // Shrink msgsz if too tall:
        while (m_region_tile->wy + m_region_msg->wy > m_windowsz.y
               && crawl_view.msgsz.y > MSG_MIN_HEIGHT)
        {
            m_region_msg->resize(m_region_msg->mx, --crawl_view.msgsz.y);
        }
        if (m_region_tile->wy + m_region_msg->wy > m_windowsz.y)
        {
            m_region_tile->place(0, 0, 0);
            m_region_msg->place(0, 0, 0);
            message_overlay = true;
        }
    }
    if (message_overlay)
    {
        m_region_msg->resize_to_fit(m_region_tile->ex, m_region_msg->ey);
        crawl_view.msgsz.x = m_region_msg->mx;
        crawl_view.msgsz.y = m_region_msg->my;
    }
    else
    {
        m_region_msg->resize_to_fit(m_region_msg->wx,
                                    m_windowsz.y - m_region_msg->sx);
        int msg_y = std::min(Options.msg_max_height, (int)m_region_msg->my);
        m_region_msg->resize(m_region_msg->mx, msg_y);
    }
    m_region_msg->set_overlay(message_overlay);
    // Shrink view width if stat window can't fit...
    int stat_col;
    crawl_view.viewsz.x += 2;
    do
    {
        crawl_view.viewsz.x -= 2;
        m_region_tile->mx = crawl_view.viewsz.x;
        m_region_tile->place(0, 0, margin);
        stat_col = m_region_tile->ex + map_stat_buffer;
        m_region_stat->place(stat_col, 0, 0);
        m_region_stat->resize_to_fit(m_windowsz.x - m_region_stat->sx,
                                     m_region_stat->wy);
    }
    while (m_region_stat->ex > m_windowsz.x
           && crawl_view.viewsz.x > VIEW_MIN_WIDTH);
    int hud_width = std::min(50, (int)m_region_stat->mx);
    m_region_stat->resize(hud_width, m_region_stat->my);
    crawl_view.hudsz.x = m_region_stat->mx;
    crawl_view.hudsz.y = m_region_stat->my;
    // Resize map to fit the screen
    m_region_map->dx = m_region_map->dy = Options.tile_map_pixels;

Insertion in crawl-ref/source/tilesdl.cc at line 766 [10.19415]

[10.35933]

    while (m_region_map->ex > m_windowsz.x)
    {
        m_region_map->dx--;
        m_region_map->dy--;
        m_region_map->resize(GXM, GYM);
    }

Insertion in crawl-ref/source/tilesdl.cc at line 774 [10.19415]
[10.35999]
[10.35999]
```
    if (message_overlay)
        inv_col = stat_col;
```

Replacement in crawl-ref/source/tilesdl.cc at line 779 [10.19415]

B:BD[10.36113] → [10.36113:36301]

                                          m_region_self_inv->sx,
                                          m_windowsz.y -
                                          m_region_self_inv->sy);

[10.36113]

[10.36301]

                                     m_region_self_inv->sx,
                                     m_windowsz.y -
                                     m_region_self_inv->sy);
    m_region_self_inv->resize(std::min(13, (int)m_region_self_inv->mx),
                              std::min(6, (int)m_region_self_inv->my));
    int self_inv_y = m_windowsz.y - m_region_self_inv->wy - margin;
    m_region_self_inv->place(inv_col, self_inv_y, 0);
    // recenter map above inventory
    int map_cen_x = m_region_self_inv->sx + (m_region_self_inv->wx) / 2;
    m_region_map->place(map_cen_x - m_region_map->wy / 2, m_region_map->sy,
                        map_margin);

Insertion in crawl-ref/source/tilesdl.cc at line 795 [10.19415]

[10.36376]


    while (m_region_crt->ey + m_region_menu_inv->wy > m_windowsz.y)
    {
        m_region_crt->resize(m_region_crt->mx, m_region_crt->my - 1);
    }
    while (m_region_crt->ex > m_windowsz.x)
    {
        m_region_crt->resize(m_region_crt->mx - 1, m_region_crt->my);
    }

Replacement in crawl-ref/source/tilesdl.cc at line 807 [10.19415]

B:BD[10.36501] → [10.36501:36567]

                                          m_region_menu_inv->sy);

[10.36501]

[10.36567]

                                     m_region_menu_inv->sy);
 
    // Depending on the font, the menu inventory may hold fewer items
    // than the crt menu can display.  Decrease the lines if necessary.
    const int ex = 3;
    if (m_region_crt->my - ex > m_region_menu_inv->mx)
        m_region_crt->resize(m_region_crt->mx, m_region_menu_inv->mx + ex);
    crawl_view.init_view();

Insertion in crawl-ref/source/tilesdl.cc at line 852 [10.19415]

[10.37365]

}
int TilesFramework::get_number_of_lines()
{
    return m_region_crt->my;
}
int TilesFramework::get_number_of_cols()
{
    // TODO enne - do we need to differentiate the number of columns
    // in the message window and the number of columns on the CRT?
    return m_region_crt->mx;

Insertion in crawl-ref/source/tilesdl.cc at line 1027 [10.19415]

[10.40822]

    // TODO enne - if inventory fills up all squares, add up to one row
    // of ground, depending.
    // TODO enne - only fill up 52 squares of inventory, then start
    // showing floor.

Insertion in crawl-ref/source/tilereg.h at line 163 [10.45514]
[10.49286]
[10.49286]
```
    void set_overlay(bool is_overlay);
```
Insertion in crawl-ref/source/tilereg.h at line 167 [10.45514]
[10.49336]
[10.49336]
```
    virtual void render();
```
Insertion in crawl-ref/source/tilereg.h at line 169 [10.45514]
[10.49388]
[10.49388]
```
protected:
    bool m_overlay;
```
Insertion in crawl-ref/source/tilereg.cc at line 146 [10.54399]
[10.57637]
[10.57637]
```
    ex = sx + _wx;
    ey = sy + _wy;
```
Deletion in crawl-ref/source/tilereg.cc at line 167 [10.54399]
B:BD[10.57857] → [10.57857:57921]
```
    // TODO enne - need to handle invalid/unintialised regions?
```
Replacement in crawl-ref/source/tilereg.cc at line 759 [10.54399]
B:BD[10.75376] → [10.75376:75407]
```
    if (bg & TILE_FLAG_UNSEEN)
```
[10.75376]
[10.75407]
```
    if (bg & TILE_FLAG_UNSEEN && (bg != TILE_FLAG_UNSEEN || fg))
```
Replacement in crawl-ref/source/tilereg.cc at line 762 [10.54399]
B:BD[10.75456] → [10.75456:75490]
```
    if (bg & TILE_FLAG_MM_UNSEEN)
```
[10.75456]
[10.75490]
```
    if (bg & TILE_FLAG_MM_UNSEEN && (bg != TILE_FLAG_MM_UNSEEN || fg))
```
Deletion in crawl-ref/source/tilereg.cc at line 2122 [10.54399]
B:BD[10.113300] → [10.113300:113337]
```
    // TODO enne - gah!
    dx = 8;
```

Replacement in crawl-ref/source/tilereg.cc at line 2345 [10.54399]

B:BD[10.117426] → [10.117426:117488]

MessageRegion::MessageRegion(FTFont *font) : TextRegion(font)

[10.117426]

[10.117488]

MessageRegion::MessageRegion(FTFont *font) : TextRegion(font), m_overlay(false)

Insertion in crawl-ref/source/tilereg.cc at line 2375 [10.54399]

[10.118159]


void MessageRegion::set_overlay(bool is_overlay)
{
    m_overlay = is_overlay;
}
struct box_vert
{
    float x;
    float y;
    unsigned char r;
    unsigned char g;
    unsigned char b;
    unsigned char a;
};
void MessageRegion::render()
{
    if (m_overlay)
    {
        unsigned int height;
        bool found = false;
        for (height = my; height > 0; height--)
        {
            unsigned char *buf = &cbuf[mx * (height - 1)];
            for (unsigned int x = 0; x < mx; x++)
            {
                if (buf[x] != ' ')
                {
                    found = true;
                    break;
                }
            }

Insertion in crawl-ref/source/tilereg.cc at line 2409 [10.54399]

[10.118160]

            if (found)
                break;
        }
        if (height > 0)
        {
            height *= m_font->char_height();
            box_vert verts[4];
            for (unsigned int i = 0; i < 4; i++)
            {
                verts[i].r = 100;
                verts[i].g = 100;
                verts[i].b = 100;
                verts[i].a = 100;
            }
            verts[0].x = sx;
            verts[0].y = sy;
            verts[1].x = sx;
            verts[1].y = sy + height;
            verts[2].x = ex;
            verts[2].y = sy + height;
            verts[3].x = ex;
            verts[3].y = sy;
            glLoadIdentity();
            GLState state;
            state.array_vertex = true;
            state.array_colour = true;
            state.blend = true;
            GLStateManager::set(state);
            glVertexPointer(2, GL_FLOAT, sizeof(box_vert), &verts[0].x);
            glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(box_vert), &verts[0].r);
            glDrawArrays(GL_QUADS, 0, sizeof(verts) / sizeof(box_vert)); 
        }
    }
    m_font->render_textblock(sx + ox, sy + oy, cbuf, abuf, mx, my, m_overlay);
}

Replacement in crawl-ref/source/tilereg.cc at line 2562 [10.54399]
B:BD[10.121192] → [10.121192:121248]
```
    // Make a copy of the original images on the stack.
```
[10.121192]
[10.121248]
```
    // Make a copy of the original images.
```

Replacement in crawl-ref/source/tilereg.cc at line 2610 [10.54399]

B:BD[10.122980] → [10.122980:122985]

[10.122980]

[10.122985]

   
    // TODO enne - fix rtiles so that it can accept PNGs.
    {
        size_t image_size = 32 * 32 * 4;    
        unsigned char *mesh = new unsigned char[image_size];
        for (unsigned int i = 0; i < image_size; i += 4)
        {
            mesh[i] = mesh[i+1] = mesh[i+2] = 0;
            mesh[i+3] = 110;
        }
        _copy_onto(pixels, width, height, mesh, TILE_MESH, false);
        for (unsigned int i = 0; i < image_size; i += 4)
        {
            mesh[i] = 70;
            mesh[i+1] = 70;
            mesh[i+2] = 180;
            mesh[i+3] = 120;
        }
        _copy_onto(pixels, width, height, mesh, TILE_MAGIC_MAP_MESH, false);
        delete[] mesh;
    }

Deletion in crawl-ref/source/libgui.h at line 18 [8.5789586]
B:BD[8.5790002] → [8.5790002:5790003]
B:BD[8.5790405] → [8.5790405:5790476]
```
//dungeon display size
extern int tile_dngn_x;
extern int tile_dngn_y;
```
Deletion in crawl-ref/source/libgui.cc at line 49 [8.5793336]
B:BD[10.167531] → [10.167531:167532]
∅:D[10.167532] → [8.5794215:5794249]
B:BD[8.5794215] → [8.5794215:5794249]
```
int tile_dngn_x;
int tile_dngn_y;
```
Replacement in crawl-ref/source/libgui.cc at line 292 [8.5793336]
B:BD[8.5843889] → [10.168091:168106]
```
    return 30;
```
[8.5843889]
[8.5844073]
```
    return tiles.get_number_of_lines();
```
Replacement in crawl-ref/source/libgui.cc at line 297 [8.5793336]
B:BD[8.5844103] → [10.168107:168122]
```
    return 80;
```
[8.5844103]
[8.5844156]
```
    return tiles.get_number_of_cols();
```
Replacement in crawl-ref/source/initfile.cc at line 831 [5.2957258]
B:BD[8.5853778] → [11.9700:9732]
```
    tile_show_items[0]   = '0';
```
[8.5853778]
[11.9732]
```
    strcpy(tile_show_items, "!?/%=([)X}+\\_.");
```

Deletion in crawl-ref/source/defines.h at line 123 [5.3982910]

B:BD[12.1020440] → [8.5935404:5935539]

#ifdef USE_TILE
#define VIEW_BASE_WIDTH (tile_dngn_x)
#define VIEW_MIN_WIDTH (tile_dngn_x)
#define VIEW_MIN_HEIGHT (tile_dngn_y)
#else

Replacement in crawl-ref/source/defines.h at line 126 [5.3982910]
B:BD[13.18720] → [8.5935540:5935547]
```
#endif
```
[13.18720]
[12.1020863]
```
#define MSG_MIN_HEIGHT  7
```
Replacement in crawl-ref/settings/tiles_options.txt at line 4 [14.2785]
B:BD[14.2919] → [14.2919:2952]
```
tile_show_items = !?/%=([)X}+\_.
```
[14.2919]
[14.2952]
```
# tile_show_items = !?/%=([)X}+\_.
```
Insertion in crawl-ref/settings/tiles_options.txt at line 28 [14.2785]
[15.74198]
[15.74198]
```
# tile_tooltip_ms = 1000
```

Insertion in crawl-ref/settings/tiles_options.txt at line 31 [14.2785]

[15.74199]

# tile_window_width = 1024
# tile_window_height = 768
# tile_map_pixels = 4
# tile_full_screen = true

Insertion in crawl-ref/settings/tiles_options.txt at line 46 [14.2785]

[15.74507]

[2.4124]


### Predefined layouts for smaller standard resolutions.  Any window size
### at or above 1024x768 should probably use the above defaults.

Insertion in crawl-ref/settings/tiles_options.txt at line 50 [14.2785]

[2.4125]

### 800 x 480 (EeePC)
# tile_window_width = 800
# tile_window_height = 480
# tile_map_pixels = 3

Insertion in crawl-ref/settings/tiles_options.txt at line 55 [14.2785]

[2.4151]

# tile_font_crt_size = 13
# tile_font_stat_size = 12
# tile_font_msg_size = 10
# tile_font_tip_size = 13
# tile_font_lbl_size = 11
### 1024 x 600 (EeePC 900+)

Replacement in crawl-ref/settings/tiles_options.txt at line 63 [14.2785]

B:BD[2.4178] → [2.4178:4252]

# tile_window_height = 768
# tile_map_pixels = 4
# tile_tooltip_ms = 1000

[2.4178]

# tile_window_height = 600
# tile_map_pixels = 3
# tile_full_screen = true
# tile_font_crt_size = 14
# tile_font_stat_size = 14
# tile_font_msg_size = 12
# tile_font_tip_size = 13
# tile_font_lbl_size = 12
### 800 x 600
# tile_window_width = 800
# tile_window_height = 600
# tile_map_pixels = 3
# tile_font_crt_size = 14
# tile_font_stat_size = 11
# tile_font_msg_size = 12
# tile_font_tip_size = 13
# tile_font_lbl_size = 12

Improved Tile screen layout. Small screens get the message window overlaid on the dungeon. Even smaller screens get the graphics shrunk (and thus slightly blurry.) Added full screen options and several predefined layouts for older and newer Eee PC resolutions.

Dependencies

In channels

Change contents

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

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

Deletion in crawl-ref/source/view.cc at line 5476 [5.16817]

Insertion in crawl-ref/source/tilesdl.h at line 100 [10.15441]

Deletion in crawl-ref/source/tilesdl.cc at line 312 [10.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 645 [10.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 649 [10.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 654 [10.19415]

Insertion in crawl-ref/source/tilesdl.cc at line 666 [10.19415]

Deletion in crawl-ref/source/tilesdl.cc at line 668 [10.19415]

Insertion in crawl-ref/source/tilesdl.cc at line 670 [10.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 672 [10.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 701 [10.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 711 [10.19415]

Insertion in crawl-ref/source/tilesdl.cc at line 766 [10.19415]

Insertion in crawl-ref/source/tilesdl.cc at line 774 [10.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 779 [10.19415]

Insertion in crawl-ref/source/tilesdl.cc at line 795 [10.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 807 [10.19415]

Insertion in crawl-ref/source/tilesdl.cc at line 852 [10.19415]

Insertion in crawl-ref/source/tilesdl.cc at line 1027 [10.19415]

Insertion in crawl-ref/source/tilereg.h at line 163 [10.45514]

Insertion in crawl-ref/source/tilereg.h at line 167 [10.45514]

Insertion in crawl-ref/source/tilereg.h at line 169 [10.45514]

Insertion in crawl-ref/source/tilereg.cc at line 146 [10.54399]

Deletion in crawl-ref/source/tilereg.cc at line 167 [10.54399]

Replacement in crawl-ref/source/tilereg.cc at line 759 [10.54399]

Replacement in crawl-ref/source/tilereg.cc at line 762 [10.54399]

Deletion in crawl-ref/source/tilereg.cc at line 2122 [10.54399]

Replacement in crawl-ref/source/tilereg.cc at line 2345 [10.54399]

Insertion in crawl-ref/source/tilereg.cc at line 2375 [10.54399]

Insertion in crawl-ref/source/tilereg.cc at line 2409 [10.54399]

Replacement in crawl-ref/source/tilereg.cc at line 2562 [10.54399]

Replacement in crawl-ref/source/tilereg.cc at line 2610 [10.54399]

Deletion in crawl-ref/source/libgui.h at line 18 [8.5789586]

Deletion in crawl-ref/source/libgui.cc at line 49 [8.5793336]

Replacement in crawl-ref/source/libgui.cc at line 292 [8.5793336]

Replacement in crawl-ref/source/libgui.cc at line 297 [8.5793336]

Replacement in crawl-ref/source/initfile.cc at line 831 [5.2957258]

Deletion in crawl-ref/source/defines.h at line 123 [5.3982910]

Replacement in crawl-ref/source/defines.h at line 126 [5.3982910]

Replacement in crawl-ref/settings/tiles_options.txt at line 4 [14.2785]

Insertion in crawl-ref/settings/tiles_options.txt at line 28 [14.2785]

Insertion in crawl-ref/settings/tiles_options.txt at line 31 [14.2785]

Insertion in crawl-ref/settings/tiles_options.txt at line 46 [14.2785]

Insertion in crawl-ref/settings/tiles_options.txt at line 50 [14.2785]

Insertion in crawl-ref/settings/tiles_options.txt at line 55 [14.2785]

Replacement in crawl-ref/settings/tiles_options.txt at line 63 [14.2785]