fiddlerwoaroof/crawl - Change TOKBONNNPTP2CIEHMMR4QAJZTXYETS55OGGDA6FY6NIMNDYMWJDAC

An attempt at a more comprehensive fix for cursor inconsistencies between

platforms. We'll probably need to tweak this further.

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

Created by dshaligram on December 17, 2006

TOKBONNNPTP2CIEHMMR4QAJZTXYETS55OGGDA6FY6NIMNDYMWJDAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 1924 [3.16817]
B:BD[3.72977] → [3.72977:73008]
```
    _setcursortype(_NOCURSOR);
```
[3.72818]
[3.73008]
```
    cursor_control cs(false);
```
Deletion in crawl-ref/source/view.cc at line 2012 [3.16817]
B:BD[3.74251] → [3.74251:74287]
```
    _setcursortype(_NORMALCURSOR);
```
Replacement in crawl-ref/source/view.cc at line 3326 [3.16817]
B:BD[4.68447] → [4.68447:68482]
```
        _setcursortype(_NOCURSOR);
```
[4.68447]
[3.108515]
```
        cursor_control cs(false);
```
Deletion in crawl-ref/source/view.cc at line 3518 [3.16817]
B:BD[4.75325] → [4.75325:75364]
```
        _setcursortype(_NORMALCURSOR);
```
Insertion in crawl-ref/source/message.cc at line 29 [3.1993826]
[5.253946]
[3.1994365]
```
#include "libutil.h"
```
Replacement in crawl-ref/source/message.cc at line 417 [3.1993826]
B:BD[3.2000776] → [3.2000776:2000807]
```
    _setcursortype(_NOCURSOR);
```
[3.2000776]
[3.2000807]
```
    cursor_control cs(false);
```
Deletion in crawl-ref/source/message.cc at line 452 [3.1993826]
B:BD[3.2001321] → [3.2001321:2001384]
```
    // turn cursor back on
    _setcursortype(_NORMALCURSOR);
```
Insertion in crawl-ref/source/message.cc at line 554 [3.1993826]
[3.2002903]
[3.2002903]
```
    // Turn off the cursor
    cursor_control cursoff(false);
```
Deletion in crawl-ref/source/message.cc at line 560 [3.1993826]
B:BD[3.2002922] → [3.2002922:2002985]
```
        // turn cursor off
        _setcursortype(_NOCURSOR);
```
Deletion in crawl-ref/source/message.cc at line 614 [3.1993826]
B:BD[3.2004702] → [3.2004702:2004773]
```
        // turn cursor back on
        _setcursortype(_NORMALCURSOR);
```
Insertion in crawl-ref/source/menu.cc at line 100 [5.261322]
[5.262240]
[4.565475]
```
    cursor_control cs(false);
    
```
Deletion in crawl-ref/source/libw32c.h at line 17 [3.2475780]
B:BD[3.2476093] → [3.2476093:2476153]
```
#define _NORMALCURSOR   true
#define _NOCURSOR       false
```
Replacement in crawl-ref/source/libw32c.h at line 20 [3.2475780]
B:BD[3.2476206] → [3.2476206:2476241]
```
void _setcursortype(int curstype);
```
[3.2476206]
[3.2476241]
```
void set_cursor_enabled(bool enabled);
bool is_cursor_enabled();
```
Replacement in crawl-ref/source/libw32c.cc at line 435 [3.2476860]
B:BD[3.2486081] → [3.2486081:2486115]
```
void _setcursortype(int curstype)
```
[3.2486008]
[3.2486115]
```
void set_cursor_enabled(bool enabled)
```

Replacement in crawl-ref/source/libw32c.cc at line 438 [3.2476860]

B:BD[2.399] → [2.399:442]

        _setcursortype_internal(curstype);

[2.399]

[3.2486147]

        _setcursortype_internal(enabled);
}
bool is_cursor_enabled()
{
    return (current_cursor);

Replacement in crawl-ref/source/libw32c.cc at line 446 [3.2476860]
B:BD[3.2486151] → [3.2486151:2486194]
```
void _setcursortype_internal(int curstype)
```
[3.2486151]
[3.2486194]
```
void _setcursortype_internal(bool curstype)
```
Replacement in crawl-ref/source/libw32c.cc at line 451 [3.2476860]
B:BD[3.2486260] → [3.2486260:2486274]
```
      return;
```
[3.2486260]
[3.2486274]
```
       return;
```
Replacement in crawl-ref/source/libw32c.cc at line 463 [3.2476860]
B:BD[3.2486552] → [3.2486552:2486578]
```
      gotoxy(cx+1, cy+1);
```
[3.2486552]
[3.2486578]
```
       gotoxy(cx+1, cy+1);
```

Replacement in crawl-ref/source/libutil.h at line 162 [3.2493627]

B:BD[4.620471] → [2.874:966]

    cursor_control(bool cs) 
        : cstate(cs), smartcstate( is_smart_cursor_enabled() )

[4.620471]

[2.966]

    cursor_control(bool cursor_enabled) 
        : cstate(is_cursor_enabled()), smartcstate(is_smart_cursor_enabled())

Replacement in crawl-ref/source/libutil.h at line 166 [3.2493627]
∅:D[2.1008] → [4.620515:620570]
B:BD[4.620515] → [4.620515:620570]
```
        _setcursortype(cs? _NORMALCURSOR : _NOCURSOR);
```
[2.1008]
[4.620570]
```
        set_cursor_enabled(cursor_enabled);
```
Replacement in crawl-ref/source/libutil.h at line 169 [3.2493627]
B:BD[4.620600] → [4.620600:620659]
```
        _setcursortype(cstate? _NOCURSOR : _NORMALCURSOR);
```
[4.620600]
[2.1009]
```
        set_cursor_enabled(cstate);
```
Deletion in crawl-ref/source/libunix.h at line 7 [3.2548819]
B:BD[3.2548905] → [3.2548905:2548949]
```
#define _NORMALCURSOR 1
#define _NOCURSOR 0
```
Deletion in crawl-ref/source/libunix.h at line 31 [3.2548819]
B:BD[3.2549581] → [3.2549581:2549616]
```
void _setcursortype(int curstype);
```
Insertion in crawl-ref/source/libunix.h at line 41 [3.2548819]
[4.630041]
[2.1077]
```
void set_cursor_enabled(bool enabled);
bool is_cursor_enabled();
```
Insertion in crawl-ref/source/libunix.cc at line 71 [3.2550041]
[3.2552439]
[3.2552439]
```
static bool cursor_is_enabled = true;
```

Insertion in crawl-ref/source/libunix.cc at line 406 [3.2550041]

[3.2566476]

void set_cursor_enabled(bool enabled)
{
    curs_set(cursor_is_enabled = enabled);
}

Replacement in crawl-ref/source/libunix.cc at line 411 [3.2550041]
B:BD[3.2566477] → [3.2566477:2566511]
```
void _setcursortype(int curstype)
```
[3.2566477]
[3.2566511]
```
bool is_cursor_enabled()
```
Replacement in crawl-ref/source/libunix.cc at line 413 [3.2550041]
B:BD[3.2566513] → [3.2566513:2566537]
```
    curs_set(curstype);
```
[3.2566513]
[3.2566537]
```
    return (cursor_is_enabled);
```

Replacement in crawl-ref/source/libdos.h at line 1 [4.630690]

B:BD[4.630690] → [4.630691:630760]

B:BD[4.630760] → [2.1181:1287]

∅:D[2.1287] → [4.630760:630768]

B:BD[4.630760] → [4.630760:630768]

#ifndef __LIBDOS_H__
#define __LIBDOS_H__
void init_libdos();
inline void enable_smart_cursor(bool ) { }
inline bool is_smart_cursor_enabled()  { return (false); }
#endif

[4.630690]

#ifndef __LIBDOS_H__
#define __LIBDOS_H__
void init_libdos();
inline void enable_smart_cursor(bool ) { }
inline bool is_smart_cursor_enabled()  { return (false); }
void set_cursor_enabled(bool enabled);
bool is_cursor_enabled();
#endif

Replacement in crawl-ref/source/libdos.cc at line 1 [4.630803]

B:BD[4.630803] → [4.630804:631301]

/*
 *  File:       libdos.cc
 *  Summary:    Functions for DOS support.
 *  Written by: Darshan Shaligram
 *
 *  Added for Crawl Reference by $Author: nlanza $ on $Date: 2006-09-26T03:22:57.300929Z $
 */
// Every .cc must include AppHdr or bad things happen.
#include "AppHdr.h"
#include <termios.h>
void init_libdos()
{
    struct termios charmode;
    tcgetattr (0, &charmode);
    // Ignore Ctrl-C
    charmode.c_lflag &= ~ISIG;
    tcsetattr (0, TCSANOW, &charmode);
}

[4.630803]

/*
 *  File:       libdos.cc
 *  Summary:    Functions for DOS support.
 *  Written by: Darshan Shaligram
 *
 *  Added for Crawl Reference by $Author: nlanza $ on $Date: 2006-09-26T03:22:57.300929Z $
 */
// Every .cc must include AppHdr or bad things happen.
#include "AppHdr.h"
#include <termios.h>
#include <conio.h>
static bool cursor_is_enabled = true;
void init_libdos()
{
    struct termios charmode;
    tcgetattr (0, &charmode);
    // Ignore Ctrl-C
    charmode.c_lflag &= ~ISIG;
    tcsetattr (0, TCSANOW, &charmode);
}
void set_cursor_enabled(bool enabled)
{
    cursor_is_enabled = enabled;
    _setcursortype( enabled? _NORMALCURSOR : _NOCURSOR );
}
bool is_cursor_enabled()
{
    return (cursor_is_enabled);
}

Replacement in crawl-ref/source/acr.cc at line 862 [3.4397395]

B:BD[3.4420554] → [4.1259537:1259576]

    command_type cmd = get_next_cmd();

[3.4420554]

[3.4420577]

    {
        // Enable the cursor to read input. The cursor stays on while
        // the command is being processed, so subsidiary prompts
        // shouldn't need to turn it on explicitly.
        cursor_control con(true);
        command_type cmd = get_next_cmd();

Replacement in crawl-ref/source/acr.cc at line 869 [3.4397395]

B:BD[3.4420578] → [4.1259577:1259792]

    // [dshaligram] If get_next_cmd encountered a Lua macro binding, your turn
    // may be ended by the first invoke of the macro.
    if (!you.turn_is_over && cmd != CMD_NEXT_CMD)
        process_command( cmd );

[3.4420578]

[3.4420657]

        // [dshaligram] If get_next_cmd encountered a Lua macro
        // binding, your turn may be ended by the first invoke of the
        // macro.
        if (!you.turn_is_over && cmd != CMD_NEXT_CMD)
            process_command( cmd );
    }

Replacement in crawl-ref/source/acr.cc at line 876 [3.4397395]
B:BD[3.4420658] → [4.1259793:1259823]
∅:D[4.1259823] → [3.4421146:4421147]
B:BD[3.4421146] → [3.4421146:4421147]
```
    if ( you.turn_is_over ) {
```
[3.4420658]
[4.1259824]
```
    if (you.turn_is_over)
    {
```
Insertion in crawl-ref/source/acr.cc at line 2831 [3.4397395]
[5.552866]
[4.1280368]
```
    set_cursor_enabled(false);
```

An attempt at a more comprehensive fix for cursor inconsistencies between

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 1924 [3.16817]

Deletion in crawl-ref/source/view.cc at line 2012 [3.16817]

Replacement in crawl-ref/source/view.cc at line 3326 [3.16817]

Deletion in crawl-ref/source/view.cc at line 3518 [3.16817]

Insertion in crawl-ref/source/message.cc at line 29 [3.1993826]

Replacement in crawl-ref/source/message.cc at line 417 [3.1993826]

Deletion in crawl-ref/source/message.cc at line 452 [3.1993826]

Insertion in crawl-ref/source/message.cc at line 554 [3.1993826]

Deletion in crawl-ref/source/message.cc at line 560 [3.1993826]

Deletion in crawl-ref/source/message.cc at line 614 [3.1993826]

Insertion in crawl-ref/source/menu.cc at line 100 [5.261322]

Deletion in crawl-ref/source/libw32c.h at line 17 [3.2475780]

Replacement in crawl-ref/source/libw32c.h at line 20 [3.2475780]

Replacement in crawl-ref/source/libw32c.cc at line 435 [3.2476860]

Replacement in crawl-ref/source/libw32c.cc at line 438 [3.2476860]

Replacement in crawl-ref/source/libw32c.cc at line 446 [3.2476860]

Replacement in crawl-ref/source/libw32c.cc at line 451 [3.2476860]

Replacement in crawl-ref/source/libw32c.cc at line 463 [3.2476860]

Replacement in crawl-ref/source/libutil.h at line 162 [3.2493627]

Replacement in crawl-ref/source/libutil.h at line 166 [3.2493627]

Replacement in crawl-ref/source/libutil.h at line 169 [3.2493627]

Deletion in crawl-ref/source/libunix.h at line 7 [3.2548819]

Deletion in crawl-ref/source/libunix.h at line 31 [3.2548819]

Insertion in crawl-ref/source/libunix.h at line 41 [3.2548819]

Insertion in crawl-ref/source/libunix.cc at line 71 [3.2550041]

Insertion in crawl-ref/source/libunix.cc at line 406 [3.2550041]

Replacement in crawl-ref/source/libunix.cc at line 411 [3.2550041]

Replacement in crawl-ref/source/libunix.cc at line 413 [3.2550041]

Replacement in crawl-ref/source/libdos.h at line 1 [4.630690]

Replacement in crawl-ref/source/libdos.cc at line 1 [4.630803]

Replacement in crawl-ref/source/acr.cc at line 862 [3.4397395]

Replacement in crawl-ref/source/acr.cc at line 869 [3.4397395]

Replacement in crawl-ref/source/acr.cc at line 876 [3.4397395]

Insertion in crawl-ref/source/acr.cc at line 2831 [3.4397395]