#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 };
{
mod &= ModsMask;
- char * s = XKeysymToString(key);
+ char const * const s = XKeysymToString(key);
if (mod & ShiftMask) buf += "S-";
if (mod & ControlMask) buf += "C-";
// This binds a key to an action
-int kb_keymap::bind(char const * seq, int action)
+int kb_keymap::bind(string const & seq, int action)
{
+ if (lyxerr.debugging(Debug::KBMAP)) {
+ lyxerr << "BIND: Sequence `"
+ << seq << "' Action `"
+ << action << "'" << endl;
+ }
+
kb_sequence k;
- int res = k.parse(seq);
+ int const res = k.parse(seq);
if (!res) {
defkey(&k, action);
} else
return -1;
}
- unsigned int msk1, msk0;
+ //unsigned int msk1, msk0;
//suppress modifier bits we do not handle
mod &= ModsMask;
for (Table::const_iterator cit = table.begin();
cit != table.end(); ++cit) {
- msk1 = (*cit).mod & 0xffff;
- msk0 = ((*cit).mod >> 16) & 0xffff;
+ unsigned int const msk1 = (*cit).mod & 0xffff;
+ unsigned int const msk0 = ((*cit).mod >> 16) & 0xffff;
if ((*cit).code == key && (mod & ~msk0) == msk1) {
// math found:
if ((*cit).table) {
int kb_keymap::defkey(kb_sequence * seq, int action, int idx /*= 0*/)
{
- unsigned int code = seq->sequence[idx];
- if(code == NoSymbol) return -1;
+ unsigned int const code = seq->sequence[idx];
+ if (code == NoSymbol) return -1;
- unsigned int modmsk = seq->modifiers[idx];
+ unsigned int const modmsk = seq->modifiers[idx];
// --- check if key is already there --------------------------------
- if (table.size() != 0) // without this I get strange crashes
- for (Table::iterator it = table.begin(); it != table.end(); ++it) {
+ if (table.size() != 0) { // without this I get strange crashes
+ Table::iterator end = table.end();
+ for (Table::iterator it = table.begin(); it != end; ++it) {
if (code == (*it).code && modmsk == (*it).mod) {
// overwrite binding
if (idx + 1 == seq->length) {
string buf;
seq->print(buf, true);
- lyxerr[Debug::KEY]
+ lyxerr[Debug::KBMAP]
<< "Warning: New binding for '"
<< buf
<< "' is overriding old binding..."
<< endl;
- if((*it).table) {
+ if ((*it).table) {
delete (*it).table;
(*it).table = 0;
}
}
}
}
-
+ }
+
Table::iterator newone = table.insert(table.end(), kb_key());
(*newone).code = code;
(*newone).mod = modmsk;
kb_keymap::~kb_keymap()
{
// This could be done by a destructor in kb_key.
- for(Table::iterator it = table.begin(); it != table.end(); ++it) {
+ Table::iterator end = table.end();
+ for (Table::iterator it = table.begin(); it != end; ++it) {
delete (*it).table;
}
}
-string kb_keymap::keyname(kb_key const & k)
+string const kb_keymap::keyname(kb_key const & k)
{
string buf;
printKeysym(k.code, k.mod, buf);
// Finds a key for a keyaction, if possible
-string kb_keymap::findbinding(int act) const
+string const kb_keymap::findbinding(int act) const
{
string res;
if (table.empty()) return res;
- 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) {
if ((*cit).table) {
string suffix = (*cit).table->findbinding(act);
suffix = strip(suffix, ' ');
+ suffix + "] ";
}
} else if ((*cit).action == act) {
- res += "[" + keyname((*cit)) + "] ";
+ res += "[";
+ res += keyname((*cit));
+ res += "] ";
}
}
return res;