More fixes to insettabular/text (and some missing features added).

[lyx.git] / src / kbmap.C

diff --git a/src/kbmap.C b/src/kbmap.C
index 68cde51c6a779bf80b28a777c55d711deedb35d0..00462974adf3b83bf228a08f4f945b323642fb2b 100644 (file)
--- a/src/kbmap.C
+++ b/src/kbmap.C
@@ -45,7 +45,7 @@ void printKeysym(unsigned int key, unsigned int mod, string & buf)
 {
        mod &= ModsMask;
 
-       char * s = XKeysymToString(key);
+       char const * const s = XKeysymToString(key);
        
        if (mod & ShiftMask) buf += "S-";
        if (mod & ControlMask) buf += "C-";
@@ -71,11 +71,17 @@ void kb_keymap::printKey(kb_key const & key, string & buf)
 
 
 // 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
@@ -105,14 +111,14 @@ int kb_keymap::lookup(unsigned int key,
                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) {
@@ -166,10 +172,10 @@ void kb_keymap::print(string & buf) const
 
 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
@@ -185,7 +191,7 @@ int kb_keymap::defkey(kb_sequence * seq, int action, int idx /*= 0*/)
                                        << buf
                                        << "' is overriding old binding..."
                                        << endl;
-                               if((*it).table) {
+                               if ((*it).table) {
                                        delete (*it).table;
                                        (*it).table = 0;
                                }
@@ -232,13 +238,13 @@ kb_keymap::~kb_keymap()
 {
        // This could be done by a destructor in kb_key.
        Table::iterator end = table.end();
-       for(Table::iterator it = table.begin(); it != end; ++it) {
+       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);
@@ -247,13 +253,13 @@ string kb_keymap::keyname(kb_key const & k)
 
 
 // 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;
 
        Table::const_iterator end = table.end();
-       for(Table::const_iterator cit = table.begin();
+       for (Table::const_iterator cit = table.begin();
            cit != end; ++cit) {
                if ((*cit).table) {
                        string suffix = (*cit).table->findbinding(act);
@@ -265,7 +271,9 @@ string kb_keymap::findbinding(int act) const
                                        + suffix + "] ";
                        }
                } else if ((*cit).action == act) {
-                       res += "[" + keyname((*cit)) + "] ";
+                       res += "[";
+                       res += keyname((*cit));
+                       res += "] ";
                }
        }
        return res;