PrefShortcuts: list all shortcuts (bound and unbound), using a better implementation

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21035 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/KeyMap.cpp b/src/KeyMap.cpp
index 1a505582a80fc9e18a05f9eb8bd3a6bede671328..e923abd63ee1f12c8215c36e6235d5cf62154218 100644 (file)
--- a/src/KeyMap.cpp
+++ b/src/KeyMap.cpp
@@ -23,9 +23,11 @@
 #include "support/filetools.h"
 
 #include <sstream>
+#include <utility>
 
 using std::endl;
 using std::string;
+using std::make_pair;
 
 
 namespace lyx {
@@ -324,4 +326,49 @@ KeyMap::Bindings KeyMap::findbindings(FuncRequest const & func,
 }
 
 
+KeyMap::BindingList const KeyMap::listBindings(bool unbound) const
+{
+       BindingList list;
+       listBindings(list, KeySequence(0, 0));
+       if (unbound) {
+               LyXAction::const_func_iterator fit = lyxaction.func_begin();
+               LyXAction::const_func_iterator fit_end = lyxaction.func_end();
+               for (; fit != fit_end; ++fit) {
+                       kb_action action = fit->second;
+                       bool has_action = false;
+                       BindingList::const_iterator it = list.begin();
+                       BindingList::const_iterator it_end = list.end();
+                       for (; it != it_end; ++it)
+                               if (it->first.action == action) {
+                                       has_action = true;
+                                       break;
+                               }
+                       if (!has_action)
+                               list.push_back(make_pair(action, KeySequence(0, 0)));
+               }       
+       }
+       return list;
+}
+
+
+void KeyMap::listBindings(BindingList & list,
+       KeySequence const & prefix) const
+{
+       Table::const_iterator it = table.begin();
+       Table::const_iterator it_end = table.end();
+       for (; it != it_end; ++it) {
+               // a LFUN_COMMAND_PREFIX
+               if (it->table.get()) {
+                       KeySequence seq = prefix;
+                       seq.addkey(it->code, it->mod.first);
+                       it->table->listBindings(list, seq);
+               } else {
+                       KeySequence seq = prefix;
+                       seq.addkey(it->code, it->mod.first);
+                       list.push_back(make_pair(it->func, seq));
+               }
+       }
+}
+
+
 } // namespace lyx

diff --git a/src/KeyMap.h b/src/KeyMap.h
index c3ff0820e0ac0feefd0e6c195d896c1900ba5c3e..d8069f2d6876bdbc3c8c8f367a33915cdeff0866 100644 (file)
--- a/src/KeyMap.h
+++ b/src/KeyMap.h
@@ -71,6 +71,14 @@ public:
        /// Given an action, print the keybindings.
        docstring const printbindings(FuncRequest const & func) const;
 
+       typedef std::pair<FuncRequest, KeySequence> Binding; 
+       typedef std::vector<Binding> BindingList;
+       /**
+        * Return all lfun and their associated bindings.
+        * @param unbound list unbound (func without any keybinding) as well
+        */
+       BindingList const listBindings(bool unbound) const;
+
        /**
         *  Given an action, find the first 1-key binding (if it exists).
         *  The KeySymbol pointer is 0 is no key is found.
@@ -90,6 +98,8 @@ public:
 
        typedef std::pair<KeyModifier, KeyModifier> ModifierPair;
 
+
+private:
        ///
        struct Key {
                /// Keysym
@@ -105,13 +115,6 @@ public:
                FuncRequest func;
        };
 
-       ///
-       typedef std::vector<Key> Table;
-
-       Table::const_iterator begin() const { return table.begin(); }
-       Table::const_iterator end() const { return table.end(); }
-
-private:
        /**
         * Define an action for a key sequence.
         * @param r internal recursion level
@@ -126,10 +129,15 @@ private:
         */
        Bindings findbindings(FuncRequest const & func,
                              KeySequence const & prefix) const;
+       
+       void listBindings(BindingList & list,
+                                 KeySequence const & prefix) const;
 
        /// is the table empty ?
        bool empty() const { return table.empty(); }
        ///
+       typedef std::vector<Key> Table;
+       ///
        Table table;
 };
 

diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp
index 44791d8c7e5286e6c5fdff335e4cfbb5a02670f0..fc2d9a3d64aa2a0a3cb578a6a8ed7f4625c9f1e3 100644 (file)
--- a/src/LyXAction.cpp
+++ b/src/LyXAction.cpp
@@ -54,12 +54,13 @@ LyXAction lyxaction;
 
 
 void LyXAction::newFunc(kb_action action, string const & name,
-                       unsigned int attrib)
+                       unsigned int attrib, LyXAction::func_type type)
 {
        lyx_func_map[name] = action;
        func_info tmpinfo;
        tmpinfo.name = name;
        tmpinfo.attrib = attrib;
+       tmpinfo.type = type;
        lyx_info_map[action] = tmpinfo;
 }
 
@@ -79,309 +80,310 @@ void LyXAction::init()
                kb_action action;
                char const * name;
                unsigned int attrib;
+               func_type type;
        };
 
        ev_item const items[] = {
-               { LFUN_ACCENT_ACUTE, "accent-acute", Noop },
-               { LFUN_ACCENT_BREVE, "accent-breve", Noop },
-               { LFUN_ACCENT_CARON, "accent-caron", Noop },
-               { LFUN_ACCENT_CEDILLA, "accent-cedilla", Noop },
-               { LFUN_ACCENT_CIRCLE, "accent-circle", Noop },
-               { LFUN_ACCENT_CIRCUMFLEX, "accent-circumflex", Noop },
-               { LFUN_ACCENT_DOT, "accent-dot", Noop },
-               { LFUN_ACCENT_GRAVE, "accent-grave", Noop },
-               { LFUN_ACCENT_HUNGARIAN_UMLAUT, "accent-hungarian-umlaut", Noop },
-               { LFUN_ACCENT_MACRON, "accent-macron", Noop },
-               { LFUN_ACCENT_OGONEK, "accent-ogonek", Noop },
-               { LFUN_ACCENT_SPECIAL_CARON, "accent-special-caron", Noop },
-               { LFUN_ACCENT_TIE, "accent-tie", Noop },
-               { LFUN_ACCENT_TILDE, "accent-tilde", Noop },
-               { LFUN_ACCENT_UMLAUT, "accent-umlaut", Noop },
-               { LFUN_ACCENT_UNDERBAR, "accent-underbar", Noop },
-               { LFUN_ACCENT_UNDERDOT, "accent-underdot", Noop },
-               { LFUN_APPENDIX, "appendix", Noop },
-               { LFUN_BOOKMARK_GOTO, "bookmark-goto", NoBuffer },
-               { LFUN_BOOKMARK_SAVE, "bookmark-save", ReadOnly },
-               { LFUN_BOOKMARK_CLEAR, "bookmark-clear", NoBuffer },
-               { LFUN_BREAK_LINE, "break-line", Noop },
-               { LFUN_BREAK_PARAGRAPH, "break-paragraph", Noop },
-               { LFUN_BREAK_PARAGRAPH_SKIP, "break-paragraph-skip", Noop },
-               { LFUN_BUILD_PROGRAM, "build-program", ReadOnly },
-               { LFUN_BUFFER_AUTO_SAVE, "buffer-auto-save", Noop },
-               { LFUN_BUFFER_BEGIN, "buffer-begin", ReadOnly },
-               { LFUN_BUFFER_BEGIN_SELECT, "buffer-begin-select", ReadOnly },
-               { LFUN_BUFFER_CHILD_OPEN, "buffer-child-open", ReadOnly },
-               { LFUN_BUFFER_CHKTEX, "buffer-chktex", ReadOnly },
-               { LFUN_BUFFER_TOGGLE_COMPRESSION, "buffer-toggle-compression", Noop},
-               { LFUN_BUFFER_CLOSE, "buffer-close", ReadOnly },
-               { LFUN_BUFFER_END, "buffer-end", ReadOnly },
-               { LFUN_BUFFER_END_SELECT, "buffer-end-select", ReadOnly },
-               { LFUN_BUFFER_EXPORT, "buffer-export", ReadOnly },
-               { LFUN_BUFFER_EXPORT_CUSTOM, "buffer-export-custom", ReadOnly },
-               { LFUN_BUFFER_PRINT, "buffer-print", ReadOnly },
-               { LFUN_BUFFER_IMPORT, "buffer-import", NoBuffer },
-               { LFUN_BUFFER_NEW, "buffer-new", NoBuffer },
-               { LFUN_BUFFER_NEW_TEMPLATE,"buffer-new-template", NoBuffer },
-               { LFUN_BUFFER_RELOAD, "buffer-reload", ReadOnly },
-               { LFUN_BUFFER_SWITCH, "buffer-switch", NoBuffer | ReadOnly },
-               { LFUN_BUFFER_TOGGLE_READ_ONLY, "buffer-toggle-read-only", ReadOnly },
-               { LFUN_BUFFER_UPDATE, "buffer-update", ReadOnly },
-               { LFUN_BUFFER_VIEW, "buffer-view", ReadOnly },
-               { LFUN_MASTER_BUFFER_UPDATE, "master-buffer-update", ReadOnly },
-               { LFUN_MASTER_BUFFER_VIEW, "master-buffer-view", ReadOnly },
-               { LFUN_BUFFER_WRITE, "buffer-write", ReadOnly },
-               { LFUN_BUFFER_WRITE_AS, "buffer-write-as", ReadOnly },
-               { LFUN_BUFFER_WRITE_ALL, "buffer-write-all", ReadOnly },
-               { LFUN_CANCEL, "cancel", NoBuffer },
-               { LFUN_CAPTION_INSERT, "caption-insert", Noop },
-               { LFUN_CHAR_BACKWARD, "char-backward", ReadOnly | NoUpdate},
-               { LFUN_CHAR_BACKWARD_SELECT, "backward-select", ReadOnly | SingleParUpdate },
-               { LFUN_CHAR_DELETE_BACKWARD, "delete-backward", SingleParUpdate },
-               { LFUN_CHAR_DELETE_FORWARD, "delete-forward", SingleParUpdate },
-               { LFUN_CHAR_FORWARD, "char-forward", ReadOnly | NoUpdate},
-               { LFUN_CHAR_FORWARD_SELECT, "forward-select", ReadOnly | SingleParUpdate },
-               { LFUN_CLIPBOARD_PASTE, "clipboard-paste", Noop },
-               { LFUN_COMMAND_EXECUTE, "command-execute", NoBuffer },
-               { LFUN_COMMAND_PREFIX, "command-prefix", NoBuffer },
-               { LFUN_COMMAND_SEQUENCE, "command-sequence", NoBuffer },
-               { LFUN_COPY, "copy", ReadOnly },
-               { LFUN_CUT, "cut", Noop },
-               { LFUN_DATE_INSERT, "date-insert", Noop },
-               { LFUN_DELETE_BACKWARD_SKIP, "delete-backward-skip", Noop },
-               { LFUN_DELETE_FORWARD_SKIP, "delete-forward-skip", Noop },
-               { LFUN_DEPTH_DECREMENT, "depth-decrement", Noop },
-               { LFUN_DEPTH_INCREMENT, "depth-increment", Noop },
-               { LFUN_DOTS_INSERT, "dots-insert", Noop },
-               { LFUN_DOWN, "down", ReadOnly | NoUpdate },
-               { LFUN_DOWN_SELECT, "down-select", ReadOnly | SingleParUpdate },
-               { LFUN_DROP_LAYOUTS_CHOICE, "drop-layouts-choice", ReadOnly },
-               { LFUN_END_OF_SENTENCE_PERIOD_INSERT, "end-of-sentence-period-insert", Noop },
-               { LFUN_ENVIRONMENT_INSERT, "environment-insert", Noop },
-               { LFUN_ERROR_NEXT, "error-next", ReadOnly },
-               { LFUN_ERT_INSERT, "ert-insert", Noop },
-               { LFUN_FILE_INSERT, "file-insert", Noop },
-               { LFUN_FILE_INSERT_PLAINTEXT, "file-insert-plaintext", Noop },
-               { LFUN_FILE_INSERT_PLAINTEXT_PARA, "file-insert-plaintext-para", Noop },
-               { LFUN_FILE_NEW, "file-new", NoBuffer },
-               { LFUN_FILE_OPEN, "file-open", NoBuffer },
-               { LFUN_FLOAT_INSERT, "float-insert", Noop },
-               { LFUN_FLOAT_WIDE_INSERT, "float-wide-insert", Noop },
-               { LFUN_WRAP_INSERT, "wrap-insert", Noop },
-               { LFUN_FONT_BOLD, "font-bold", Noop },
-               { LFUN_FONT_TYPEWRITER, "font-typewriter", Noop },
-               { LFUN_FONT_DEFAULT, "font-default", Noop },
-               { LFUN_FONT_EMPH, "font-emph", Noop },
-               { LFUN_FONT_FREE_APPLY, "font-free-apply", Noop },
-               { LFUN_FONT_FREE_UPDATE, "font-free-update", Noop },
-               { LFUN_FONT_NOUN, "font-noun", Noop },
-               { LFUN_FONT_ROMAN, "font-roman", Noop },
-               { LFUN_FONT_SANS, "font-sans", Noop },
-               { LFUN_FONT_FRAK, "font-frak", Noop },
-               { LFUN_FONT_ITAL, "font-ital", Noop },
-               { LFUN_FONT_SIZE, "font-size", Noop },
-               { LFUN_FONT_STATE, "font-state", ReadOnly },
-               { LFUN_FONT_UNDERLINE, "font-underline", Noop },
-               { LFUN_FOOTNOTE_INSERT, "footnote-insert", Noop },
-               { LFUN_HFILL_INSERT, "hfill-insert", Noop },
-               { LFUN_HELP_OPEN, "help-open", NoBuffer | Argument},
-               { LFUN_HYPHENATION_POINT_INSERT, "hyphenation-point-insert", Noop },
-               { LFUN_LIGATURE_BREAK_INSERT, "ligature-break-insert", Noop },
-               { LFUN_INDEX_INSERT, "index-insert", Noop },
-               { LFUN_INDEX_PRINT, "index-print", Noop },
-               { LFUN_KEYMAP_OFF, "keymap-off", ReadOnly },
-               { LFUN_KEYMAP_PRIMARY, "keymap-primary", ReadOnly },
-               { LFUN_KEYMAP_SECONDARY, "keymap-secondary", ReadOnly },
-               { LFUN_KEYMAP_TOGGLE, "keymap-toggle", ReadOnly },
-               { LFUN_LABEL_INSERT, "label-insert", Noop },
-               { LFUN_OPTIONAL_INSERT, "optional-insert", Noop },
-               { LFUN_BIBITEM_INSERT, "bibitem-insert", Noop },
-               { LFUN_CITATION_INSERT, "citation-insert", Noop },
-               { LFUN_BIBTEX_DATABASE_ADD, "bibtex-database-add", Noop },
-               { LFUN_BIBTEX_DATABASE_DEL, "bibtex-database-del", Noop },
-               { LFUN_LINE_INSERT, "line-insert", Noop },
-               { LFUN_PAGEBREAK_INSERT, "pagebreak-insert", Noop },
-               { LFUN_LANGUAGE, "language", Noop },
-               { LFUN_LAYOUT, "layout", Noop },
-               { LFUN_LAYOUT_PARAGRAPH, "layout-paragraph", ReadOnly },
-               { LFUN_LAYOUT_TABULAR, "layout-tabular", Noop },
-               { LFUN_LINE_BEGIN, "line-begin", ReadOnly | NoUpdate},
-               { LFUN_LINE_BEGIN_SELECT, "line-begin-select", ReadOnly | SingleParUpdate },
-               { LFUN_LINE_DELETE, "line-delete-forward", Noop }, // there is no line-delete-backward
-               { LFUN_LINE_END, "line-end", ReadOnly | NoUpdate},
-               { LFUN_LINE_END_SELECT, "line-end-select", ReadOnly | SingleParUpdate },
+               { LFUN_ACCENT_ACUTE, "accent-acute", Noop, Layout },
+               { LFUN_ACCENT_BREVE, "accent-breve", Noop, Layout },
+               { LFUN_ACCENT_CARON, "accent-caron", Noop, Layout },
+               { LFUN_ACCENT_CEDILLA, "accent-cedilla", Noop, Layout },
+               { LFUN_ACCENT_CIRCLE, "accent-circle", Noop, Layout },
+               { LFUN_ACCENT_CIRCUMFLEX, "accent-circumflex", Noop, Layout },
+               { LFUN_ACCENT_DOT, "accent-dot", Noop, Layout },
+               { LFUN_ACCENT_GRAVE, "accent-grave", Noop, Layout },
+               { LFUN_ACCENT_HUNGARIAN_UMLAUT, "accent-hungarian-umlaut", Noop, Layout },
+               { LFUN_ACCENT_MACRON, "accent-macron", Noop, Layout },
+               { LFUN_ACCENT_OGONEK, "accent-ogonek", Noop, Layout },
+               { LFUN_ACCENT_SPECIAL_CARON, "accent-special-caron", Noop, Layout },
+               { LFUN_ACCENT_TIE, "accent-tie", Noop, Layout },
+               { LFUN_ACCENT_TILDE, "accent-tilde", Noop, Layout },
+               { LFUN_ACCENT_UMLAUT, "accent-umlaut", Noop, Layout },
+               { LFUN_ACCENT_UNDERBAR, "accent-underbar", Noop, Layout },
+               { LFUN_ACCENT_UNDERDOT, "accent-underdot", Noop, Layout },
+               { LFUN_APPENDIX, "appendix", Noop, Edit },
+               { LFUN_BOOKMARK_GOTO, "bookmark-goto", NoBuffer, Edit },
+               { LFUN_BOOKMARK_SAVE, "bookmark-save", ReadOnly, Edit },
+               { LFUN_BOOKMARK_CLEAR, "bookmark-clear", NoBuffer, Edit },
+               { LFUN_BREAK_LINE, "break-line", Noop, Edit },
+               { LFUN_BREAK_PARAGRAPH, "break-paragraph", Noop, Edit },
+               { LFUN_BREAK_PARAGRAPH_SKIP, "break-paragraph-skip", Noop, Edit },
+               { LFUN_BUILD_PROGRAM, "build-program", ReadOnly, Buffer },
+               { LFUN_BUFFER_AUTO_SAVE, "buffer-auto-save", Noop, Buffer },
+               { LFUN_BUFFER_BEGIN, "buffer-begin", ReadOnly, Edit },
+               { LFUN_BUFFER_BEGIN_SELECT, "buffer-begin-select", ReadOnly, Edit },
+               { LFUN_BUFFER_CHILD_OPEN, "buffer-child-open", ReadOnly, Buffer },
+               { LFUN_BUFFER_CHKTEX, "buffer-chktex", ReadOnly, Buffer },
+               { LFUN_BUFFER_TOGGLE_COMPRESSION, "buffer-toggle-compression", Noop, Buffer },
+               { LFUN_BUFFER_CLOSE, "buffer-close", ReadOnly, Buffer },
+               { LFUN_BUFFER_END, "buffer-end", ReadOnly, Edit },
+               { LFUN_BUFFER_END_SELECT, "buffer-end-select", ReadOnly, Edit },
+               { LFUN_BUFFER_EXPORT, "buffer-export", ReadOnly, Buffer },
+               { LFUN_BUFFER_EXPORT_CUSTOM, "buffer-export-custom", ReadOnly, Buffer },
+               { LFUN_BUFFER_PRINT, "buffer-print", ReadOnly, Buffer },
+               { LFUN_BUFFER_IMPORT, "buffer-import", NoBuffer, Buffer },
+               { LFUN_BUFFER_NEW, "buffer-new", NoBuffer, Buffer },
+               { LFUN_BUFFER_NEW_TEMPLATE,"buffer-new-template", NoBuffer, Buffer },
+               { LFUN_BUFFER_RELOAD, "buffer-reload", ReadOnly, Buffer },
+               { LFUN_BUFFER_SWITCH, "buffer-switch", NoBuffer | ReadOnly, Edit },
+               { LFUN_BUFFER_TOGGLE_READ_ONLY, "buffer-toggle-read-only", ReadOnly, Buffer },
+               { LFUN_BUFFER_UPDATE, "buffer-update", ReadOnly, Edit },
+               { LFUN_BUFFER_VIEW, "buffer-view", ReadOnly, Edit },
+               { LFUN_MASTER_BUFFER_UPDATE, "master-buffer-update", ReadOnly, Edit },
+               { LFUN_MASTER_BUFFER_VIEW, "master-buffer-view", ReadOnly, Edit },
+               { LFUN_BUFFER_WRITE, "buffer-write", ReadOnly, Buffer },
+               { LFUN_BUFFER_WRITE_AS, "buffer-write-as", ReadOnly, Buffer },
+               { LFUN_BUFFER_WRITE_ALL, "buffer-write-all", ReadOnly, Buffer },
+               { LFUN_CANCEL, "cancel", NoBuffer, System },
+               { LFUN_CAPTION_INSERT, "caption-insert", Noop, Edit },
+               { LFUN_CHAR_BACKWARD, "char-backward", ReadOnly | NoUpdate, Edit },
+               { LFUN_CHAR_BACKWARD_SELECT, "backward-select", ReadOnly | SingleParUpdate, Edit },
+               { LFUN_CHAR_DELETE_BACKWARD, "delete-backward", SingleParUpdate, Edit },
+               { LFUN_CHAR_DELETE_FORWARD, "delete-forward", SingleParUpdate, Edit },
+               { LFUN_CHAR_FORWARD, "char-forward", ReadOnly | NoUpdate, Edit },
+               { LFUN_CHAR_FORWARD_SELECT, "forward-select", ReadOnly | SingleParUpdate, Edit },
+               { LFUN_CLIPBOARD_PASTE, "clipboard-paste", Noop, Edit },
+               { LFUN_COMMAND_EXECUTE, "command-execute", NoBuffer, Edit },
+               { LFUN_COMMAND_PREFIX, "command-prefix", NoBuffer, Hidden },
+               { LFUN_COMMAND_SEQUENCE, "command-sequence", NoBuffer, System },
+               { LFUN_COPY, "copy", ReadOnly, Edit },
+               { LFUN_CUT, "cut", Noop, Edit },
+               { LFUN_DATE_INSERT, "date-insert", Noop, Edit },
+               { LFUN_DELETE_BACKWARD_SKIP, "delete-backward-skip", Noop, Edit },
+               { LFUN_DELETE_FORWARD_SKIP, "delete-forward-skip", Noop, Edit },
+               { LFUN_DEPTH_DECREMENT, "depth-decrement", Noop, Edit },
+               { LFUN_DEPTH_INCREMENT, "depth-increment", Noop, Edit },
+               { LFUN_DOTS_INSERT, "dots-insert", Noop, Edit },
+               { LFUN_DOWN, "down", ReadOnly | NoUpdate, Edit },
+               { LFUN_DOWN_SELECT, "down-select", ReadOnly | SingleParUpdate, Edit },
+               { LFUN_DROP_LAYOUTS_CHOICE, "drop-layouts-choice", ReadOnly, Layout },
+               { LFUN_END_OF_SENTENCE_PERIOD_INSERT, "end-of-sentence-period-insert", Noop, Edit },
+               { LFUN_ENVIRONMENT_INSERT, "environment-insert", Noop, Edit },
+               { LFUN_ERROR_NEXT, "error-next", ReadOnly, Edit },
+               { LFUN_ERT_INSERT, "ert-insert", Noop, Edit },
+               { LFUN_FILE_INSERT, "file-insert", Noop, Buffer },
+               { LFUN_FILE_INSERT_PLAINTEXT, "file-insert-plaintext", Noop, Edit },
+               { LFUN_FILE_INSERT_PLAINTEXT_PARA, "file-insert-plaintext-para", Noop, Edit },
+               { LFUN_FILE_NEW, "file-new", NoBuffer, Buffer },
+               { LFUN_FILE_OPEN, "file-open", NoBuffer, Buffer },
+               { LFUN_FLOAT_INSERT, "float-insert", Noop, Edit },
+               { LFUN_FLOAT_WIDE_INSERT, "float-wide-insert", Noop, Edit },
+               { LFUN_WRAP_INSERT, "wrap-insert", Noop, Edit },
+               { LFUN_FONT_BOLD, "font-bold", Noop, Layout },
+               { LFUN_FONT_TYPEWRITER, "font-typewriter", Noop, Layout },
+               { LFUN_FONT_DEFAULT, "font-default", Noop, Layout },
+               { LFUN_FONT_EMPH, "font-emph", Noop, Layout },
+               { LFUN_FONT_FREE_APPLY, "font-free-apply", Noop, Layout },
+               { LFUN_FONT_FREE_UPDATE, "font-free-update", Noop, Layout },
+               { LFUN_FONT_NOUN, "font-noun", Noop, Layout },
+               { LFUN_FONT_ROMAN, "font-roman", Noop, Layout },
+               { LFUN_FONT_SANS, "font-sans", Noop, Layout },
+               { LFUN_FONT_FRAK, "font-frak", Noop, Layout },
+               { LFUN_FONT_ITAL, "font-ital", Noop, Layout },
+               { LFUN_FONT_SIZE, "font-size", Noop, Layout },
+               { LFUN_FONT_STATE, "font-state", ReadOnly, Layout },
+               { LFUN_FONT_UNDERLINE, "font-underline", Noop, Layout },
+               { LFUN_FOOTNOTE_INSERT, "footnote-insert", Noop, Edit },
+               { LFUN_HFILL_INSERT, "hfill-insert", Noop, Edit },
+               { LFUN_HELP_OPEN, "help-open", NoBuffer | Argument, Buffer },
+               { LFUN_HYPHENATION_POINT_INSERT, "hyphenation-point-insert", Noop, Edit },
+               { LFUN_LIGATURE_BREAK_INSERT, "ligature-break-insert", Noop, Edit },
+               { LFUN_INDEX_INSERT, "index-insert", Noop, Edit },
+               { LFUN_INDEX_PRINT, "index-print", Noop, Edit },
+               { LFUN_KEYMAP_OFF, "keymap-off", ReadOnly, Edit },
+               { LFUN_KEYMAP_PRIMARY, "keymap-primary", ReadOnly, Edit },
+               { LFUN_KEYMAP_SECONDARY, "keymap-secondary", ReadOnly, Edit },
+               { LFUN_KEYMAP_TOGGLE, "keymap-toggle", ReadOnly, Edit },
+               { LFUN_LABEL_INSERT, "label-insert", Noop, Edit },
+               { LFUN_OPTIONAL_INSERT, "optional-insert", Noop, Edit },
+               { LFUN_BIBITEM_INSERT, "bibitem-insert", Noop, Edit },
+               { LFUN_CITATION_INSERT, "citation-insert", Noop, Edit },
+               { LFUN_BIBTEX_DATABASE_ADD, "bibtex-database-add", Noop, Edit },
+               { LFUN_BIBTEX_DATABASE_DEL, "bibtex-database-del", Noop, Edit },
+               { LFUN_LINE_INSERT, "line-insert", Noop, Edit },
+               { LFUN_PAGEBREAK_INSERT, "pagebreak-insert", Noop, Edit },
+               { LFUN_LANGUAGE, "language", Noop, Edit },
+               { LFUN_LAYOUT, "layout", Noop, Layout },
+               { LFUN_LAYOUT_PARAGRAPH, "layout-paragraph", ReadOnly, Layout },
+               { LFUN_LAYOUT_TABULAR, "layout-tabular", Noop, Layout },
+               { LFUN_LINE_BEGIN, "line-begin", ReadOnly | NoUpdate, Edit },
+               { LFUN_LINE_BEGIN_SELECT, "line-begin-select", ReadOnly | SingleParUpdate, Edit },
+               { LFUN_LINE_DELETE, "line-delete-forward", Noop, Edit }, // there is no line-delete-backward
+               { LFUN_LINE_END, "line-end", ReadOnly | NoUpdate, Edit },
+               { LFUN_LINE_END_SELECT, "line-end-select", ReadOnly | SingleParUpdate, Edit },
 #if 0
-               { LFUN_LIST_INSERT, "list-insert", Noop },
+               { LFUN_LIST_INSERT, "list-insert", Noop, Edit },
 #endif
-               { LFUN_LYX_QUIT, "lyx-quit", NoBuffer },
-               { LFUN_MARGINALNOTE_INSERT, "marginalnote-insert", Noop },
-               { LFUN_MARK_OFF, "mark-off", ReadOnly },
-               { LFUN_MARK_ON, "mark-on", ReadOnly },
-               { LFUN_MARK_TOGGLE, "mark-toggle", ReadOnly },
-               { LFUN_MATH_DELIM, "math-delim", Noop },
-               { LFUN_MATH_BIGDELIM, "math-bigdelim", Noop },
-               { LFUN_MATH_DISPLAY, "math-display", Noop },
-               { LFUN_MATH_INSERT, "math-insert", Noop },
-               { LFUN_MATH_SUBSCRIPT, "math-subscript", Noop },
-               { LFUN_MATH_SUPERSCRIPT, "math-superscript", Noop },
-               { LFUN_MATH_LIMITS, "math-limits", Noop },
-               { LFUN_MATH_MACRO, "math-macro", Noop },
-               { LFUN_MATH_MUTATE, "math-mutate", Noop },
-               { LFUN_MATH_SPACE, "math-space", Noop },
-               { LFUN_MATH_IMPORT_SELECTION, "math-import-selection", Noop },
-               { LFUN_MATH_MATRIX, "math-matrix", Noop },
-               { LFUN_MATH_MODE, "math-mode", Noop },
-               { LFUN_MATH_NONUMBER, "math-nonumber", Noop },
-               { LFUN_MATH_NUMBER, "math-number", Noop },
-               { LFUN_MATH_EXTERN, "math-extern", Noop },
-               { LFUN_MATH_SIZE, "math-size", Noop },
-               { LFUN_MENU_OPEN, "menu-open", NoBuffer },
-               { LFUN_MENU_SEPARATOR_INSERT, "menu-separator-insert", Noop },
-               { LFUN_META_PREFIX, "meta-prefix", NoBuffer },
-               { LFUN_BRANCH_INSERT, "branch-insert", Noop },
-               { LFUN_FLEX_INSERT, "flex-insert", Noop },
-               { LFUN_NOTE_INSERT, "note-insert", Noop },
-               { LFUN_BOX_INSERT, "box-insert", Noop },
-               { LFUN_NOTE_NEXT, "note-next", ReadOnly },
-               { LFUN_INSET_TOGGLE, "", ReadOnly },
-               { LFUN_NEXT_INSET_TOGGLE, "next-inset-toggle", ReadOnly },
-               { LFUN_ALL_INSETS_TOGGLE, "all-insets-toggle", ReadOnly },
-               { LFUN_PARAGRAPH_DOWN, "paragraph-down", ReadOnly | NoUpdate},
-               { LFUN_PARAGRAPH_DOWN_SELECT, "paragraph-down-select", ReadOnly },
-               { LFUN_PARAGRAPH_GOTO, "paragraph-goto", ReadOnly },
-               { LFUN_OUTLINE_UP, "outline-up", Noop },
-               { LFUN_OUTLINE_DOWN, "outline-down", Noop },
-               { LFUN_OUTLINE_IN, "outline-in", Noop },
-               { LFUN_OUTLINE_OUT, "outline-out", Noop },
-               { LFUN_PARAGRAPH_SPACING, "paragraph-spacing", Noop },
-               { LFUN_PARAGRAPH_UP, "paragraph-up", ReadOnly | NoUpdate},
-               { LFUN_PARAGRAPH_UP_SELECT, "paragraph-up-select", ReadOnly },
-               { LFUN_PASTE, "paste", Noop },
-               { LFUN_PREFERENCES_SAVE, "preferences-save", NoBuffer },
-               { LFUN_PRIMARY_SELECTION_PASTE, "primary-selection-paste", Noop },
-               { LFUN_QUOTE_INSERT, "quote-insert", Noop },
-               { LFUN_RECONFIGURE, "reconfigure", NoBuffer },
-               { LFUN_REDO, "redo", Noop },
-               { LFUN_LABEL_GOTO, "label-goto", ReadOnly },
-               { LFUN_REFERENCE_NEXT, "reference-next", ReadOnly },
-               { LFUN_SCREEN_DOWN, "screen-down", ReadOnly },
-               { LFUN_SCREEN_DOWN_SELECT, "screen-down-select", ReadOnly },
-               { LFUN_SCREEN_FONT_UPDATE, "screen-font-update", NoBuffer },
-               { LFUN_SCREEN_RECENTER, "screen-recenter", ReadOnly },
-               { LFUN_SCREEN_UP, "screen-up", ReadOnly },
-               { LFUN_SCREEN_UP_SELECT, "screen-up-select", ReadOnly },
-               { LFUN_SELF_INSERT, "self-insert", SingleParUpdate },
-               { LFUN_SPACE_INSERT, "space-insert", Noop },
-               { LFUN_SERVER_CHAR_AFTER, "server-char-after", ReadOnly },
-               { LFUN_SERVER_GET_FONT, "server-get-font", ReadOnly },
-               { LFUN_SERVER_GET_LAYOUT, "server-get-layout", ReadOnly },
-               { LFUN_SERVER_GET_NAME, "server-get-name", ReadOnly },
-               { LFUN_SERVER_GET_XY, "server-get-xy", ReadOnly },
-               { LFUN_SERVER_GOTO_FILE_ROW, "server-goto-file-row", ReadOnly },
-               { LFUN_SERVER_NOTIFY, "server-notify", ReadOnly },
-               { LFUN_SERVER_SET_XY, "server-set-xy", ReadOnly },
-               { LFUN_SET_COLOR, "set-color", ReadOnly | NoBuffer },
-               { LFUN_CELL_BACKWARD, "cell-backward", Noop },
-               { LFUN_CELL_FORWARD, "cell-forward", Noop },
-               { LFUN_CELL_SPLIT, "cell-split", Noop },
-               { LFUN_TABULAR_INSERT, "tabular-insert", Noop },
-               { LFUN_TABULAR_FEATURE, "tabular-feature", Noop },
+               { LFUN_LYX_QUIT, "lyx-quit", NoBuffer, Buffer },
+               { LFUN_MARGINALNOTE_INSERT, "marginalnote-insert", Noop, Edit },
+               { LFUN_MARK_OFF, "mark-off", ReadOnly, Edit },
+               { LFUN_MARK_ON, "mark-on", ReadOnly, Edit },
+               { LFUN_MARK_TOGGLE, "mark-toggle", ReadOnly, Edit },
+               { LFUN_MATH_DELIM, "math-delim", Noop, Math },
+               { LFUN_MATH_BIGDELIM, "math-bigdelim", Noop, Math },
+               { LFUN_MATH_DISPLAY, "math-display", Noop, Math },
+               { LFUN_MATH_INSERT, "math-insert", Noop, Edit },
+               { LFUN_MATH_SUBSCRIPT, "math-subscript", Noop, Math },
+               { LFUN_MATH_SUPERSCRIPT, "math-superscript", Noop, Math },
+               { LFUN_MATH_LIMITS, "math-limits", Noop, Math },
+               { LFUN_MATH_MACRO, "math-macro", Noop, Math },
+               { LFUN_MATH_MUTATE, "math-mutate", Noop, Math },
+               { LFUN_MATH_SPACE, "math-space", Noop, Math },
+               { LFUN_MATH_IMPORT_SELECTION, "math-import-selection", Noop, Math },
+               { LFUN_MATH_MATRIX, "math-matrix", Noop, Math },
+               { LFUN_MATH_MODE, "math-mode", Noop, Math },
+               { LFUN_MATH_NONUMBER, "math-nonumber", Noop, Math },
+               { LFUN_MATH_NUMBER, "math-number", Noop, Math },
+               { LFUN_MATH_EXTERN, "math-extern", Noop, Math },
+               { LFUN_MATH_SIZE, "math-size", Noop, Math },
+               { LFUN_MENU_OPEN, "menu-open", NoBuffer, Buffer },
+               { LFUN_MENU_SEPARATOR_INSERT, "menu-separator-insert", Noop, Edit },
+               { LFUN_META_PREFIX, "meta-prefix", NoBuffer, System },
+               { LFUN_BRANCH_INSERT, "branch-insert", Noop, Edit },
+               { LFUN_FLEX_INSERT, "flex-insert", Noop, Edit },
+               { LFUN_NOTE_INSERT, "note-insert", Noop, Edit },
+               { LFUN_BOX_INSERT, "box-insert", Noop, Edit },
+               { LFUN_NOTE_NEXT, "note-next", ReadOnly, Edit },
+               { LFUN_INSET_TOGGLE, "", ReadOnly, Hidden },
+               { LFUN_NEXT_INSET_TOGGLE, "next-inset-toggle", ReadOnly, Edit },
+               { LFUN_ALL_INSETS_TOGGLE, "all-insets-toggle", ReadOnly, Edit },
+               { LFUN_PARAGRAPH_DOWN, "paragraph-down", ReadOnly | NoUpdate, Edit },
+               { LFUN_PARAGRAPH_DOWN_SELECT, "paragraph-down-select", ReadOnly, Edit },
+               { LFUN_PARAGRAPH_GOTO, "paragraph-goto", ReadOnly, Edit },
+               { LFUN_OUTLINE_UP, "outline-up", Noop, Edit },
+               { LFUN_OUTLINE_DOWN, "outline-down", Noop, Edit },
+               { LFUN_OUTLINE_IN, "outline-in", Noop, Edit },
+               { LFUN_OUTLINE_OUT, "outline-out", Noop, Edit },
+               { LFUN_PARAGRAPH_SPACING, "paragraph-spacing", Noop, Edit },
+               { LFUN_PARAGRAPH_UP, "paragraph-up", ReadOnly | NoUpdate, Edit },
+               { LFUN_PARAGRAPH_UP_SELECT, "paragraph-up-select", ReadOnly, Edit },
+               { LFUN_PASTE, "paste", Noop, Edit },
+               { LFUN_PREFERENCES_SAVE, "preferences-save", NoBuffer, Edit },
+               { LFUN_PRIMARY_SELECTION_PASTE, "primary-selection-paste", Noop, Edit },
+               { LFUN_QUOTE_INSERT, "quote-insert", Noop, Edit },
+               { LFUN_RECONFIGURE, "reconfigure", NoBuffer, System },
+               { LFUN_REDO, "redo", Noop, Edit },
+               { LFUN_LABEL_GOTO, "label-goto", ReadOnly, Edit },
+               { LFUN_REFERENCE_NEXT, "reference-next", ReadOnly, Edit },
+               { LFUN_SCREEN_DOWN, "screen-down", ReadOnly, Edit },
+               { LFUN_SCREEN_DOWN_SELECT, "screen-down-select", ReadOnly, Edit },
+               { LFUN_SCREEN_FONT_UPDATE, "screen-font-update", NoBuffer, Layout },
+               { LFUN_SCREEN_RECENTER, "screen-recenter", ReadOnly, Edit },
+               { LFUN_SCREEN_UP, "screen-up", ReadOnly, Edit },
+               { LFUN_SCREEN_UP_SELECT, "screen-up-select", ReadOnly, Edit },
+               { LFUN_SELF_INSERT, "self-insert", SingleParUpdate, Hidden },
+               { LFUN_SPACE_INSERT, "space-insert", Noop, Edit },
+               { LFUN_SERVER_CHAR_AFTER, "server-char-after", ReadOnly, System },
+               { LFUN_SERVER_GET_FONT, "server-get-font", ReadOnly, System },
+               { LFUN_SERVER_GET_LAYOUT, "server-get-layout", ReadOnly, System },
+               { LFUN_SERVER_GET_NAME, "server-get-name", ReadOnly, System },
+               { LFUN_SERVER_GET_XY, "server-get-xy", ReadOnly, System },
+               { LFUN_SERVER_GOTO_FILE_ROW, "server-goto-file-row", ReadOnly, System },
+               { LFUN_SERVER_NOTIFY, "server-notify", ReadOnly, System },
+               { LFUN_SERVER_SET_XY, "server-set-xy", ReadOnly, System },
+               { LFUN_SET_COLOR, "set-color", ReadOnly | NoBuffer, Edit },
+               { LFUN_CELL_BACKWARD, "cell-backward", Noop, Edit },
+               { LFUN_CELL_FORWARD, "cell-forward", Noop, Edit },
+               { LFUN_CELL_SPLIT, "cell-split", Noop, Edit },
+               { LFUN_TABULAR_INSERT, "tabular-insert", Noop, Edit },
+               { LFUN_TABULAR_FEATURE, "tabular-feature", Noop, Edit },
 #if 0
-               { LFUN_THEOREM_INSERT, "theorem-insert", Noop },
+               { LFUN_THEOREM_INSERT, "theorem-insert", Noop, Edit },
 #endif
-               { LFUN_THESAURUS_ENTRY, "thesaurus-entry", ReadOnly },
-               { LFUN_TOC_INSERT, "toc-insert", Noop },
-               { LFUN_TOGGLE_CURSOR_FOLLOWS_SCROLLBAR, "toggle-cursor-follows-scrollbar", ReadOnly },
-               { LFUN_UNDO, "undo", Noop },
-               { LFUN_UP, "up", ReadOnly | NoUpdate},
-               { LFUN_UP_SELECT, "up-select", ReadOnly | SingleParUpdate },
-               { LFUN_VC_CHECK_IN, "vc-check-in", ReadOnly },
-               { LFUN_VC_CHECK_OUT, "vc-check-out", ReadOnly },
-               { LFUN_VC_REGISTER, "vc-register", ReadOnly },
-               { LFUN_VC_REVERT, "vc-revert", ReadOnly },
-               { LFUN_VC_UNDO_LAST, "vc-undo-last", ReadOnly },
-               { LFUN_WORD_BACKWARD, "word-backward", ReadOnly | NoUpdate},
-               { LFUN_WORD_BACKWARD_SELECT, "word-backward-select", ReadOnly | SingleParUpdate },
-               { LFUN_WORD_CAPITALIZE, "word-capitalize", Noop },
-               { LFUN_WORD_DELETE_BACKWARD, "word-delete-backward", Noop },
-               { LFUN_WORD_DELETE_FORWARD, "word-delete-forward", Noop },
-               { LFUN_WORD_FIND_BACKWARD, "word-find-backward", ReadOnly },
-               { LFUN_WORD_FIND_FORWARD, "word-find-forward", ReadOnly },
-               { LFUN_WORD_FORWARD, "word-forward", ReadOnly | NoUpdate},
-               { LFUN_WORD_FORWARD_SELECT, "word-forward-select", ReadOnly | SingleParUpdate },
-               { LFUN_WORD_LOWCASE, "word-lowcase", Noop },
-               { LFUN_WORD_SELECT, "word-select", ReadOnly },
-               { LFUN_WORD_UPCASE, "word-upcase", Noop },
-               { LFUN_MESSAGE, "message", NoBuffer },
-               { LFUN_CHARS_TRANSPOSE, "chars-transpose", Noop },
-               { LFUN_FLOAT_LIST, "float-list", Noop },
-               { LFUN_ESCAPE, "escape", ReadOnly },
-               { LFUN_CHANGES_TRACK, "changes-track", Noop },
-               { LFUN_CHANGES_OUTPUT, "changes-output", Noop },
-               { LFUN_CHANGE_NEXT, "change-next", ReadOnly },
-               { LFUN_CHANGES_MERGE, "changes-merge", Noop },
-               { LFUN_CHANGE_ACCEPT, "change-accept", Noop },
-               { LFUN_CHANGE_REJECT, "change-reject", Noop },
-               { LFUN_ALL_CHANGES_ACCEPT, "all-changes-accept", Noop },
-               { LFUN_ALL_CHANGES_REJECT, "all-changes-reject", Noop },
-               { LFUN_DIALOG_SHOW, "dialog-show", NoBuffer },
-               { LFUN_DIALOG_SHOW_NEW_INSET, "dialog-show-new-inset", Noop },
-               { LFUN_DIALOG_UPDATE, "dialog-update", NoBuffer },
-               { LFUN_DIALOG_HIDE, "dialog-hide", NoBuffer },
-               { LFUN_DIALOG_TOGGLE, "dialog-toggle", NoBuffer },
-               { LFUN_DIALOG_DISCONNECT_INSET, "dialog-disconnect-inset", Noop },
-               { LFUN_HYPERLINK_INSERT, "href-insert", Noop },
-               { LFUN_INSET_APPLY, "inset-apply", Noop },
-               { LFUN_INSET_DISSOLVE, "inset-dissolve", Noop },
-               { LFUN_INSET_INSERT, "inset-insert", Noop },
-               { LFUN_INSET_MODIFY, "", Noop },
-               { LFUN_INSET_DIALOG_UPDATE, "", Noop },
-               { LFUN_INSET_SETTINGS, "inset-settings", ReadOnly },
-               { LFUN_PARAGRAPH_PARAMS, "paragraph-params", Noop },
-               { LFUN_PARAGRAPH_PARAMS_APPLY, "paragraph-params-apply", Noop },
-               { LFUN_PARAGRAPH_UPDATE, "", Noop },
-               { LFUN_EXTERNAL_EDIT, "external-edit", Noop },
-               { LFUN_GRAPHICS_EDIT, "graphics-edit", Noop },
-               { LFUN_REPEAT, "repeat", NoBuffer },
-               { LFUN_WORD_FIND, "word-find", ReadOnly },
-               { LFUN_WORD_REPLACE, "word-replace", Noop },
-               { LFUN_BUFFER_LANGUAGE, "buffer-language", Noop },
-               { LFUN_TEXTCLASS_APPLY, "textclass-apply", Noop },
-               { LFUN_TEXTCLASS_LOAD, "textclass-load", Noop },
-               { LFUN_BUFFER_SAVE_AS_DEFAULT, "buffer-save-as-default", Noop },
-               { LFUN_BUFFER_PARAMS_APPLY, "buffer-params-apply", Noop },
-               { LFUN_LYXRC_APPLY, "lyxrc-apply", NoBuffer },
-               { LFUN_INSET_REFRESH, "", Noop },
-               { LFUN_BUFFER_NEXT, "buffer-next", ReadOnly },
-               { LFUN_BUFFER_PREVIOUS, "buffer-previous", ReadOnly },
-               { LFUN_WORDS_COUNT, "words-count", ReadOnly },
-               { LFUN_FINISHED_RIGHT, "", ReadOnly },
-               { LFUN_FINISHED_LEFT, "", ReadOnly },
-               { LFUN_MOUSE_PRESS, "", ReadOnly },
-               { LFUN_MOUSE_MOTION, "", ReadOnly | SingleParUpdate },
-               { LFUN_MOUSE_RELEASE, "", ReadOnly },
-               { LFUN_MOUSE_DOUBLE, "", ReadOnly },
-               { LFUN_MOUSE_TRIPLE, "", ReadOnly },
-               { LFUN_PARAGRAPH_MOVE_DOWN, "paragraph-move-down", Noop },
-               { LFUN_PARAGRAPH_MOVE_UP, "paragraph-move-up", Noop },
-               { LFUN_WINDOW_NEW, "window-new", NoBuffer },
-               { LFUN_WINDOW_CLOSE, "window-close", NoBuffer },
-               { LFUN_UNICODE_INSERT, "unicode-insert", Noop },
-               { LFUN_TOOLBAR_TOGGLE, "toolbar-toggle", NoBuffer },
-               { LFUN_NOMENCL_INSERT, "nomencl-insert", Noop },
-               { LFUN_NOMENCL_PRINT, "nomencl-print", Noop },
-               { LFUN_CLEARPAGE_INSERT, "clearpage-insert", Noop },
-               { LFUN_CLEARDOUBLEPAGE_INSERT, "cleardoublepage-insert", Noop },
-               { LFUN_LISTING_INSERT, "listing-insert", Noop },
-               { LFUN_LAYOUT_MODULES_CLEAR, "layout-modules-clear", Noop },
-               { LFUN_LAYOUT_MODULE_ADD, "layout-module-add", Noop },
-               { LFUN_LAYOUT_RELOAD, "layout-reload", Noop },
-               { LFUN_INFO_INSERT, "info-insert", Noop },
-
-               { LFUN_NOACTION, "", Noop }
+               { LFUN_THESAURUS_ENTRY, "thesaurus-entry", ReadOnly, Edit },
+               { LFUN_TOC_INSERT, "toc-insert", Noop, Edit },
+               { LFUN_TOGGLE_CURSOR_FOLLOWS_SCROLLBAR, "toggle-cursor-follows-scrollbar", ReadOnly, Edit },
+               { LFUN_UNDO, "undo", Noop, Edit },
+               { LFUN_UP, "up", ReadOnly | NoUpdate, Edit },
+               { LFUN_UP_SELECT, "up-select", ReadOnly | SingleParUpdate, Edit },
+               { LFUN_VC_CHECK_IN, "vc-check-in", ReadOnly, System },
+               { LFUN_VC_CHECK_OUT, "vc-check-out", ReadOnly, System },
+               { LFUN_VC_REGISTER, "vc-register", ReadOnly, System },
+               { LFUN_VC_REVERT, "vc-revert", ReadOnly, System },
+               { LFUN_VC_UNDO_LAST, "vc-undo-last", ReadOnly, System },
+               { LFUN_WORD_BACKWARD, "word-backward", ReadOnly | NoUpdate, Edit },
+               { LFUN_WORD_BACKWARD_SELECT, "word-backward-select", ReadOnly | SingleParUpdate, Edit },
+               { LFUN_WORD_CAPITALIZE, "word-capitalize", Noop, Edit },
+               { LFUN_WORD_DELETE_BACKWARD, "word-delete-backward", Noop, Edit },
+               { LFUN_WORD_DELETE_FORWARD, "word-delete-forward", Noop, Edit },
+               { LFUN_WORD_FIND_BACKWARD, "word-find-backward", ReadOnly, Edit },
+               { LFUN_WORD_FIND_FORWARD, "word-find-forward", ReadOnly, Edit },
+               { LFUN_WORD_FORWARD, "word-forward", ReadOnly | NoUpdate, Edit },
+               { LFUN_WORD_FORWARD_SELECT, "word-forward-select", ReadOnly | SingleParUpdate, Edit },
+               { LFUN_WORD_LOWCASE, "word-lowcase", Noop, Edit },
+               { LFUN_WORD_SELECT, "word-select", ReadOnly, Edit },
+               { LFUN_WORD_UPCASE, "word-upcase", Noop, Edit },
+               { LFUN_MESSAGE, "message", NoBuffer, System },
+               { LFUN_CHARS_TRANSPOSE, "chars-transpose", Noop, Edit },
+               { LFUN_FLOAT_LIST, "float-list", Noop, Edit },
+               { LFUN_ESCAPE, "escape", ReadOnly, Edit },
+               { LFUN_CHANGES_TRACK, "changes-track", Noop, Edit },
+               { LFUN_CHANGES_OUTPUT, "changes-output", Noop, Edit },
+               { LFUN_CHANGE_NEXT, "change-next", ReadOnly, Edit },
+               { LFUN_CHANGES_MERGE, "changes-merge", Noop, Edit },
+               { LFUN_CHANGE_ACCEPT, "change-accept", Noop, Edit },
+               { LFUN_CHANGE_REJECT, "change-reject", Noop, Edit },
+               { LFUN_ALL_CHANGES_ACCEPT, "all-changes-accept", Noop, Edit },
+               { LFUN_ALL_CHANGES_REJECT, "all-changes-reject", Noop, Edit },
+               { LFUN_DIALOG_SHOW, "dialog-show", NoBuffer, Edit },
+               { LFUN_DIALOG_SHOW_NEW_INSET, "dialog-show-new-inset", Noop, Edit },
+               { LFUN_DIALOG_UPDATE, "dialog-update", NoBuffer, Edit },
+               { LFUN_DIALOG_HIDE, "dialog-hide", NoBuffer, Edit },
+               { LFUN_DIALOG_TOGGLE, "dialog-toggle", NoBuffer, Edit },
+               { LFUN_DIALOG_DISCONNECT_INSET, "dialog-disconnect-inset", Noop, Edit },
+               { LFUN_HYPERLINK_INSERT, "href-insert", Noop, Edit },
+               { LFUN_INSET_APPLY, "inset-apply", Noop, Edit },
+               { LFUN_INSET_DISSOLVE, "inset-dissolve", Noop, Edit },
+               { LFUN_INSET_INSERT, "inset-insert", Noop, Edit },
+               { LFUN_INSET_MODIFY, "", Noop, Hidden },
+               { LFUN_INSET_DIALOG_UPDATE, "", Noop, Hidden },
+               { LFUN_INSET_SETTINGS, "inset-settings", ReadOnly, Edit },
+               { LFUN_PARAGRAPH_PARAMS, "paragraph-params", Noop, Edit },
+               { LFUN_PARAGRAPH_PARAMS_APPLY, "paragraph-params-apply", Noop, Edit },
+               { LFUN_PARAGRAPH_UPDATE, "", Noop, Hidden },
+               { LFUN_EXTERNAL_EDIT, "external-edit", Noop, Edit },
+               { LFUN_GRAPHICS_EDIT, "graphics-edit", Noop, Edit },
+               { LFUN_REPEAT, "repeat", NoBuffer, Edit },
+               { LFUN_WORD_FIND, "word-find", ReadOnly, Edit },
+               { LFUN_WORD_REPLACE, "word-replace", Noop, Edit },
+               { LFUN_BUFFER_LANGUAGE, "buffer-language", Noop, Buffer },
+               { LFUN_TEXTCLASS_APPLY, "textclass-apply", Noop, Layout },
+               { LFUN_TEXTCLASS_LOAD, "textclass-load", Noop, Layout },
+               { LFUN_BUFFER_SAVE_AS_DEFAULT, "buffer-save-as-default", Noop, Buffer },
+               { LFUN_BUFFER_PARAMS_APPLY, "buffer-params-apply", Noop, Buffer },
+               { LFUN_LYXRC_APPLY, "lyxrc-apply", NoBuffer, System },
+               { LFUN_INSET_REFRESH, "", Noop, Hidden },
+               { LFUN_BUFFER_NEXT, "buffer-next", ReadOnly, Buffer },
+               { LFUN_BUFFER_PREVIOUS, "buffer-previous", ReadOnly, Buffer },
+               { LFUN_WORDS_COUNT, "words-count", ReadOnly, System },
+               { LFUN_FINISHED_RIGHT, "", ReadOnly, Hidden },
+               { LFUN_FINISHED_LEFT, "", ReadOnly, Hidden },
+               { LFUN_MOUSE_PRESS, "", ReadOnly, Hidden },
+               { LFUN_MOUSE_MOTION, "", ReadOnly | SingleParUpdate, Hidden },
+               { LFUN_MOUSE_RELEASE, "", ReadOnly, Hidden },
+               { LFUN_MOUSE_DOUBLE, "", ReadOnly, Hidden },
+               { LFUN_MOUSE_TRIPLE, "", ReadOnly, Hidden },
+               { LFUN_PARAGRAPH_MOVE_DOWN, "paragraph-move-down", Noop, Edit },
+               { LFUN_PARAGRAPH_MOVE_UP, "paragraph-move-up", Noop, Edit },
+               { LFUN_WINDOW_NEW, "window-new", NoBuffer, Buffer },
+               { LFUN_WINDOW_CLOSE, "window-close", NoBuffer, Buffer },
+               { LFUN_UNICODE_INSERT, "unicode-insert", Noop, Edit },
+               { LFUN_TOOLBAR_TOGGLE, "toolbar-toggle", NoBuffer, Edit },
+               { LFUN_NOMENCL_INSERT, "nomencl-insert", Noop, Edit },
+               { LFUN_NOMENCL_PRINT, "nomencl-print", Noop, Edit },
+               { LFUN_CLEARPAGE_INSERT, "clearpage-insert", Noop, Edit },
+               { LFUN_CLEARDOUBLEPAGE_INSERT, "cleardoublepage-insert", Noop, Edit },
+               { LFUN_LISTING_INSERT, "listing-insert", Noop, Edit },
+               { LFUN_LAYOUT_MODULES_CLEAR, "layout-modules-clear", Noop, Layout },
+               { LFUN_LAYOUT_MODULE_ADD, "layout-module-add", Noop, Layout },
+               { LFUN_LAYOUT_RELOAD, "layout-reload", Noop, Layout },
+               { LFUN_INFO_INSERT, "info-insert", Noop, Edit },
+
+               { LFUN_NOACTION, "", Noop, Hidden }
        };
 
        for (int i = 0; items[i].action != LFUN_NOACTION; ++i) {
-               newFunc(items[i].action, items[i].name, items[i].attrib);
+               newFunc(items[i].action, items[i].name, items[i].attrib, items[i].type);
        }
 
        init = true;
@@ -419,6 +421,13 @@ string const LyXAction::getActionName(kb_action action) const
 }
 
 
+LyXAction::func_type const LyXAction::getActionType(kb_action action) const
+{
+       info_map::const_iterator const it = lyx_info_map.find(action);
+       return it != lyx_info_map.end() ? it->second.type : Hidden;
+}
+
+
 bool LyXAction::funcHasFlag(kb_action action,
                            LyXAction::func_attrib flag) const
 {

diff --git a/src/LyXAction.h b/src/LyXAction.h
index 87254b53c5f0d41171696204ceca5b5cbdb927b8..4f7bc3cf3eccba57afa163b61b35c264ba909e7d 100644 (file)
--- a/src/LyXAction.h
+++ b/src/LyXAction.h
@@ -33,6 +33,17 @@ class FuncRequest;
  * argument. They are used for things like the menus.
  */
 class LyXAction : boost::noncopyable {
+public:
+       /// category of an action, used in the Shortcuts dialog
+       enum func_type {
+               Hidden,  //< Not listed for configuration
+               Edit,    //< Cursor and mouse movement, copy/paste etc
+               Math,    //< Mathematics
+               Buffer,  //< Buffer and window related
+               Layout,  //< Font, Layout and textclass related
+               System,  //< Lyx preference, server etc
+       };
+
 private:
        /// information for an action
        struct func_info {
@@ -40,6 +51,8 @@ private:
                std::string name;
                /// the func_attrib values set
                unsigned int attrib;
+               /// the category of this func
+               func_type type;
        };
 
 public:
@@ -70,6 +83,8 @@ public:
        /// Return the name (and argument) associated with the given (pseudo) action
        std::string const getActionName(kb_action action) const;
 
+       func_type const getActionType(kb_action action) const;
+
        /// True if the command has `flag' set
        bool funcHasFlag(kb_action action, func_attrib flag) const;
 
@@ -86,7 +101,7 @@ private:
        /// populate the action container with our actions
        void init();
        /// add the given action
-       void newFunc(kb_action, std::string const & name, unsigned int attrib);
+       void newFunc(kb_action, std::string const & name, unsigned int attrib, func_type type);
 
        /**
         * This is a list of all the LyXFunc names with the

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index f7faa2ce52a6f2e91e8df9e4cd1c29483182b34f..dcf95962814c1116a3b30ec5f426b9ac253406a0 100644 (file)
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -25,6 +25,7 @@
 #include "gettext.h"
 #include "GuiFontExample.h"
 #include "KeyMap.h"
+#include "KeySequence.h"
 #include "LyXAction.h"
 #include "PanelStack.h"
 #include "paper.h"
@@ -75,7 +76,6 @@ using support::os::external_path_list;
 using support::os::internal_path;
 using support::os::internal_path_list;
 using support::FileFilterList;
-using support::contains;
 
 
 /////////////////////////////////////////////////////////////////////
@@ -1707,86 +1707,78 @@ void PrefShortcuts::apply(LyXRC & rc) const
 }
 
 
-// because KeyMap are nested, we need to add all LFUNC iteratively.
-void addKeyMap(QTreeWidgetItem * mathItem, 
-       QTreeWidgetItem * editItem,
-       QTreeWidgetItem * bufferItem,
-       QTreeWidgetItem * fontItem,
-       QTreeWidgetItem * layoutItem,
-       QTreeWidgetItem * miscItem,
-       KeyMap & km, string prefix)
-{
-       KeyMap::Table::const_iterator it = km.begin();
-       KeyMap::Table::const_iterator it_end = km.end();
-       for (; it != it_end; ++it) {
-               // a LFUN_COMMAND_PREFIX
-               if (it->table.get()) {
-                       addKeyMap(mathItem, editItem, bufferItem, fontItem, layoutItem, miscItem,
-                               *it->table.get(), prefix + " " + km.printKeySym(it->code, it->mod.first));
-                       continue;
-               }
-               QTreeWidgetItem * newItem = NULL;
-               string const action = lyxaction.getActionName(it->func.action);
-               if (action == "self-insert")
-                       continue;
-               else if (contains(action, "math"))
-                       newItem = new QTreeWidgetItem(mathItem);
-               else if (contains(action, "buffer") || contains(action, "window")
-                       || contains(action, "file"))
-                       newItem = new QTreeWidgetItem(bufferItem);
-               else if (contains(action, "forward") || contains(action, "backward")
-                       || contains(action, "increment") || contains(action, "decrement")
-                       || contains(action, "copy") || contains(action, "cut") 
-                       || contains(action, "paste") || contains(action, "break")
-                       || contains(action, "begin") || contains(action, "end")
-                       || contains(action, "screen") || contains(action, "tabular"))
-                       newItem = new QTreeWidgetItem(editItem);
-               else if (contains(action, "font"))
-                       newItem = new QTreeWidgetItem(fontItem);
-               else if (contains(action, "layout"))
-                       newItem = new QTreeWidgetItem(layoutItem);
-               else
-                       newItem = new QTreeWidgetItem(miscItem);
-                       
-               QString const lfun = toqstr(from_utf8(action) + " " + it->func.argument());
-               QString const shortcut = toqstr(prefix + " " + km.printKeySym(it->code, it->mod.first));
-               newItem->setText(0, lfun);
-               newItem->setText(1, shortcut);
-               // FIXME: TreeItem can not be user-checkable?
-               newItem->setFlags(newItem->flags() | Qt::ItemIsEditable
-                       | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable);
-       }
-}
-
-
 void PrefShortcuts::update(LyXRC const & rc)
 {
        bindFileED->setText(toqstr(external_path(rc.bind_file)));
        shortcutsTW->clear();
 
+       QTreeWidgetItem * editItem = new QTreeWidgetItem(shortcutsTW);
+       editItem->setText(0, toqstr("Cursor, Mouse and Editing functions"));
+
        // first insert a few categories
-       QTreeWidgetItem * mathItem = new QTreeWidgetItem(shortcutsTW, 2);
+       QTreeWidgetItem * mathItem = new QTreeWidgetItem(shortcutsTW);
        mathItem->setText(0, toqstr("Mathematical Symbols"));
        
-       QTreeWidgetItem * editItem = new QTreeWidgetItem(shortcutsTW, 3);
-       editItem->setText(0, toqstr("Edit"));
-
-       QTreeWidgetItem * bufferItem = new QTreeWidgetItem(shortcutsTW, 4);
-       bufferItem->setText(0, toqstr("Buffer and window"));
+       QTreeWidgetItem * bufferItem = new QTreeWidgetItem(shortcutsTW);
+       bufferItem->setText(0, toqstr("Buffer and Window"));
        
-       QTreeWidgetItem * fontItem = new QTreeWidgetItem(shortcutsTW, 4);
-       fontItem->setText(0, toqstr("Font"));
+       QTreeWidgetItem * layoutItem = new QTreeWidgetItem(shortcutsTW);
+       layoutItem->setText(0, toqstr("Font, Layouts and Textclasses"));
 
-       QTreeWidgetItem * layoutItem = new QTreeWidgetItem(shortcutsTW, 4);
-       layoutItem->setText(0, toqstr("Layouts"));
+       QTreeWidgetItem * systemItem = new QTreeWidgetItem(shortcutsTW);
+       systemItem->setText(0, toqstr("System and Miscellaneous"));
 
-       QTreeWidgetItem * miscItem = new QTreeWidgetItem(shortcutsTW, 5);
-       miscItem->setText(0, toqstr("Miscellaneous"));
+       // listBindings(unbound=true) lists all bound and unbound lfuns
+       KeyMap::BindingList const bindinglist = theTopLevelKeymap().listBindings(true);
 
-       // iteratively add all LFUN in the current Keymap
-       addKeyMap(mathItem, editItem, bufferItem, fontItem, layoutItem, miscItem, 
-               theTopLevelKeymap(), string());
+       KeyMap::BindingList::const_iterator it = bindinglist.begin();
+       KeyMap::BindingList::const_iterator it_end = bindinglist.end();
+       for (; it != it_end; ++it) {
+               kb_action action = it->first.action;
+               string const action_name = lyxaction.getActionName(action);
+               QString const lfun = toqstr(from_utf8(action_name) 
+                       + " " + it->first.argument());
+               QString const shortcut = toqstr(it->second.print(false));
+               
+               QTreeWidgetItem * newItem = NULL;
+               // if a item with the same lfun already exists, insert as a
+               // child item to that item.
+               // WARNING: this can be slow.
+               QList<QTreeWidgetItem*> items = shortcutsTW->findItems(lfun, 
+                       Qt::MatchFlags(Qt::MatchExactly | Qt::MatchRecursive), 0);
+               if (!items.empty())
+                       newItem = new QTreeWidgetItem(items[0]);
+               else {
+                       switch(lyxaction.getActionType(action)) {
+                       case LyXAction::Hidden:
+                               continue;
+                       case LyXAction::Edit:
+                               newItem = new QTreeWidgetItem(editItem);
+                               break;
+                       case LyXAction::Math:
+                               newItem = new QTreeWidgetItem(mathItem);
+                               break;
+                       case LyXAction::Buffer:
+                               newItem = new QTreeWidgetItem(bufferItem);
+                               break;
+                       case LyXAction::Layout:
+                               newItem = new QTreeWidgetItem(layoutItem);
+                               break;
+                       case LyXAction::System:
+                               newItem = new QTreeWidgetItem(systemItem);
+                               break;
+                       default:
+                               // this should not happen
+                               newItem = new QTreeWidgetItem(shortcutsTW);
+                       }
+               }
 
+               newItem->setText(0, lfun);
+               newItem->setText(1, shortcut);
+               // FIXME: TreeItem can not be user-checkable?
+               newItem->setFlags(newItem->flags() | Qt::ItemIsEditable
+                       | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable);
+       }
        shortcutsTW->sortItems(0, Qt::AscendingOrder);
 }