more cursor dispatch

[lyx.git] / src / kbmap.C

diff --git a/src/kbmap.C b/src/kbmap.C
index c6ef06ed3ec2b0e669cc144c5d4457a932e81969..1278af359d46ce00e44e2787901c95846d7a3d99 100644 (file)
--- a/src/kbmap.C
+++ b/src/kbmap.C
@@ -14,15 +14,22 @@
 #include <config.h>
 
 #include "kbmap.h"
+
+#include "debug.h"
 #include "kbsequence.h"
 #include "LyXAction.h"
-#include "support/filetools.h"
 #include "lyxlex.h"
-#include "debug.h"
 
-using std::endl;
+#include "frontends/LyXKeySym.h"
+
+#include "support/filetools.h"
+
 using lyx::support::i18nLibFileSearch;
 
+using std::endl;
+using std::string;
+
+
 string const kb_keymap::printKeysym(LyXKeySymPtr key,
                                    key_modifier::state mod)
 {
@@ -48,19 +55,19 @@ string const kb_keymap::printKey(kb_key const & key) const
 }
 
 
-string::size_type kb_keymap::bind(string const & seq, int action)
+string::size_type kb_keymap::bind(string const & seq, FuncRequest const & func)
 {
        if (lyxerr.debugging(Debug::KBMAP)) {
                lyxerr << "BIND: Sequence `"
                       << seq << "' Action `"
-                      << action << '\'' << endl;
+                      << func.action << '\'' << endl;
        }
 
        kb_sequence k(0, 0);
 
        string::size_type const res = k.parse(seq);
        if (res == string::npos) {
-               defkey(&k, action);
+               defkey(&k, func);
        } else {
                lyxerr[Debug::KBMAP] << "Parse error at position " << res
                                     << " in key sequence '" << seq << "'."
@@ -86,7 +93,7 @@ keyword_item bindTags[] = {
 }
 
 
-bool kb_keymap::read(string const & bind_file) 
+bool kb_keymap::read(string const & bind_file)
 {
        const int bindCount = sizeof(bindTags) / sizeof(keyword_item);
 
@@ -97,7 +104,7 @@ bool kb_keymap::read(string const & bind_file)
        string const tmp = i18nLibFileSearch("bind", bind_file, "bind");
        lexrc.setFile(tmp);
        if (!lexrc.isOK()) {
-               lyxerr << "kb_keymap::read: cannot open bind file:" 
+               lyxerr << "kb_keymap::read: cannot open bind file:"
                       << tmp << endl;
                return false;
        }
@@ -116,7 +123,7 @@ bool kb_keymap::read(string const & bind_file)
                case BN_BIND:
                {
                        string seq, cmd;
-                       
+
                        if (lexrc.next()) {
                                seq = lexrc.getString();
                        } else {
@@ -124,7 +131,7 @@ bool kb_keymap::read(string const & bind_file)
                                error = true;
                                break;
                        }
-                       
+
                        if (lexrc.next(true)) {
                                cmd = lexrc.getString();
                        } else {
@@ -132,16 +139,16 @@ bool kb_keymap::read(string const & bind_file)
                                error = true;
                                break;
                        }
-                       
-                       int action = lyxaction.LookupFunc(cmd);
-                       if (!action == LFUN_UNKNOWN_ACTION) {
+
+                       FuncRequest func = lyxaction.lookupFunc(cmd);
+                       if (func. action == LFUN_UNKNOWN_ACTION) {
                                lexrc.printError("BN_BIND: Unknown LyX"
                                                 " function `$$Token'");
                                error = true;
                                break;
                        }
-                       
-                       bind(seq, kb_action(action));
+
+                       bind(seq, func);
                        break;
                }
                case BN_BINDFILE:
@@ -159,19 +166,22 @@ bool kb_keymap::read(string const & bind_file)
        }
 
        if (error)
-               lyxerr << "kb_keymap::read: error while reading bind file:" 
+               lyxerr << "kb_keymap::read: error while reading bind file:"
                       << tmp << endl;
        return !error;
 }
 
 
-int kb_keymap::lookup(LyXKeySymPtr key,
-                     key_modifier::state mod, kb_sequence * seq) const
+FuncRequest const &
+kb_keymap::lookup(LyXKeySymPtr key,
+                 key_modifier::state mod, kb_sequence * seq) const
 {
+       static FuncRequest const unknown(LFUN_UNKNOWN_ACTION);
+
        if (table.empty()) {
                seq->curmap = seq->stdmap;
                seq->mark_deleted();
-               return LFUN_UNKNOWN_ACTION;
+               return unknown;
        }
 
        Table::const_iterator end = table.end();
@@ -185,12 +195,13 @@ int kb_keymap::lookup(LyXKeySymPtr key,
                        if (cit->table.get()) {
                                // this is a prefix key - set new map
                                seq->curmap = cit->table.get();
-                               return LFUN_PREFIX;
+                               static FuncRequest prefix(LFUN_PREFIX);
+                               return prefix;
                        } else {
                                // final key - reset map
                                seq->curmap = seq->stdmap;
                                seq->mark_deleted();
-                               return cit->action;
+                               return cit->func;
                        }
                }
        }
@@ -198,7 +209,8 @@ int kb_keymap::lookup(LyXKeySymPtr key,
        // error - key not found:
        seq->curmap = seq->stdmap;
        seq->mark_deleted();
-       return LFUN_UNKNOWN_ACTION;
+
+       return unknown;
 }
 
 
@@ -214,7 +226,8 @@ string const kb_keymap::print() const
 }
 
 
-void kb_keymap::defkey(kb_sequence * seq, int action, unsigned int r)
+void kb_keymap::defkey(kb_sequence * seq,
+                      FuncRequest const & func, unsigned int r)
 {
        LyXKeySymPtr code = seq->sequence[r];
        if (!code->isOK())
@@ -239,7 +252,7 @@ void kb_keymap::defkey(kb_sequence * seq, int action, unsigned int r)
                                if (it->table.get()) {
                                        it->table.reset();
                                }
-                               it->action = action;
+                               it->func = func;
                                return;
                        } else if (!it->table.get()) {
                                lyxerr << "Error: New binding for '" << seq->print()
@@ -247,7 +260,7 @@ void kb_keymap::defkey(kb_sequence * seq, int action, unsigned int r)
                                               << endl;
                                return;
                        } else {
-                               it->table->defkey(seq, action, r + 1);
+                               it->table->defkey(seq, func, r + 1);
                                return;
                        }
                }
@@ -257,18 +270,19 @@ void kb_keymap::defkey(kb_sequence * seq, int action, unsigned int r)
        newone->code = code;
        newone->mod = seq->modifiers[r];
        if (r + 1 == seq->length()) {
-               newone->action = action;
+               newone->func = func;
                newone->table.reset();
                return;
        } else {
                newone->table.reset(new kb_keymap);
-               newone->table->defkey(seq, action, r + 1);
+               newone->table->defkey(seq, func, r + 1);
                return;
        }
 }
 
 
-string const kb_keymap::findbinding(int act, string const & prefix) const
+string const kb_keymap::findbinding(FuncRequest const & func,
+                                   string const & prefix) const
 {
        string res;
        if (table.empty()) return res;
@@ -277,15 +291,16 @@ string const kb_keymap::findbinding(int act, string const & prefix) const
        for (Table::const_iterator cit = table.begin();
            cit != end; ++cit) {
                if (cit->table.get()) {
-                       res += cit->table->findbinding(act,
+                       res += cit->table->findbinding(func,
                                                       prefix
                                                       + printKey((*cit))
                                                       + ' ');
-               } else if (cit->action == act) {
+               } else if (cit->func == func) {
                        res += '[';
                        res += prefix + printKey((*cit));
                        res += "] ";
                }
        }
+
        return res;
 }