]> git.lyx.org Git - lyx.git/blobdiff - src/kbmap.C
architectural changes to tex2lyx
[lyx.git] / src / kbmap.C
index 7004b3ec73298a54fc2ed3af5ab75f3f5ecfe960..7f8fd03116cc0706cd6fd0759595f7026e1c4b7e 100644 (file)
@@ -1,74 +1,47 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file kbmap.C
+ * Copyright 1995-2002 the LyX Team
+ * Read the file COPYING
  *
- *           LyX, The Document Processor
- *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * \author unknown
+ * \author John Levon <moz@compsoc.man.ac.uk>
+ */
 
 #include <config.h>
 
-#include <X11/Xlib.h>
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "kbmap.h"
-#include "commandtags.h"
+#include "lfuns.h"
 #include "kbsequence.h"
+#include "LyXAction.h"
+#include "support/filetools.h"
+#include "lyxlex.h"
 #include "debug.h"
 
 using std::endl;
+using lyx::support::i18nLibFileSearch;
 
-// The only modifiers that we handle. We want to throw away things
-// like NumLock.
-enum { ModsMask = ShiftMask | ControlMask | Mod1Mask };
-
-
-string const kb_keymap::printKeysym(unsigned int key, unsigned int mod)
+string const kb_keymap::printKeysym(LyXKeySymPtr key,
+                                   key_modifier::state mod)
 {
        string buf;
-       mod &= ModsMask;
 
-       char const * const s = XKeysymToString(key);
+       string const s = key->getSymbolName();
+
+       if (mod & key_modifier::shift)
+               buf += "S-";
+       if (mod & key_modifier::ctrl)
+               buf += "C-";
+       if (mod & key_modifier::alt)
+               buf += "M-";
 
-       if (mod & ShiftMask) buf += "S-";
-       if (mod & ControlMask) buf += "C-";
-       if (mod & Mod1Mask) buf += "M-";
-       if (s) buf += s;
+       buf += s;
        return buf;
 }
 
 
-char kb_keymap::getiso(unsigned int c)
-{
-       switch (c & 0x0000FF00) {
-               // latin 1 byte 3 = 0
-       case 0x00000000: break;
-               // 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:
-               c &= 0x000000FF;
-               break;
-       default:
-               c = 0;
-       }
-       return c;
-}
-
 string const kb_keymap::printKey(kb_key const & key) const
 {
-       return printKeysym(key.code, key.mod & 0xffff);
+       return printKeysym(key.code, key.mod.first);
 }
 
 
@@ -77,7 +50,7 @@ string::size_type kb_keymap::bind(string const & seq, int action)
        if (lyxerr.debugging(Debug::KBMAP)) {
                lyxerr << "BIND: Sequence `"
                       << seq << "' Action `"
-                      << action << "'" << endl;
+                      << action << '\'' << endl;
        }
 
        kb_sequence k(0, 0);
@@ -95,8 +68,102 @@ string::size_type kb_keymap::bind(string const & seq, int action)
 }
 
 
-int kb_keymap::lookup(unsigned int key,
-                     unsigned int mod, kb_sequence * seq) const
+namespace {
+
+enum BindTags {
+       BN_BIND,
+       BN_BINDFILE
+};
+
+keyword_item bindTags[] = {
+       { "\\bind", BN_BIND },
+       { "\\bind_file", BN_BINDFILE }
+};
+
+}
+
+
+bool kb_keymap::read(string const & bind_file) 
+{
+       const int bindCount = sizeof(bindTags) / sizeof(keyword_item);
+
+       LyXLex lexrc(bindTags, bindCount);
+       if (lyxerr.debugging(Debug::PARSER))
+               lexrc.printTable(lyxerr);
+
+       string const tmp = i18nLibFileSearch("bind", bind_file, "bind");
+       lexrc.setFile(tmp);
+       if (!lexrc.isOK()) {
+               lyxerr << "kb_keymap::read: cannot open bind file:" 
+                      << tmp << endl;
+               return false;
+       }
+
+       lyxerr[Debug::KBMAP] << "Reading bind file:" << tmp << endl;
+
+       bool error = false;
+       while (!error && lexrc.isOK()) {
+               switch (lexrc.lex()) {
+               case LyXLex::LEX_UNDEF:
+                       lexrc.printError("Unknown tag `$$Token'");
+                       error = true;
+                       continue;
+               case LyXLex::LEX_FEOF:
+                       continue;
+               case BN_BIND:
+               {
+                       string seq, cmd;
+                       
+                       if (lexrc.next()) {
+                               seq = lexrc.getString();
+                       } else {
+                               lexrc.printError("BN_BIND: Missing key sequence");
+                               error = true;
+                               break;
+                       }
+                       
+                       if (lexrc.next(true)) {
+                               cmd = lexrc.getString();
+                       } else {
+                               lexrc.printError("BN_BIND: missing command");
+                               error = true;
+                               break;
+                       }
+                       
+                       int action = lyxaction.LookupFunc(cmd);
+                       if (!action == LFUN_UNKNOWN_ACTION) {
+                               lexrc.printError("BN_BIND: Unknown LyX"
+                                                " function `$$Token'");
+                               error = true;
+                               break;
+                       }
+                       
+                       bind(seq, kb_action(action));
+                       break;
+               }
+               case BN_BINDFILE:
+                       if (lexrc.next()) {
+                               string const tmp(lexrc.getString());
+                               error = !read(tmp);
+                       } else {
+                               lexrc.printError("BN_BINDFILE: Missing file name");
+                               error = true;
+                               break;
+
+                       }
+                       break;
+               }
+       }
+
+       if (error)
+               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
 {
        if (table.empty()) {
                seq->curmap = seq->stdmap;
@@ -104,14 +171,13 @@ int kb_keymap::lookup(unsigned int key,
                return LFUN_UNKNOWN_ACTION;
        }
 
-       //suppress modifier bits we do not handle
-       mod &= ModsMask;
+       Table::const_iterator end = table.end();
+       for (Table::const_iterator cit = table.begin(); cit != end; ++cit) {
+               key_modifier::state mask(cit->mod.second);
+               key_modifier::state check =
+                       static_cast<key_modifier::state>(mod & ~mask);
 
-       for (Table::const_iterator cit = table.begin();
-            cit != table.end(); ++cit) {
-               unsigned int const msk1 = cit->mod & 0xffff;
-               unsigned int const msk0 = (cit->mod >> 16) & 0xffff;
-               if (cit->code == key && (mod & ~msk0) == msk1) {
+               if (*(cit->code) == *key && cit->mod.first == check) {
                        // match found
                        if (cit->table.get()) {
                                // this is a prefix key - set new map
@@ -136,8 +202,8 @@ int kb_keymap::lookup(unsigned int key,
 string const kb_keymap::print() const
 {
        string buf;
-       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) {
                buf += printKey((*cit));
                buf += ' ';
        }
@@ -147,14 +213,19 @@ string const kb_keymap::print() const
 
 void kb_keymap::defkey(kb_sequence * seq, int action, unsigned int r)
 {
-       unsigned int const code = seq->sequence[r];
-       if (code == NoSymbol) return;
+       LyXKeySymPtr code = seq->sequence[r];
+       if (!code->isOK())
+               return;
 
-       unsigned int const modmsk = seq->modifiers[r];
+       key_modifier::state const mod1 = seq->modifiers[r].first;
+       key_modifier::state const mod2 = seq->modifiers[r].second;
 
        // check if key is already there
-       for (Table::iterator it = table.begin(); it != table.end(); ++it) {
-               if (code == it->code && modmsk == it->mod) {
+       Table::iterator end = table.end();
+       for (Table::iterator it = table.begin(); it != end; ++it) {
+               if (*(code) == *(it->code)
+                   && mod1 == it->mod.first
+                   && mod2 == it->mod.second) {
                        // overwrite binding
                        if (r + 1 == seq->length()) {
                                lyxerr[Debug::KBMAP]
@@ -162,8 +233,8 @@ void kb_keymap::defkey(kb_sequence * seq, int action, unsigned int r)
                                        << seq->print()
                                        << "' is overriding old binding..."
                                        << endl;
-                                       if (it->table.get()) {
-                                       it->table.reset(0);
+                               if (it->table.get()) {
+                                       it->table.reset();
                                }
                                it->action = action;
                                return;
@@ -181,10 +252,10 @@ void kb_keymap::defkey(kb_sequence * seq, int action, unsigned int r)
 
        Table::iterator newone = table.insert(table.end(), kb_key());
        newone->code = code;
-       newone->mod = modmsk;
+       newone->mod = seq->modifiers[r];
        if (r + 1 == seq->length()) {
                newone->action = action;
-               newone->table.reset(0);
+               newone->table.reset();
                return;
        } else {
                newone->table.reset(new kb_keymap);
@@ -206,9 +277,9 @@ string const kb_keymap::findbinding(int act, string const & prefix) const
                        res += cit->table->findbinding(act,
                                                       prefix
                                                       + printKey((*cit))
-                                                      + " ");
+                                                      + ' ');
                } else if (cit->action == act) {
-                       res += "[";
+                       res += '[';
                        res += prefix + printKey((*cit));
                        res += "] ";
                }