// $Id$
//
-// Copyright (C) 2009
+// Copyright (C) 2009
// Fraunhofer Institute for Open Communication Systems (FOKUS)
// Competence Center NETwork research (NET), St. Augustin, GERMANY
// Stefan Bund <g0dil@berlios.de>
//#include "Editor.mpp"
#define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
prefix_ senf::term::BaseEditor::BaseEditor(AbstractTerminal & terminal)
: terminal_ (&terminal),
- keyTimeout_ (senf::ClockService::milliseconds(DEFAULT_KEY_TIMEOUT_MS)),
- timer_ ("senf::term::BaseEditor::keySequenceTimeout",
- senf::membind(&BaseEditor::keySequenceTimeout, this)),
+ keyTimeout_ (ClockService::milliseconds(DEFAULT_KEY_TIMEOUT_MS)),
+ timer_ ("senf::term::BaseEditor::keySequenceTimeout",
+ membind(&BaseEditor::keySequenceTimeout, this)),
column_ (0u), displayHeight_ (1u), line_ (0u)
{
terminal_->setCallbacks(*this);
prefix_ void senf::term::BaseEditor::cb_charReceived(char c)
{
inputBuffer_ += c;
- timer_.timeout(senf::scheduler::eventTime() + keyTimeout_);
+ timer_.timeout(scheduler::eventTime() + keyTimeout_);
processKeys();
}
prefix_ void senf::term::BaseEditor::processKeys()
{
do {
- std::pair<senf::term::KeyParser::keycode_t, std::string::size_type> result
+ std::pair<KeyParser::keycode_t, std::string::size_type> result
(keyParser_.lookup(inputBuffer_));
- if (result.first == senf::term::KeyParser::Incomplete)
+ if (result.first == KeyParser::Incomplete)
return;
v_keyReceived(result.first);
inputBuffer_.erase(0, result.second);
write(*i);
}
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
prefix_ senf::term::LineEditor::LineEditor(AbstractTerminal & terminal, AcceptCallback cb)
- : BaseEditor(terminal), enabled_ (false), prompt_ ("$"), promptWidth_ (1u), editWidth_ (0u),
+ : BaseEditor(terminal), enabled_ (false), prompt_ ("$"), promptWidth_ (1u), editWidth_ (0u),
text_ (""), point_ (0u), displayPos_ (0u), lastKey_ (0u), callback_ (cb), historyPoint_ (0u)
{
defineKey(KeyParser::Return, &bindings::accept);
toColumn(point_ - displayPos_ + promptWidth_ + 1);
}
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
prefix_ void senf::term::bindings::selfInsertCommand(LineEditor & editor)
{
completer(editor, b, e, prefix, completions);
if (completions.empty())
return;
- if (e > text.size())
+ if (e > text.size())
e = text.size();
if (b > e)
b = e;
-
+
// Find common start string of all completions
unsigned commonStart (completions[0].size());
unsigned maxLen (commonStart);
std::string line;
for (unsigned column (0); column < nColumns && i != completions.end(); ++column, ++i) {
std::string entry (colWidth, ' ');
- std::copy(i->begin(),
- i->size() > colWidth-2 ? i->begin()+colWidth-2 : i->end(),
+ std::copy(i->begin(),
+ i->size() > colWidth-2 ? i->begin()+colWidth-2 : i->end(),
entry.begin());
line += entry;
}
}
}
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
#undef prefix_
//#include "Editor.mpp"