X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Finputline.cpp;h=b74e10eccab787e6d1db352f26f4f50c66b5d5ab;hp=6ea156aa16d9c2910c48e8a906a2eb2d9767fed5;hb=b2c1179d290dc97f2c8497db9ed0c8adcc679ed7;hpb=455a00f6421435dd5de0bfeb041146287b22d684

diff --git a/src/uisupport/inputline.cpp b/src/uisupport/inputline.cpp
index 6ea156aa..b74e10ec 100644
--- a/src/uisupport/inputline.cpp
+++ b/src/uisupport/inputline.cpp
@@ -19,7 +19,6 @@
  ***************************************************************************/
 
 #include "inputline.h"
-
 #include "tabcompleter.h"
 
 InputLine::InputLine(QWidget *parent)
@@ -35,32 +34,71 @@ InputLine::~InputLine() {
 }
 
 void InputLine::keyPressEvent(QKeyEvent * event) {
-  if(event->key() == Qt::Key_Up) {
-    if(idx > 0) { idx--; setText(history[idx]); }
+  switch(event->key()) {
+  case Qt::Key_Up:
     event->accept();
-  } else if(event->key() == Qt::Key_Down) {
-    if(idx < history.count()) idx++;
-    if(idx < history.count()) setText(history[idx]);
-    else if(!text().isEmpty()) {
-      history << text();
-      idx = history.count();
-      setText("");
+
+    addToHistory(text(), true);
+
+    if(idx > 0) {
+      idx--;
+      showHistoryEntry();
     }
+
+    break;
+
+  case Qt::Key_Down:
     event->accept();
-  } else if(event->key() == Qt::Key_Select) {  // for Qtopia
+
+    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();
-    QLineEdit::keyPressEvent(event);
-  } else {
+
+  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(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 {
+      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) {
@@ -68,7 +106,7 @@ void InputLine::on_textChanged(QString newText) {
   lineSeperators << QString("\r\n")
 		 << QString('\n')
 		 << QString('\r');
-  
+
   QString lineSep;
   foreach(QString seperator, lineSeperators) {
     if(newText.contains(seperator)) {
@@ -79,7 +117,7 @@ void InputLine::on_textChanged(QString newText) {
 
   if(lineSep.isEmpty())
     return;
-  
+
   if(newText.contains(lineSep)) {
     clear();
     QString line = newText.section(lineSep, 0, 0);
@@ -88,6 +126,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]);
+}