Fixed cut&paste bugs and added freespacing for ERT Insets.

[lyx.git] / src / minibuffer.C

diff --git a/src/minibuffer.C b/src/minibuffer.C
index 944af290e338f54cbe143514ec0308d25eb40690..7583a803eb74f571964c36ff84fab08e1208e82b 100644 (file)
--- a/src/minibuffer.C
+++ b/src/minibuffer.C
@@ -18,6 +18,9 @@
 #pragma implementation
 #endif
 
+// FIXME: temporary 
+#include "frontends/xforms/DropDown.h"
+ 
 #include "minibuffer.h"
 
 #include "support/lyxalgo.h"
@@ -62,7 +65,21 @@ MiniBuffer::MiniBuffer(LyXView * o, FL_Coord x, FL_Coord y,
        deactivate();
 }
 
+ 
+// thanks for nothing, xforms (recursive creation not allowed) 
+void MiniBuffer::dd_init()
+{
+       dropdown_ = new DropDown(owner_, the_buffer);
+       dropdown_->result.connect(slot(this, &MiniBuffer::set_complete_input));
+}
+
+
+MiniBuffer::~MiniBuffer()
+{
+       delete dropdown_;
+}
 
+ 
 void MiniBuffer::stored_slot() 
 {
        if (stored_) {
@@ -136,14 +153,15 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key)
                                // Perfect match
                                string const tmp =
                                        comp[0] + _(" [sole completion]");
-                               stored_set(comp[0]);
+                               stored_set(comp[0] + " ");
                                set_input(tmp);
                        } else {
                                // More that one match
                                // Find maximal avaliable prefix
                                string const tmp = comp[0];
                                string test(input);
-                               test += tmp[test.length()];
+                               if (tmp.length() > test.length())
+                                       test += tmp[test.length()];
                                while (test.length() < tmp.length()) {
                                        vector<string> vtmp;
                                        lyx::copy_if(comp.begin(),
@@ -158,10 +176,12 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key)
                                }
                                set_input(test);
                                
-                               // How should the possible matches
-                               // be visualized?
-                               std::copy(comp.begin(), comp.end(),
-                                         std::ostream_iterator<string>(std::cerr, "\n"));
+                               int x,y,w,h;
+                               fl_get_wingeometry(fl_get_real_object_window(the_buffer),
+                                       &x, &y, &w, &h);
+ 
+                               // asynchronous completion 
+                               dropdown_->select(comp, x, y + h, w);
                        }
                        return 1; 
                }
@@ -359,6 +379,13 @@ void MiniBuffer::redraw()
 }
 
 
+void MiniBuffer::set_complete_input(string const & str)
+{
+       if (!str.empty())
+               set_input(str);
+}
+
+ 
 void MiniBuffer::set_input(string const & str)
 {
        fl_set_input(the_buffer, str.c_str());