Changeset 389

Show
Ignore:
Timestamp:
07/27/07 19:55:08 (1 year ago)
Author:
ajps
Message:

Removed the x11 "keycode translations" (i.e. rewriting "_]3244" type
sequences to "\[PgUp?]" type sequences) for '-' and '=' from the pref
files to prevent x11's automatic macros from breaking those keys.
Closes #265 (for now).

Also found a bug in the "Interact with macros" menu where the echoing of
macros as you typed them would be messed up if any "keycode
translations" took place, also now fixed.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/angband-3.0.8/lib/pref/pref-x11.prf

    r54 r389  
    158158T:,:2C:3C 
    159159T:<:2C:3C 
    160 T:-:2D:3D 
    161 T:=:2D:3D 
    162160T:.:2E:3E 
    163161T:>:2E:3E 

  • branches/angband-3.0.8/src/cmd4.c

    r384 r389  
    29532953 
    29542954        int n = 0; 
    2955  
    2956         char tmp[1024]; 
    2957  
     2955        int curs_x, curs_y; 
     2956 
     2957        char tmp[1024] = ""; 
     2958 
     2959        /* Get cursor position */ 
     2960        Term_locate(&curs_x, &curs_y); 
    29582961 
    29592962        /* Flush */ 
    …… 
    29672970        ch = inkey(); 
    29682971 
    2969         text_out_hook = text_out_to_screen; 
    29702972 
    29712973        /* Read the pattern */ 
    …… 
    29762978                buf[n] = 0; 
    29772979 
    2978                 /* echo */ 
    2979                 ascii_to_text(tmp, sizeof(tmp), buf+n-1); 
    2980                 text_out(tmp); 
    2981  
     2980                /* Get representation of the sequence so far */ 
     2981                ascii_to_text(tmp, sizeof(tmp), buf); 
     2982 
     2983                /* Echo it after the prompt */ 
     2984                Term_erase(curs_x, curs_y, 80); 
     2985                Term_gotoxy(curs_x, curs_y); 
     2986                Term_addstr(-1, TERM_WHITE, tmp); 
     2987                 
    29822988                /* Do not process macros */ 
    29832989                inkey_base = TRUE;