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

diff --git a/src/uisupport/inputline.cpp b/src/uisupport/inputline.cpp
index fe84cecf..355845db 100644
--- a/src/uisupport/inputline.cpp
+++ b/src/uisupport/inputline.cpp
@@ -18,8 +18,9 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "inputline.h"
+#include "bufferview.h"
 
+#include "inputline.h"
 #include "tabcompleter.h"
 
 InputLine::InputLine(QWidget *parent)
@@ -27,84 +28,161 @@ 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;
+bool InputLine::eventFilter(QObject *watched, QEvent *event) {
+  if(event->type() != QEvent::KeyPress)
+    return false;
+
+  // keys from BufferView should be sent to (and focus) the input line
+  BufferView *view = qobject_cast<BufferView *>(watched);
+  if(view) {
+    QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
+    if(keyEvent->text().length() == 1 && !(keyEvent->modifiers() & (Qt::ControlModifier ^ Qt::AltModifier)) ) { // normal key press
+      QChar c = keyEvent->text().at(0);
+      if(c.isLetterOrNumber() || c.isSpace() || c.isPunct() || c.isSymbol()) {
+        setFocus();
+        keyPressEvent(keyEvent);
+        return true;
+      } else
+        return false;
+    }
   }
-  
-  if(event->key() == Qt::Key_Tab) { // Tabcomplete
-    tabCompleter->complete();
+  return false;
+}
+
+void InputLine::keyPressEvent(QKeyEvent * event) {
+  switch(event->key()) {
+  case Qt::Key_Up:
     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);
+
+    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(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) {
-  QStringList lineSeperators;
-  lineSeperators << QString("\r\n")
+  QStringList lineSeparators;
+  lineSeparators << QString("\r\n")
 		 << QString('\n')
 		 << QString('\r');
-  
+
   QString lineSep;
-  foreach(QString seperator, lineSeperators) {
-    if(newText.contains(seperator)) {
-      lineSep = seperator;
+  foreach(QString separator, lineSeparators) {
+    if(newText.contains(separator)) {
+      lineSep = separator;
       break;
     }
   }
 
   if(lineSep.isEmpty())
     return;
-  
-  if(newText.contains(lineSep)) {
+
+  QStringList lines = newText.split(lineSep);
+  clear();
+
+  if(lines.count() > 4) {
+    QString msg = tr("Do you really want to paste %1 lines?").arg(lines.count());
+    msg += "<p>";
+    for(int i = 0; i < 3; i++) {
+      msg += lines[i].left(40);
+      if(lines[i].count() > 40)
+	msg += "...";
+      msg += "<br />";
+    }
+    msg += "...</p>";
+    QMessageBox question(QMessageBox::NoIcon, tr("Paste Protection"), msg, QMessageBox::Yes|QMessageBox::No);
+    question.setDefaultButton(QMessageBox::No);
+    question.setWindowFlags(question.windowFlags() | Qt::Sheet);
+    if(question.exec() == QMessageBox::No)
+      return;
+  }
+
+  foreach(QString line, lines) {
     clear();
-    QString line = newText.section(lineSep, 0, 0);
-    QString remainder = newText.section(lineSep, 1);
     insert(line);
     emit returnPressed();
-    insert(remainder);
   }
-  
+//   if(newText.contains(lineSep)) {
+//     clear();
+//     QString line = newText.section(lineSep, 0, 0);
+//     QString remainder = newText.section(lineSep, 1);
+//     insert(line);
+//     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]);
+}