X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fkbmap.C;h=9ac6de0943ca555fb82005b12181d42516a90765;hb=fe390e9da1538e20eabbc98977d845295f8e563d;hp=7a147621d801f04f33d16b91f9968ea751cb8a10;hpb=39eec46bd31753afaec103fcc45f9d6ba75bdb3e;p=lyx.git diff --git a/src/kbmap.C b/src/kbmap.C index 7a147621d8..9ac6de0943 100644 --- a/src/kbmap.C +++ b/src/kbmap.C @@ -1,84 +1,54 @@ -/* This file is part of - * ====================================================== +/** + * \file kbmap.C + * Copyright 1995-2002 the LyX Team + * Read the file COPYING * - * LyX, The Document Processor - * - * Copyright 1995 Matthias Ettrich - * Copyright 1995-2001 The LyX Team. - * - * ====================================================== */ + * \author unknown + * \author John Levon + */ #include -#include - -#ifdef __GNUG__ -#pragma implementation -#endif - #include "kbmap.h" +#include "lfuns.h" #include "kbsequence.h" #include "debug.h" using std::endl; -// The only modifiers that we handle. We want to throw away things -// like NumLock. -enum { ModsMask = ShiftMask | ControlMask | Mod1Mask }; - - -string const kb_keymap::printKeysym(unsigned int key, unsigned int mod) +string const kb_keymap::printKeysym(LyXKeySymPtr key, + key_modifier::state mod) { string buf; - mod &= ModsMask; - - char const * const s = XKeysymToString(key); - - if (mod & ShiftMask) buf += "S-"; - if (mod & ControlMask) buf += "C-"; - if (mod & Mod1Mask) buf += "M-"; - if (s) buf += s; - return buf; -} + string const s = key->getSymbolName(); -char kb_keymap::getiso(unsigned int c) -{ - switch (c & 0x0000FF00) { - // latin 1 byte 3 = 0 - case 0x00000000: break; - // latin 2 byte 3 = 1 - case 0x00000100: - // latin 3 byte 3 = 2 - case 0x00000200: - // latin 4 byte 3 = 3 - case 0x00000300: - // latin 8 byte 3 = 18 (0x12) - case 0x00001200: - // latin 9 byte 3 = 19 (0x13) - case 0x00001300: - c &= 0x000000FF; - break; - default: - c = 0; - } - return c; + if (mod & key_modifier::shift) + buf += "S-"; + if (mod & key_modifier::ctrl) + buf += "C-"; + if (mod & key_modifier::alt) + buf += "M-"; + + buf += s; + return buf; } + string const kb_keymap::printKey(kb_key const & key) const { - return printKeysym(key.code, key.mod & 0xffff); + return printKeysym(key.code, key.mod.first); } -string::size_type kb_keymap::bind(string const & seq, kb_action action) +string::size_type kb_keymap::bind(string const & seq, int action) { if (lyxerr.debugging(Debug::KBMAP)) { lyxerr << "BIND: Sequence `" << seq << "' Action `" - << action << "'" << endl; + << action << '\'' << endl; } - + kb_sequence k(0, 0); string::size_type const res = k.parse(seq); @@ -94,8 +64,8 @@ string::size_type kb_keymap::bind(string const & seq, kb_action action) } -kb_action kb_keymap::lookup(unsigned int key, - unsigned int mod, kb_sequence * seq) const +int kb_keymap::lookup(LyXKeySymPtr key, + key_modifier::state mod, kb_sequence * seq) const { if (table.empty()) { seq->curmap = seq->stdmap; @@ -103,14 +73,13 @@ kb_action kb_keymap::lookup(unsigned int key, return LFUN_UNKNOWN_ACTION; } - //suppress modifier bits we do not handle - mod &= ModsMask; + Table::const_iterator end = table.end(); + for (Table::const_iterator cit = table.begin(); cit != end; ++cit) { + key_modifier::state mask(cit->mod.second); + key_modifier::state check = + static_cast(mod & ~mask); - for (Table::const_iterator cit = table.begin(); - cit != table.end(); ++cit) { - unsigned int const msk1 = cit->mod & 0xffff; - unsigned int const msk0 = (cit->mod >> 16) & 0xffff; - if (cit->code == key && (mod & ~msk0) == msk1) { + if (*(cit->code) == *key && cit->mod.first == check) { // match found if (cit->table.get()) { // this is a prefix key - set new map @@ -135,8 +104,8 @@ kb_action kb_keymap::lookup(unsigned int key, string const kb_keymap::print() const { string buf; - for (Table::const_iterator cit = table.begin(); - cit != table.end(); ++cit) { + Table::const_iterator end = table.end(); + for (Table::const_iterator cit = table.begin(); cit != end; ++cit) { buf += printKey((*cit)); buf += ' '; } @@ -144,16 +113,21 @@ string const kb_keymap::print() const } -void kb_keymap::defkey(kb_sequence * seq, kb_action action, unsigned int r) +void kb_keymap::defkey(kb_sequence * seq, int action, unsigned int r) { - unsigned int const code = seq->sequence[r]; - if (code == NoSymbol) return; + LyXKeySymPtr code = seq->sequence[r]; + if (!code->isOK()) + return; - unsigned int const modmsk = seq->modifiers[r]; + key_modifier::state const mod1 = seq->modifiers[r].first; + key_modifier::state const mod2 = seq->modifiers[r].second; // check if key is already there - for (Table::iterator it = table.begin(); it != table.end(); ++it) { - if (code == it->code && modmsk == it->mod) { + Table::iterator end = table.end(); + for (Table::iterator it = table.begin(); it != end; ++it) { + if (*(code) == *(it->code) + && mod1 == it->mod.first + && mod2 == it->mod.second) { // overwrite binding if (r + 1 == seq->length()) { lyxerr[Debug::KBMAP] @@ -161,8 +135,8 @@ void kb_keymap::defkey(kb_sequence * seq, kb_action action, unsigned int r) << seq->print() << "' is overriding old binding..." << endl; - if (it->table.get()) { - it->table.reset(0); + if (it->table.get()) { + it->table.reset(); } it->action = action; return; @@ -177,13 +151,13 @@ void kb_keymap::defkey(kb_sequence * seq, kb_action action, unsigned int r) } } } - + Table::iterator newone = table.insert(table.end(), kb_key()); newone->code = code; - newone->mod = modmsk; + newone->mod = seq->modifiers[r]; if (r + 1 == seq->length()) { newone->action = action; - newone->table.reset(0); + newone->table.reset(); return; } else { newone->table.reset(new kb_keymap); @@ -193,7 +167,7 @@ void kb_keymap::defkey(kb_sequence * seq, kb_action action, unsigned int r) } -string const kb_keymap::findbinding(kb_action act, string const & prefix) const +string const kb_keymap::findbinding(int act, string const & prefix) const { string res; if (table.empty()) return res; @@ -205,9 +179,9 @@ string const kb_keymap::findbinding(kb_action act, string const & prefix) const res += cit->table->findbinding(act, prefix + printKey((*cit)) - + " "); + + ' '); } else if (cit->action == act) { - res += "["; + res += '['; res += prefix + printKey((*cit)); res += "] "; }