X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fkbsequence.C;h=a00c3ce44a61052734f65621a4835ca55d2de116;hb=e3188e8869e8ee1821b4db444b4a82e101ae28f5;hp=7c661929c24b2dce3d9baa7c74cf1898a432cc4d;hpb=737cd9d8f3c2c075474f18779e335fe7a02535a6;p=lyx.git diff --git a/src/kbsequence.C b/src/kbsequence.C index 7c661929c2..a00c3ce44a 100644 --- a/src/kbsequence.C +++ b/src/kbsequence.C @@ -1,16 +1,12 @@ -/* This file is part of - * ====================================================== - * - * LyX, The Document Processor - * - * Copyright 1995 Matthias Ettrich - * Copyright 1995-2001 The LyX Team. +/** + * \file kbsequence.C + * Copyright 1995-2002 the LyX Team + * Read the file COPYING * - * ====================================================== */ + * \author John Levon + */ #include -//#include -#include #include "gettext.h" @@ -18,105 +14,64 @@ #pragma implementation #endif +#include "frontends/mouse_state.h" +#include "frontends/LyXKeySymFactory.h" #include "kbsequence.h" #include "kbmap.h" +#include "commandtags.h" #include "debug.h" -using std::endl; +using std::make_pair; -// The only modifiers that we handle. We want to throw away things -// like NumLock. -enum { ModsMask = ShiftMask | ControlMask | Mod1Mask }; - -// === static functions =================================================== - - -/* ---F+------------------------------------------------------------------ *\ - Function : printKeysym - Called by : kb_sequence::print and printKeyMap. RVDK_PATCH_5 - Purpose : prints a keysym, including modifiers. - Parameters: key - keysym - mod - modifiers - buf - string where the result goes - maxlen - length of string (including '\0') - Returns : length of printed string if ok, 0 otherwise. -\* ---F------------------------------------------------------------------- */ -extern -void printKeysym(unsigned int key, unsigned int mod, string & buf); - - -// === kb_sequence methods ================================================ - -/* ---F+------------------------------------------------------------------ *\ - Function : kb_sequence::addkey - Called by : [user] - Purpose : add a key to the sequence, look up in map and return action - Parameters: key - keysym of key - mod - modifier mask - nmod - modifier veto mask (unused now) - Returns : action or -1 if error (no map defined or key not found) -\* ---F------------------------------------------------------------------- */ - -int kb_sequence::addkey(unsigned int key, - unsigned int mod, unsigned int nmod /*= 0*/) +int kb_sequence::addkey(LyXKeySymPtr key, + key_modifier::state mod, key_modifier::state nmod) { - //lyxerr << "kb_sequence::addkey: length is [" << length << "]\n" - // << "kb_sequence::addkey::key == [" << key << "]\n" - // << "kb_sequence::addkey::mod == [" << mod << "]" << endl; - - if (length <= 0) { - length = 0; + // adding a key to a deleted sequence + // starts a new sequence + if (deleted_) { + deleted_ = false; sequence.clear(); modifiers.clear(); } - modifiers.push_back(mod + (nmod << 16)); + modifiers.push_back(make_pair(mod, nmod)); sequence.push_back(key); - ++length; - if (curmap) + if (curmap) { return curmap->lookup(key, mod, this); - - return -1; -} + } + return LFUN_UNKNOWN_ACTION; +} -/* ---F+------------------------------------------------------------------ *\ - Function : kb_sequence::parse - Called by : [user] - Purpose : parse a string that holds a key sequence and add the keys - Parameters: s - string holding the key sequence - Returns : string::npos if ok, error pos if error - Note : Keys must be separated with whitespace; - Use the keysym names used by XStringToKeysym - Prefixes are S-, C-, M- for shift, control, meta -\* ---F------------------------------------------------------------------- */ string::size_type kb_sequence::parse(string const & s) { if (s.empty()) return 1; string::size_type i = 0; - unsigned int mod = 0, nmod = 0; + key_modifier::state mod = key_modifier::none; + key_modifier::state nmod = key_modifier::none; + while (i < s.length()) { if (s[i] == ' ') ++i; if (i >= s.length()) break; - - if (i + 1 < s.length() && s[i + 1] == '-') { + + if (i + 1 < s.length() && s[i + 1] == '-') { switch (s[i]) { case 's': case 'S': - mod |= ShiftMask; + mod |= key_modifier::shift; i += 2; continue; case 'c': case 'C': - mod |= ControlMask; + mod |= key_modifier::ctrl; i += 2; continue; case 'm': case 'M': - mod |= Mod1Mask; + mod |= key_modifier::alt; i += 2; continue; default: @@ -126,15 +81,15 @@ string::size_type kb_sequence::parse(string const & s) && s[i + 2] == '-') { switch (s[i + 1]) { case 's': case 'S': - nmod |= ShiftMask; + nmod |= key_modifier::shift; i += 3; continue; case 'c': case 'C': - nmod |= ControlMask; + nmod |= key_modifier::ctrl; i += 3; continue; case 'm': case 'M': - nmod |= Mod1Mask; + nmod |= key_modifier::alt; i += 3; continue; default: @@ -145,24 +100,23 @@ string::size_type kb_sequence::parse(string const & s) string::size_type j = i; for (; j < s.length() && s[j] != ' '; ++j) tbuf += s[j]; // (!!!check bounds :-) - - KeySym key = XStringToKeysym(tbuf.c_str()); - if (key == NoSymbol) { - lyxerr[Debug::KBMAP] - << "kbmap.C: No such keysym: " - << tbuf << endl; + + LyXKeySymPtr key(LyXKeySymFactory::create()); + key->init(tbuf); + + if ( ! key->isOK() ) { return j; } + i = j; - + addkey(key, mod, nmod); - mod = 0; - nmod = 0; + mod = key_modifier::none; } } - + // empty sequence? - if (!length) + if (sequence.size() == 0) return 0; // everything is fine @@ -170,151 +124,70 @@ string::size_type kb_sequence::parse(string const & s) } -/* ---F+------------------------------------------------------------------ *\ - Function : kb_sequence::print - Called by : [user] - Purpose : print the currently defined sequence into a string - Parameters: buf - string where the result goes - when_defined - only print when sequence is real: length > 0. - Returns : 0, if ok, -1 if string too long -\* ---F------------------------------------------------------------------- */ - -int kb_sequence::print(string & buf, bool when_defined) const +string const kb_sequence::print() const { - //lyxerr << "kb_sequence::print: length is [" << length << "]" << endl; - - KeySym key; - unsigned int mod; - int l = length; - if (l < 0 && !when_defined ) l = -l; - - for (int i = 0; i < l; ++i) { - key = sequence[i]; - mod = modifiers[i] & 0xffff; - //lyxerr << "kb_sequence::sequence[" << i << "] == [" << key << "]\n" - // << "kb_sequence::modifiers[" << i << "] == [" << mod << "]" - // << endl; - - printKeysym(key, mod, buf); // RVDK_PATCH_5 - - if (i + 1 < l) { // append a blank + string buf; + + //if (deleted_) + // return buf; + + KeySequence::size_type i, length = sequence.size(); + + for (i = 0; i < length; ++i) { + buf += kb_keymap::printKeysym(sequence[i], modifiers[i].first); + + // append a blank + if (i + 1 < length) { buf += ' '; } } - return 0; + return buf; } -/* ---F+------------------------------------------------------------------ *\ - Function : kb_sequence::printOptions - Called by : [user] - Purpose : print the available key options from the current state in the - sequence. RVDK_PATCH_5 - Parameters: buf - string where the result goes - maxlen - length of string (including '\0') - Returns : 0, if ok, -1 if string too long -\* ---F------------------------------------------------------------------- */ - -int kb_sequence::printOptions(string & buf) const +string const kb_sequence::printOptions() const { - print(buf, true); - - if (!curmap) return -1; + string buf; + + buf += print(); + + if (!curmap) + return buf; + buf += _(" options: "); - curmap->print(buf); - return 0; + buf += curmap->print(); + return buf; } -/* ---F+------------------------------------------------------------------ *\ - Function : kb_sequence::delseq - Called by : [user] - Purpose : mark the sequence as deleted - Parameters: none - Returns : nothing -\* ---F------------------------------------------------------------------- */ - -void kb_sequence::delseq() +void kb_sequence::mark_deleted() { - // negative length marks sequence as deleted, but we can still - // print() it or retrieve the last char using getiso() - length = -length; + deleted_ = true; } -/* ---F+------------------------------------------------------------------ *\ - Function : kb_sequence::getsym - Called by : [user], getiso - Purpose : get the keysym of the last key in sequence - Parameters: none - Returns : keysym -\* ---F------------------------------------------------------------------- */ - -unsigned int kb_sequence::getsym() const +LyXKeySymPtr kb_sequence::getsym() const { - int l = length; - if (l == 0) return NoSymbol; - if (l < 0) l = -l; - return sequence[l - 1]; + if (sequence.size() == 0) + return LyXKeySymPtr(LyXKeySymFactory::create()); + return sequence.back(); } -/* ---F+------------------------------------------------------------------ *\ - Function : kb_sequence::getiso - Called by : [user] - Purpose : return iso character code of last key, if any - Parameters: none - Returns : iso code or 0 if none -\* ---F------------------------------------------------------------------- */ - -char kb_sequence::getiso() const +char kb_sequence::getLastKeyEncoded() const { - unsigned int const c = getsym(); - - lyxerr[Debug::KBMAP] << "Raw keysym: " - << std::hex << c << std::dec << endl; - lyxerr[Debug::KBMAP] << "byte 3: " - << std::hex << (c & 0x0000FF00) << std::dec - << endl; - - switch (c & 0x0000FF00) { - // latin 1 byte 3 = 0 - case 0x00000000: - return c; - // 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: - return c & 0x000000FF; - default: - return '\0'; - } - - // not a latin char we know of - // Yes but this is already handled above (JMarc) - //return '\0'; + return getsym()->getISOEncoded(); } -/* ---F+------------------------------------------------------------------ *\ - Function : kb_sequence::reset - Called by : [user] - Purpose : reset sequence to initial state. RVDK_PATCH_5 - Parameters: none - Returns : void -\* ---F------------------------------------------------------------------- */ - void kb_sequence::reset() { - delseq(); + mark_deleted(); curmap = stdmap; - if (length > 0) length = -length; } -/* === End of File: kbmap.C ============================================== */ +void kb_sequence::clear() +{ + sequence.clear(); + reset(); +}