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

diff --git a/src/uisupport/inputline.cpp b/src/uisupport/inputline.cpp
index b74e10ec..745a3e33 100644
--- a/src/uisupport/inputline.cpp
+++ b/src/uisupport/inputline.cpp
@@ -18,6 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include "bufferview.h"
 #include "inputline.h"
 #include "tabcompleter.h"
 
@@ -33,6 +34,27 @@ InputLine::InputLine(QWidget *parent)
 InputLine::~InputLine() {
 }
 
+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) { // 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;
+    }
+  }
+  return false;
+}
+
 void InputLine::keyPressEvent(QKeyEvent * event) {
   switch(event->key()) {
   case Qt::Key_Up:
@@ -102,15 +124,15 @@ void InputLine::on_returnPressed() {
 }
 
 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;
     }
   }