X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fkbsequence.C;h=fa93e556b7789fd748adfe51819bc1ec2e762d7e;hb=98c966c64594611e469313314abd1e59524adb4a;hp=29b7d453b0ffdb1d62206291f25ea0a94fe91b08;hpb=d8afc7c4bb332296b779e5ccbe1ae0ebc011bf72;p=lyx.git diff --git a/src/kbsequence.C b/src/kbsequence.C index 29b7d453b0..fa93e556b7 100644 --- a/src/kbsequence.C +++ b/src/kbsequence.C @@ -1,15 +1,15 @@ /* This file is part of - * ====================================================== - * + * ====================================================== + * * LyX, The Document Processor - * + * * Copyright 1995 Matthias Ettrich - * Copyright 1995-2000 The LyX Team. + * Copyright 1995-2001 The LyX Team. * * ====================================================== */ #include -#include +//#include #include #include "gettext.h" @@ -20,90 +20,58 @@ #include "kbsequence.h" #include "kbmap.h" +#include "commandtags.h" #include "debug.h" + +using std::vector; using std::endl; +using std::hex; +using std::dec; + // The only modifiers that we handle. We want to throw away things -// like NumLock. +// 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(unsigned int key, unsigned int mod, unsigned int 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; + length_ = 0; sequence.clear(); modifiers.clear(); } modifiers.push_back(mod + (nmod << 16)); sequence.push_back(key); - ++length; + ++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 : 0 - 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------------------------------------------------------------------- */ -int kb_sequence::parse(string const & s) +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; + unsigned int mod = 0; + unsigned int nmod = 0; while (i < s.length()) { - if (s[i] && (s[i]) <= ' ') ++i; - if (i >= s.length()) break; - - if (s[i + 1] == '-') { // is implicit that s[i] == true + if (s[i] == ' ') + ++i; + if (i >= s.length()) + break; + + if (i + 1 < s.length() && s[i + 1] == '-') { switch (s[i]) { case 's': case 'S': mod |= ShiftMask; @@ -120,7 +88,8 @@ int kb_sequence::parse(string const & s) default: return i + 1; } - } else if (s[i] == '~' && s[i + 1] && s[i + 2] == '-') { + } else if (i + 2 < s.length() && s[i] == '~' + && s[i + 2] == '-') { switch (s[i + 1]) { case 's': case 'S': nmod |= ShiftMask; @@ -140,9 +109,9 @@ int kb_sequence::parse(string const & s) } else { string tbuf; string::size_type j = i; - for (; j < s.length() && s[j] > ' '; ++j) + for (; j < s.length() && s[j] != ' '; ++j) tbuf += s[j]; // (!!!check bounds :-) - + KeySym key = XStringToKeysym(tbuf.c_str()); if (key == NoSymbol) { lyxerr[Debug::KBMAP] @@ -151,158 +120,89 @@ int kb_sequence::parse(string const & s) return j; } i = j; - + addkey(key, mod, nmod); mod = 0; - nmod = 0; } } - return 0; -} + // empty sequence? + if (!length_) + return 0; + + // everything is fine + return string::npos; +} -/* ---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; + + for (vector::size_type i = 0; i < length_; ++i) { + buf += kb_keymap::printKeysym(sequence[i], modifiers[i] & 0xffff); + + // 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 { - int l = length; - if (l == 0) return NoSymbol; - if (l < 0) l = -l; - return sequence[l - 1]; + if (length_ == 0) return NoSymbol; + return sequence[length_ - 1]; } -/* ---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 { unsigned int const c = getsym(); - lyxerr << "Raw keysym: " << std::hex << c << std::dec << endl; - lyxerr << "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'; + lyxerr[Debug::KBMAP] << "Raw keysym: " + << hex << c << dec << endl; + lyxerr[Debug::KBMAP] << "byte 3: " + << hex << (c & 0xff00) << dec + << endl; + return kb_keymap::getiso(c); } -/* ---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() +{ + length_ = 0; + reset(); +}