* information.
*
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-2000 The LyX Team.
+ * Copyright 1995-2001 The LyX Team.
*
* ###########################################################################
*/
#include <config.h>
+#include <iostream>
+
#ifdef __GNUG__
#pragma implementation
#endif
+// FIXME: temporary
+#include "frontends/xforms/DropDown.h"
+
#include "minibuffer.h"
#include "support/lyxalgo.h"
#include "support/filetools.h"
+#include "support/lstrings.h"
#include "LyXView.h"
+#include "XFormsView.h"
#include "gettext.h"
#include "LyXAction.h"
#include "BufferView.h"
-using std::endl;
using SigC::slot;
using std::vector;
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_) {
stored_ = false;
- fl_set_input(the_buffer, stored_input.c_str());
+ set_input(stored_input);
}
}
int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key)
{
switch (event) {
+ case FL_UNFOCUS:
+ deactivate();
+ break;
case FL_KEYBOARD:
{
char const * tmp = fl_get_input(ob);
if (stored_) {
stored_timer.stop();
input = stored_input;
- fl_set_input(ob, input.c_str());
+ set_input(input);
stored_ = false;
}
if (hist_iter == history_->end()) {
// no further history
stored_set(input);
- fl_set_input(ob, _("[End of history]"));
+ set_input(_("[End of history]"));
} else {
- fl_set_input(ob, (*hist_iter).c_str());
+ set_input((*hist_iter));
}
return 1;
case XK_Up:
if (hist_iter == history_->begin()) {
// no further history
stored_set(input);
- fl_set_input(ob, _("[Beginning of history]"));
+ set_input(_("[Beginning of history]"));
} else {
--hist_iter;
- fl_set_input(ob, (*hist_iter).c_str());
+ set_input((*hist_iter));
}
return 1;
case 9:
// No matches
string const tmp = input + _(" [no match]");
stored_set(input);
- fl_set_input(ob, tmp.c_str());
+ set_input(tmp);
} else if (comp.size() == 1) {
// Perfect match
string const tmp =
comp[0] + _(" [sole completion]");
- stored_set(comp[0]);
- fl_set_input(ob, tmp.c_str());
+ 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(),
}
test += tmp[test.length()];
}
- fl_set_input(ob, test.c_str());
+ 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;
}
case 13:
case XK_Return:
{
+#if 0
+ // This will go in again in a little while
+ // we need to be able to declare what types
+ // of argumetns LFUN's should have first. (Lgb)
// First check for match
vector<string>::const_iterator cit =
std::find(completion_.begin(),
// no such func/item
stored_set(input);
string const tmp = input + _(" [no match]");
- fl_set_input(ob, tmp.c_str());
+ set_input(tmp);
} else {
+#endif
// Return the inputted string
deactivate();
owner_->view()->focus(true);
- history_->push_back(input);
+ if (!input.empty()) {
+ history_->push_back(input);
+ }
stringReady.emit(input);
+# if 0
}
+#endif
return 1;
}
case XK_space:
{
stored_set(input);
string const tmp = input + _(" [no match]");
- fl_set_input(ob, tmp.c_str());
+ set_input(tmp);
return 1;
}
}
}
-extern "C"
-int C_MiniBuffer_peek_event(FL_OBJECT * ob, int event,
- FL_Coord, FL_Coord,
- int key, void * /*xev*/)
-{
- MiniBuffer * mini = static_cast<MiniBuffer*>(ob->u_vdata);
- return mini->peek_event(ob, event, key);
+extern "C" {
+
+ static
+ int C_MiniBuffer_peek_event(FL_OBJECT * ob, int event,
+ FL_Coord, FL_Coord,
+ int key, void * /*xev*/)
+ {
+ MiniBuffer * mini = static_cast<MiniBuffer*>(ob->u_vdata);
+ return mini->peek_event(ob, event, key);
+ }
+
}
void MiniBuffer::prepare()
{
text.erase();
- fl_set_input(the_buffer, "");
+ set_input("");
activate();
- fl_set_focus_object(owner_->getForm(), the_buffer);
+ fl_set_focus_object(static_cast<XFormsView *>(owner_)->getForm(),
+ the_buffer);
}
obj->u_vdata = this;
obj->wantkey = FL_KEY_TAB;
- fl_set_input(the_buffer, text.c_str());
+ set_input(text);
return obj;
}
timer.restart();
string const ntext = strip(str);
if (!the_buffer->focus) {
- fl_set_input(the_buffer, ntext.c_str());
+ set_input(ntext);
text = ntext;
}
}
void MiniBuffer::activate()
{
fl_activate_object(the_buffer);
- fl_redraw_object(the_buffer);
+ redraw();
}
void MiniBuffer::deactivate()
{
- fl_redraw_object(the_buffer);
+ redraw();
fl_deactivate_object(the_buffer);
+ XFlush(fl_display);
}
void MiniBuffer::redraw()
{
fl_redraw_object(the_buffer);
+ XFlush(fl_display);
+}
+
+
+void MiniBuffer::set_complete_input(string const & str)
+{
+ if (!str.empty()) {
+ // add a space so the user can type
+ // an argument immediately
+ set_input(str + " ");
+ }
+}
+
+
+void MiniBuffer::set_input(string const & str)
+{
+ fl_set_input(the_buffer, str.c_str());
+ XFlush(fl_display);
}