From 31538bd39e1a235d27d5841d6ddacba915fd6b3b Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Fri, 1 Mar 2002 14:13:01 +0000 Subject: [PATCH] change the way kbd sequences are shown in minibuffer git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3625 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 10 ++++++++++ src/kbsequence.C | 4 ++-- src/lyxfunc.C | 4 ++-- src/minibuffer.C | 2 +- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 0a54d70bed..405652395d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,15 @@ 2002-03-01 Jean-Marc Lasgouttes + * minibuffer.C (MiniBuffer): reset timout to 6000, as it was before. + + * lyxfunc.C (processKeySym): print sequence also if it is + `deleted' (complete) + + * kbsequence.C (print): print sequence even if it is deleted + (complete would be a better word, actually). + + * lyxfunc.C (dispatch): print complete options after a prefix key + * vspace.C (asLatexCommand): rewrite in a slightly different form. 2002-03-01 Martin Vermeer diff --git a/src/kbsequence.C b/src/kbsequence.C index a56440dfdf..29f2cdc80f 100644 --- a/src/kbsequence.C +++ b/src/kbsequence.C @@ -139,8 +139,8 @@ string const kb_sequence::print() const { string buf; - if (deleted_) - return buf; + //if (deleted_) + // return buf; for (vector::size_type i = 0; i < length_; ++i) { buf += kb_keymap::printKeysym(sequence[i], modifiers[i] & 0xffff); diff --git a/src/lyxfunc.C b/src/lyxfunc.C index 5b8ea4cf83..5b44cf0157 100644 --- a/src/lyxfunc.C +++ b/src/lyxfunc.C @@ -302,7 +302,7 @@ void LyXFunc::processKeySym(KeySym keysym, unsigned int state) // why not return already here if action == -1 and // num_bytes == 0? (Lgb) - if (keyseq.length() > 1 && !keyseq.deleted()) { + if (keyseq.length() > 1) { owner->message(keyseq.print()); } @@ -1019,7 +1019,7 @@ string const LyXFunc::dispatch(kb_action action, string argument) owner->view()->update(TEXT(), BufferView::SELECT|BufferView::FITCUR); } - owner->message(keyseq.print()); + owner->message(keyseq.printOptions()); } break; diff --git a/src/minibuffer.C b/src/minibuffer.C index 5803739f9c..3f1ae5224e 100644 --- a/src/minibuffer.C +++ b/src/minibuffer.C @@ -63,7 +63,7 @@ MiniBuffer::MiniBuffer(LyXView * o, FL_Coord x, FL_Coord y, { add(FL_NORMAL_INPUT, x, y, h, w); - timer = new Timeout(600); + timer = new Timeout(6000); timer->timeout.connect(slot(this, &MiniBuffer::init)); stored_timer = new Timeout(1500); -- 2.39.2