X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Finputline.cpp;h=b48c053d5e22bb695ef5c6b8959cd7c21e246137;hb=af456476e906a564d9faf3381b8bc3111fdb2bbd;hp=fe84cecf5a38e35055fddefc42f93fbb955f0e59;hpb=1bd0b3710fe361c778bc5b5a726353e205d16eaf;p=quassel.git

diff --git a/src/uisupport/inputline.cpp b/src/uisupport/inputline.cpp
index fe84cecf..b48c053d 100644
--- a/src/uisupport/inputline.cpp
+++ b/src/uisupport/inputline.cpp
@@ -27,57 +27,79 @@ InputLine::InputLine(QWidget *parent)
     idx(0),
     tabCompleter(new TabCompleter(this))
 {
-  
-#ifdef Q_WS_MAC
-  bindModifier = Qt::ControlModifier | Qt::AltModifier;
-  jumpModifier = Qt::ControlModifier;
-#else
-  bindModifier = Qt::ControlModifier;
-  jumpModifier = Qt::AltModifier;
-#endif
-
   connect(this, SIGNAL(returnPressed()), this, SLOT(on_returnPressed()));
   connect(this, SIGNAL(textChanged(QString)), this, SLOT(on_textChanged(QString)));
-
 }
 
 InputLine::~InputLine() {
 }
 
 void InputLine::keyPressEvent(QKeyEvent * event) {
-  if((event->modifiers() == jumpModifier || event->modifiers() == bindModifier) &&
-     (Qt::Key_0 <= event->key() && event->key() <= Qt::Key_9)) {
-    event->ignore();
-    return;
+  switch(event->key()) {
+  case Qt::Key_Up:
+    event->accept();
+
+    addToHistory(text(), true);
+    
+    if(idx > 0) {
+      idx--;
+      showHistoryEntry();
+    }
+
+    break;
+    
+  case Qt::Key_Down:
+    event->accept();
+
+    addToHistory(text(), true);
+    
+    if(idx < history.count()) {
+      idx++;
+      if(idx < history.count() || tempHistory.contains(idx)) // tempHistory might have an entry for idx == history.count() + 1
+        showHistoryEntry();
+      else
+        resetLine();              // equals clear() in this case
+    } else {
+      addToHistory(text());
+      resetLine();
+    }
+
+    break;
+    
+  case Qt::Key_Select:		// for Qtopia
+    emit returnPressed();
+
+  default:
+    QLineEdit::keyPressEvent(event);
   }
+}
+
+bool InputLine::addToHistory(const QString &text, bool temporary) {
+  if(text.isEmpty())
+    return false;
+
+  Q_ASSERT(0 <= idx && idx <= history.count());
   
-  if(event->key() == Qt::Key_Tab) { // Tabcomplete
-    tabCompleter->complete();
-    event->accept();
-  } else {
-    tabCompleter->reset();
-    if(event->key() == Qt::Key_Up) {
-      if(idx > 0) { idx--; setText(history[idx]); }
-      event->accept();
-    } else if(event->key() == Qt::Key_Down) {
-      if(idx < history.count()) idx++;
-      if(idx < history.count()) setText(history[idx]);
-      else setText("");
-      event->accept();
-    } else if(event->key() == Qt::Key_Select) {  // for Qtopia
-      emit returnPressed();
-      QLineEdit::keyPressEvent(event);
+  if(history.isEmpty() || text != history[idx - (int)(idx == history.count())]) {
+    // if an entry of the history is changed, we remember it and show it again at this
+    // position until a line was actually sent
+    // sent lines get appended to the history
+    if(temporary) {
+      tempHistory[idx] = text;
     } else {
-      QLineEdit::keyPressEvent(event);
+      history << text;
+      tempHistory.clear();
     }
+    return true;
+  } else {
+    return false;
   }
 }
 
 void InputLine::on_returnPressed() {
-  history << text();
-  idx = history.count();
+  addToHistory(text());
   emit sendText(text());
-  clear();
+  resetLine();
 }
 
 void InputLine::on_textChanged(QString newText) {
@@ -105,6 +127,15 @@ void InputLine::on_textChanged(QString newText) {
     emit returnPressed();
     insert(remainder);
   }
-  
 }
 
+void InputLine::resetLine() {
+  // every time the InputLine is cleared we also reset history index
+  idx = history.count();
+  clear();
+}
+
+void InputLine::showHistoryEntry() {
+  // if the user changed the history, display the changed line
+  tempHistory.contains(idx) ? setText(tempHistory[idx]) : setText(history[idx]);
+}