fiddlerwoaroof/crawl - Change BFYHDL4EHSPKKC6EPKDRPESHYAA2WFKC6RXQIRRTSSTF3Z2QPVCAC

Add mouseclick handling for menus in tiles:

L-click will page down, R-click is treated like Escape.

Change L-click on player from single turn search to (the more useful, I think) pickup, and add L-click to list of alternatives to call the pickup menu, so that clicking on the player icon twice will directly open the pickup menu.

This is getting complicated: there are so few combinations of mouseclicks possible, but because they do different things under different circumstances this really needs to be documented somehow.

Fix coloured hp/mp bars not updating during running. (During travel the map needs to be redrawn anyway, so also having to redraw the bars doesn't hurt any.)

Also fix list_rotten to be readable from init.txt (and default to true).

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

Created by j-p-e-g on January 24, 2008

BFYHDL4EHSPKKC6EPKDRPESHYAA2WFKC6RXQIRRTSSTF3Z2QPVCAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/wininit.txt at line 16 [5.2]
B:BD[5.212] → [5.212:250]
```
Tile:WindowTop=40
Tile:WindowLeft=193
```
[5.212]
[5.250]
```
Tile:WindowTop=64
Tile:WindowLeft=273
```
Replacement in crawl-ref/source/output.cc at line 122 [6.1088282]
B:BD[3.3121] → [3.3121:3164]
```
    if (you.running > 1 && val != max_val)
```
[3.3121]
[3.3164]
```
    if (you.running > 1 && is_resting() && val != max_val)
```
Insertion in crawl-ref/source/menu.cc at line 179 [8.261322]
[7.566131]
[7.566131]
```
#ifdef USE_TILE
    case CK_MOUSE_B2:
#endif
```
Insertion in crawl-ref/source/menu.cc at line 186 [8.261322]
[7.566247]
[7.566247]
```
#ifdef USE_TILE
    case CK_MOUSE_B1:
#endif
```

Replacement in crawl-ref/source/libgui.cc at line 1365 [5.5793336]

B:BD[9.5603] → [2.6441:6490]

                            desc += "Throw (t)";

[9.5603]

[9.5651]

                        {
                            const item_def *weapon = you.weapon();
                            if (weapon && you.inv[ix].launched_by(*weapon))
                                desc += "Fire (f)";
                            else
                                desc += "Throw (t)";

Insertion in crawl-ref/source/libgui.cc at line 1372 [5.5793336]
[9.5686]
[9.5686]
```
                        }
```

Replacement in crawl-ref/source/libgui.cc at line 1464 [5.5793336]

B:BD[10.3325] → [10.3325:3366]

                        desc += ")" EOL;

[10.3325]

[10.3366]

                        desc += ")";
                        
            if (igrd[you.x_pos][you.y_pos] != NON_ITEM)
                desc += EOL "[L-Click] Pick up items (g)";

Deletion in crawl-ref/source/libgui.cc at line 1469 [5.5793336]
B:BD[10.3367] → [2.6908:6959]
∅:D[2.6959] → [10.3422:3423]
B:BD[10.3422] → [10.3422:3423]
```
            desc += EOL "[L-Click] Search 1 turn";
```
Replacement in crawl-ref/source/libgui.cc at line 1659 [5.5793336]
B:BD[10.4286] → [10.4286:4334]
```
            // spend one turn resting/searching
```
[10.4286]
[10.4334]
```
            // pick up items
```
Replacement in crawl-ref/source/libgui.cc at line 1661 [5.5793336]
B:BD[10.4358] → [10.4358:4386]
```
                return 's';
```
[10.4358]
[10.4386]
```
                return 'g';
```
Replacement in crawl-ref/source/libgui.cc at line 1847 [5.5793336]
B:BD[5.5837366] → [11.182995:183030]
```
    return ck_tr[ keyin - CK_UP ];
```
[5.5837366]
[5.5837398]
```
        return ck_tr[ keyin - CK_UP ];
        
```
Replacement in crawl-ref/source/libgui.cc at line 1850 [5.5793336]
B:BD[5.5837426] → [11.183031:183047]
```
    return '.';
```
[5.5837426]
[5.5837439]
```
        return '.';
        
```
Insertion in crawl-ref/source/items.cc at line 23 [6.2584728]
[6.2585396]
[8.342701]
```
#ifdef USE_TILE
 #include "cio.h"
#endif
```
Insertion in crawl-ref/source/items.cc at line 1226 [6.2584728]
[12.16992]
[6.2610948]
```
#ifndef USE_TILE
```
Insertion in crawl-ref/source/items.cc at line 1228 [6.2584728]
[6.2610982]
[6.2610982]
```
#else
                keyin = getch_ck();
#endif
```

Replacement in crawl-ref/source/items.cc at line 1233 [6.2584728]

B:BD[6.2610997] → [7.634949:635027]

            if (keyin == '*' || keyin == '?' || keyin == ',' || keyin == 'g')

[6.2610997]

[8.352184]

            if (keyin == '*' || keyin == '?' || keyin == ',' || keyin == 'g'
#ifdef USE_TILE
                || keyin == CK_MOUSE_B1
#endif
                )

Replacement in crawl-ref/source/initfile.cc at line 654 [6.2957258]
B:BD[13.320] → [9.7515:7551]
```
    list_rotten            = false;
```
[13.320]
[7.792387]
```
    list_rotten            = true;
```

Insertion in crawl-ref/source/initfile.cc at line 1780 [6.2957258]

[13.450]

    }
    else if (key == "list_rotten")
    {
        list_rotten = read_bool( field, list_rotten );

Replacement in crawl-ref/source/acr.cc at line 3342 [6.4397395]
B:BD[5.5938993] → [5.5938993:5939008]
```
#ifdef USE_X11
```
[5.5938993]
[5.5939008]
```
 #ifdef USE_X11
```
Replacement in crawl-ref/source/acr.cc at line 3344 [6.4397395]
B:BD[5.5939029] → [5.5939029:5939036]
```
#endif
```
[5.5939029]
[5.5939036]
```
 #endif
```
Replacement in crawl-ref/init.txt at line 179 [6.4830895]
B:BD[14.3473] → [9.10481:10502]
```
# list_rotten = true
```
[14.3473]
[15.824]
```
# list_rotten = false
```

Replacement in crawl-ref/docs/crawl_options.txt at line 78 [16.63392]

B:BD[4.9405] → [4.9405:9464]

		tile_upstairs_col, tile_spec_feature_col, tile_trap_col,

[4.9405]

[4.9464]

		tile_upstairs_col, tile_feature_col, tile_trap_col,

Replacement in crawl-ref/docs/crawl_options.txt at line 1008 [16.63392]
B:BD[9.10593] → [9.10593:10613]
```
list_rotten = false
```
[9.10593]
[9.10613]
```
list_rotten = true
```

Add mouseclick handling for menus in tiles:

Dependencies

In channels

Change contents

Replacement in crawl-ref/wininit.txt at line 16 [5.2]

Replacement in crawl-ref/source/output.cc at line 122 [6.1088282]

Insertion in crawl-ref/source/menu.cc at line 179 [8.261322]

Insertion in crawl-ref/source/menu.cc at line 186 [8.261322]

Replacement in crawl-ref/source/libgui.cc at line 1365 [5.5793336]

Insertion in crawl-ref/source/libgui.cc at line 1372 [5.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1464 [5.5793336]

Deletion in crawl-ref/source/libgui.cc at line 1469 [5.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1659 [5.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1661 [5.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1847 [5.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1850 [5.5793336]

Insertion in crawl-ref/source/items.cc at line 23 [6.2584728]

Insertion in crawl-ref/source/items.cc at line 1226 [6.2584728]

Insertion in crawl-ref/source/items.cc at line 1228 [6.2584728]

Replacement in crawl-ref/source/items.cc at line 1233 [6.2584728]

Replacement in crawl-ref/source/initfile.cc at line 654 [6.2957258]

Insertion in crawl-ref/source/initfile.cc at line 1780 [6.2957258]

Replacement in crawl-ref/source/acr.cc at line 3342 [6.4397395]

Replacement in crawl-ref/source/acr.cc at line 3344 [6.4397395]

Replacement in crawl-ref/init.txt at line 179 [6.4830895]

Replacement in crawl-ref/docs/crawl_options.txt at line 78 [16.63392]

Replacement in crawl-ref/docs/crawl_options.txt at line 1008 [16.63392]