X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fminibuffer.C;h=92a307dfc73d5040f4d3a1ddfc9496d567efbf61;hb=98c966c64594611e469313314abd1e59524adb4a;hp=944af290e338f54cbe143514ec0308d25eb40690;hpb=271f8d7eec31175f53d012147af164cb27b043ce;p=lyx.git diff --git a/src/minibuffer.C b/src/minibuffer.C index 944af290e3..92a307dfc7 100644 --- a/src/minibuffer.C +++ b/src/minibuffer.C @@ -3,10 +3,10 @@ * The MiniBuffer Class * read minibuffer.h for more * information. - * + * * Copyright 1995 Matthias Ettrich - * Copyright 1995-2001 The LyX Team. - * + * Copyright 1995-2001 The LyX Team. + * * ########################################################################### */ @@ -18,6 +18,9 @@ #pragma implementation #endif +// FIXME: temporary +#include "frontends/xforms/DropDown.h" + #include "minibuffer.h" #include "support/lyxalgo.h" @@ -28,10 +31,14 @@ #include "gettext.h" #include "LyXAction.h" #include "BufferView.h" +#include "frontends/Timeout.h" +#include using SigC::slot; using std::vector; +using std::back_inserter; +using std::find; extern LyXAction lyxaction; @@ -40,7 +47,7 @@ namespace { struct prefix { string p; - prefix(string const & s) + prefix(string const & s) : p(s) {} bool operator()(string const & s) const { return prefixIs(s, p); @@ -55,15 +62,34 @@ MiniBuffer::MiniBuffer(LyXView * o, FL_Coord x, FL_Coord y, : stored_(false), owner_(o), state_(spaces) { add(FL_NORMAL_INPUT, x, y, h, w); - timer.setTimeout(6000); - timer.timeout.connect(slot(this, &MiniBuffer::init)); - stored_timer.setTimeout(1500); - stored_timer.timeout.connect(slot(this, &MiniBuffer::stored_slot)); + + timer = new Timeout(6000); + timer->timeout.connect(slot(this, &MiniBuffer::init)); + + stored_timer = new Timeout(1500); + stored_timer->timeout.connect(slot(this, &MiniBuffer::stored_slot)); deactivate(); } -void MiniBuffer::stored_slot() +// 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)); + dropdown_->keypress.connect(slot(this, &MiniBuffer::append_char)); +} + + +MiniBuffer::~MiniBuffer() +{ + delete timer; + delete stored_timer; + delete dropdown_; +} + + +void MiniBuffer::stored_slot() { if (stored_) { stored_ = false; @@ -72,28 +98,31 @@ void MiniBuffer::stored_slot() } -void MiniBuffer::stored_set(string const & str) +void MiniBuffer::stored_set(string const & str) { stored_input = str; stored_ = true; - stored_timer.start(); + stored_timer->start(); } 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); string input = tmp ? tmp : ""; if (stored_) { - stored_timer.stop(); + stored_timer->stop(); input = stored_input; set_input(input); stored_ = false; } - + switch (key) { case XK_Down: if (hist_iter != history_->end()) { @@ -106,7 +135,7 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key) } else { set_input((*hist_iter)); } - return 1; + return 1; case XK_Up: if (hist_iter == history_->begin()) { // no further history @@ -116,16 +145,16 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key) --hist_iter; set_input((*hist_iter)); } - return 1; + return 1; case 9: case XK_Tab: { // Completion handling. - + vector comp; lyx::copy_if(completion_.begin(), completion_.end(), - std::back_inserter(comp), prefix(input)); + back_inserter(comp), prefix(input)); if (comp.empty()) { // No matches @@ -136,19 +165,20 @@ 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 vtmp; lyx::copy_if(comp.begin(), comp.end(), - std::back_inserter(vtmp), + back_inserter(vtmp), prefix(test)); if (vtmp.size() != comp.size()) { test.erase(test.length() - 1); @@ -157,13 +187,19 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key) test += tmp[test.length()]; } set_input(test); - - // How should the possible matches - // be visualized? - std::copy(comp.begin(), comp.end(), - std::ostream_iterator(std::cerr, "\n")); + + int x,y,w,h; + fl_get_wingeometry(fl_get_real_object_window(the_buffer), + &x, &y, &w, &h); + + // asynchronous completion + int const air = the_buffer->x; + x += air; + y += h - (the_buffer->h + air); + w = the_buffer->w; + dropdown_->select(comp, x, y, w); } - return 1; + return 1; } case 27: case XK_Escape: @@ -172,7 +208,7 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key) init(); deactivate(); //escape.emit(); - return 1; + return 1; case 13: case XK_Return: { @@ -182,7 +218,7 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key) // of argumetns LFUN's should have first. (Lgb) // First check for match vector::const_iterator cit = - std::find(completion_.begin(), + find(completion_.begin(), completion_.end(), input); if (cit == completion_.end()) { @@ -195,7 +231,9 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key) // 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 } @@ -217,9 +255,9 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key) return 1; } } - + } - + default: return 0; } @@ -228,22 +266,22 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key) //lyxerr << "Unhandled minibuffer event!" << endl; break; } - + return 0; } extern "C" { - + static - int C_MiniBuffer_peek_event(FL_OBJECT * ob, int event, + int C_MiniBuffer_peek_event(FL_OBJECT * ob, int event, FL_Coord, FL_Coord, int key, void * /*xev*/) { MiniBuffer * mini = static_cast(ob->u_vdata); return mini->peek_event(ob, event, key); } - + } @@ -261,28 +299,28 @@ FL_OBJECT * MiniBuffer::add(int type, FL_Coord x, FL_Coord y, FL_Coord w, FL_Coord h) { FL_OBJECT * obj; - + the_buffer = obj = fl_add_input(type, x, y, w, h, text.c_str()); - fl_set_object_boxtype(obj, FL_DOWN_BOX); - fl_set_object_resize(obj, FL_RESIZE_ALL); - fl_set_object_gravity(obj, SouthWestGravity, SouthEastGravity); - fl_set_object_color(obj, FL_MCOL, FL_MCOL); - fl_set_object_lsize(obj, FL_NORMAL_SIZE); - + fl_set_object_boxtype(obj, FL_DOWN_BOX); + fl_set_object_resize(obj, FL_RESIZE_ALL); + fl_set_object_gravity(obj, SouthWestGravity, SouthEastGravity); + fl_set_object_color(obj, FL_MCOL, FL_MCOL); + fl_set_object_lsize(obj, FL_NORMAL_SIZE); + // To intercept Up, Down, Table for history - fl_set_object_prehandler(obj, C_MiniBuffer_peek_event); - obj->u_vdata = this; - obj->wantkey = FL_KEY_TAB; + fl_set_object_prehandler(obj, C_MiniBuffer_peek_event); + obj->u_vdata = this; + obj->wantkey = FL_KEY_TAB; set_input(text); - + return obj; } -void MiniBuffer::message(string const & str) +void MiniBuffer::message(string const & str) { - timer.restart(); + timer->restart(); string const ntext = strip(str); if (!the_buffer->focus) { set_input(ntext); @@ -291,7 +329,7 @@ void MiniBuffer::message(string const & str) } -void MiniBuffer::messagePush(string const & str) +void MiniBuffer::messagePush(string const & str) { text_stored = text; message(str); @@ -333,7 +371,7 @@ void MiniBuffer::init() return; timeout.emit(); - timer.stop(); + timer->stop(); } @@ -352,13 +390,37 @@ void MiniBuffer::deactivate() } -void MiniBuffer::redraw() +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::append_char(char c) +{ + if (!c || !isprint(c)) + return; + + char const * tmp = fl_get_input(the_buffer); + string str = tmp ? tmp : ""; + + str += c; + + fl_set_input(the_buffer, str.c_str()); +} + + void MiniBuffer::set_input(string const & str) { fl_set_input(the_buffer, str.c_str());