X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fkbsequence.C;h=af6c725c0dd83f965aaf8caf47d33ee44a73a632;hb=69cf3b62043861ccad5f8ad7ffb4981fe50b078d;hp=26e13d412d8262d62a139f75de530db41e5cc2d7;hpb=adaef99e60e28eba8c413a3472cc71e234718af0;p=lyx.git diff --git a/src/kbsequence.C b/src/kbsequence.C index 26e13d412d..af6c725c0d 100644 --- a/src/kbsequence.C +++ b/src/kbsequence.C @@ -1,140 +1,91 @@ -/* This file is part of - * ====================================================== - * - * LyX, The Document Processor - * - * Copyright 1995 Matthias Ettrich - * Copyright 1995-2000 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" -#ifdef __GNUG__ -#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; - -// The only modifiers that we handle. We want to throw away things -// like NumLock. -enum { ModsMask = ShiftMask | ControlMask | Mod1Mask }; - - -// === static functions =================================================== - +using std::make_pair; -/* ---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) { - if (length < 0) length = 0; - - if (length + 1 >= size) { - unsigned int * nseq = new unsigned int[size + KB_PREALLOC]; - size += KB_PREALLOC; - memcpy(nseq, sequence, length * sizeof(unsigned int)); - if (sequence != staticseq) delete sequence; - sequence = nseq; - nseq = new unsigned int[size]; - memcpy(nseq, modifiers, length * sizeof(unsigned int)); - if (modifiers != staticmod) delete modifiers; - modifiers = nseq; + // adding a key to a deleted sequence + // starts a new sequence + if (deleted_) { + deleted_ = false; + sequence.clear(); + modifiers.clear(); } - modifiers[length] = mod + (nmod << 16); - sequence[length++] = key; - - if (curmap) + modifiers.push_back(make_pair(mod, nmod)); + sequence.push_back(key); + + 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; + key_modifier::state mod = key_modifier::none; + key_modifier::state nmod = key_modifier::none; + 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; + 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: 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; + 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: @@ -143,143 +94,82 @@ 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] - << "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; } } - return 0; -} + // empty sequence? + if (sequence.size() == 0) + return 0; -/* ---F+------------------------------------------------------------------ *\ - Function : kb_sequence::print - Called by : [user] - Purpose : print the currently defined sequence into a string - Parameters: buf - string where the result goes - maxlen - length of string (including '\0') - when_defined - only print when sequence is real: length > 0. - Returns : 0, if ok, -1 if string too long -\* ---F------------------------------------------------------------------- */ + // everything is fine + return string::npos; +} -int kb_sequence::print(string & buf, bool when_defined) const + +string const kb_sequence::print() const { - 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; - - printKeysym(key, mod, buf); // RVDK_PATCH_5 - - if (i + 1 < l) { // append a blank - buf += ' '; - } - } - return 0; -} + string buf; + //if (deleted_) + // 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------------------------------------------------------------------- */ + KeySequence::size_type i, length = sequence.size(); -int kb_sequence::printOptions(string & buf) const -{ - print(buf, true); - - if (!curmap) return -1; - buf += _(" options: "); - curmap->print(buf); - return 0; -} + for (i = 0; i < length; ++i) { + buf += kb_keymap::printKeysym(sequence[i], modifiers[i].first); + // append a blank + if (i + 1 < length) { + buf += ' '; + } + } + 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() +string const kb_sequence::printOptions() const { - // negative length marks sequence as deleted, but we can still - // print() it or retrieve the last char using getiso() - length = -length; -} + string buf; + buf += print(); -/* ---F+------------------------------------------------------------------ *\ - Function : kb_sequence::getsym - Called by : [user], getiso - Purpose : get the keysym of the last key in sequence - Parameters: none - Returns : keysym -\* ---F------------------------------------------------------------------- */ + if (!curmap) + return buf; -unsigned int kb_sequence::getsym() const -{ - int l = length; - if (l == 0) return NoSymbol; - if (l < 0) l = -l; - return sequence[l - 1]; + buf += _(" options: "); + buf += curmap->print(); + return buf; } -/* ---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 +void kb_sequence::mark_deleted() { - int c = getsym(); - - if (c > 0xff) - return '\0'; - return c; + deleted_ = true; } -/* ---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(); +}