bug 2221: List depth icon highlightning is out-of-sync

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 2d595aed44d550e879ee6afe9b06c2462db865ea..cf344a934f929dd6c435048f7fda2c6439a85682 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-18  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * kbmap.C (defkey): 
+       * lyxfunc.C (processKeySym): make sure new FuncRequest objects
+       have origin set to KEYBOARD. (bug 2221)
+
 2006-01-16  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
        * rowpainter.C (isCursorOnRow): do not exclude endpos().

diff --git a/src/kbmap.C b/src/kbmap.C
index 32fbdfd1c457bffae6aa06317deeb459b98f8f69..d2492e73096562303a0d39e2c6e11569144ece70 100644 (file)
--- a/src/kbmap.C
+++ b/src/kbmap.C
@@ -274,6 +274,7 @@ void kb_keymap::defkey(kb_sequence * seq,
        newone->mod = seq->modifiers[r];
        if (r + 1 == seq->length()) {
                newone->func = func;
+               newone->func.origin = FuncRequest::KEYBOARD;
                newone->table.reset();
                return;
        } else {

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index b204a709004f7088f1db3c3a46fe33ef5bbd0d52..7a7882d85f4688cfea484db224cccb1dfbddb5fe 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -307,7 +307,8 @@ void LyXFunc::processKeySym(LyXKeySymPtr keysym, key_modifier::state state)
                // by a binding
                if (keysym->isText() && keyseq.length() == 1) {
                        lyxerr[Debug::KEY] << "isText() is true, inserting." << endl;
-                       func = FuncRequest(LFUN_SELFINSERT);
+                       func = FuncRequest(LFUN_SELFINSERT, 
+                                          FuncRequest::KEYBOARD);
                } else {
                        lyxerr[Debug::KEY] << "Unknown, !isText() - giving up" << endl;
                        owner->message(_("Unknown function."));
@@ -318,7 +319,8 @@ void LyXFunc::processKeySym(LyXKeySymPtr keysym, key_modifier::state state)
        if (func.action == LFUN_SELFINSERT) {
                if (encoded_last_key != 0) {
                        string const arg(1, encoded_last_key);
-                       dispatch(FuncRequest(LFUN_SELFINSERT, arg));
+                       dispatch(FuncRequest(LFUN_SELFINSERT, arg, 
+                                            FuncRequest::KEYBOARD));
                        lyxerr[Debug::KEY]
                                << "SelfInsert arg[`" << arg << "']" << endl;
                }