diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2007-02-22 17:35:14 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2007-02-22 17:35:14 +0000 |
| commit | 3af640487fa3a7033a30acb9c4b5fc240cb910dc (patch) | |
| tree | 7084228150dc286fe2a627a9bd490f859240d2f5 /winsup/cygwin/fhandler_console.cc | |
| parent | eef57fe1e33dddda8840188a62365393a683fb54 (diff) | |
| download | cygnal-3af640487fa3a7033a30acb9c4b5fc240cb910dc.tar.gz cygnal-3af640487fa3a7033a30acb9c4b5fc240cb910dc.tar.bz2 cygnal-3af640487fa3a7033a30acb9c4b5fc240cb910dc.zip | |
* fhandler_console.cc (fhandler_console::read): Drop 9x specific
handling of AltGr key.
* mmap.cc: Take NT for granted throughout.
* wincap.cc: Remove map_view_of_file_ex_sucks, altgr_is_ctrl_alt,
has_working_copy_on_write, share_mmaps_only_by_name,
virtual_protect_works_on_shared_pages, has_mmap_alignment_bug and
has_working_virtual_lock throughout.
* wincap.h: Ditto.
Diffstat (limited to 'winsup/cygwin/fhandler_console.cc')
| -rw-r--r-- | winsup/cygwin/fhandler_console.cc | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc index 13501ddab..4bd04fbd0 100644 --- a/winsup/cygwin/fhandler_console.cc +++ b/winsup/cygwin/fhandler_console.cc @@ -385,17 +385,9 @@ fhandler_console::read (void *pv, size_t& buflen) part is to distinguish whether the right Alt key should be recognized as Alt, or as AltGr. */ bool meta; - if (wincap.altgr_is_ctrl_alt ()) - /* WinNT: AltGr is reported as Ctrl+Alt, and Ctrl+Alt is - treated just like AltGr. However, if Ctrl+Alt+key generates - an ASCII control character, interpret is as META. */ - meta = (control_key_state & ALT_PRESSED) != 0 - && ((control_key_state & CTRL_PRESSED) == 0 - || ((signed char) ich >= 0 && ich <= 0x1f || ich == 0x7f)); - else - /* Win9x: there's no way to distinguish Alt from AltGr, so rely - on dev_state->meta_mask heuristic (see fhandler_console constructor). */ - meta = (control_key_state & dev_state->meta_mask) != 0; + meta = (control_key_state & ALT_PRESSED) != 0 + && ((control_key_state & CTRL_PRESSED) == 0 + || ((signed char) ich >= 0 && ich <= 0x1f || ich == 0x7f)); if (!meta) toadd = tmp + 1; else if (dev_state->metabit) |