X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fmultilineedit.cpp;h=871f47a7607297c71881e0bb206faa8d3ffafdd6;hp=6c19d14d7560f58805b97bc9f0507e6ee2d584de;hb=ff39958dd98644e73b7b77bdd986944134f78d09;hpb=37643ad5af930908188fd34683d0ec3a8929f604

diff --git a/src/uisupport/multilineedit.cpp b/src/uisupport/multilineedit.cpp
index 6c19d14d..871f47a7 100644
--- a/src/uisupport/multilineedit.cpp
+++ b/src/uisupport/multilineedit.cpp
@@ -23,6 +23,7 @@
 #include <QMessageBox>
 #include <QScrollBar>
 
+#include "actioncollection.h"
 #include "bufferview.h"
 #include "graphicalui.h"
 #include "multilineedit.h"
@@ -31,18 +32,14 @@
 const int leftMargin = 3;
 
 MultiLineEdit::MultiLineEdit(QWidget *parent)
-  :
-#ifdef HAVE_KDE
-    KTextEdit(parent),
-#else
-    QTextEdit(parent),
-#endif
-    idx(0),
+  : MultiLineEditParent(parent),
+    _idx(0),
     _mode(SingleLine),
     _singleLine(true),
     _minHeight(1),
     _maxHeight(5),
     _scrollBarsEnabled(true),
+    _pasteProtectionEnabled(true),
     _lastDocumentHeight(-1)
 {
 #if QT_VERSION >= 0x040500
@@ -171,6 +168,10 @@ QSize MultiLineEdit::minimumSizeHint() const {
   return sizeHint();
 }
 
+void MultiLineEdit::setEmacsMode(bool enable) {
+  _emacsMode = enable;
+}
+
 void MultiLineEdit::setSpellCheckEnabled(bool enable) {
 #ifdef HAVE_KDE
   setCheckSpellingEnabled(enable);
@@ -189,25 +190,25 @@ void MultiLineEdit::setPasteProtectionEnabled(bool enable, QWidget *) {
 }
 
 void MultiLineEdit::historyMoveBack() {
-  addToHistory(convertHtmlToMircCodes(html()), true);
+  addToHistory(convertRichtextToMircCodes(), true);
 
-  if(idx > 0) {
-    idx--;
+  if(_idx > 0) {
+    _idx--;
     showHistoryEntry();
   }
 }
 
 void MultiLineEdit::historyMoveForward() {
-  addToHistory(convertHtmlToMircCodes(html()), true);
+  addToHistory(convertRichtextToMircCodes(), true);
 
-  if(idx < history.count()) {
-    idx++;
-    if(idx < history.count() || tempHistory.contains(idx)) // tempHistory might have an entry for idx == history.count() + 1
+  if(_idx < _history.count()) {
+    _idx++;
+    if(_idx < _history.count() || _tempHistory.contains(_idx)) // tempHistory might have an entry for idx == history.count() + 1
       showHistoryEntry();
     else
       reset();              // equals clear() in this case
   } else {
-    addToHistory(convertHtmlToMircCodes(html()));
+    addToHistory(convertRichtextToMircCodes());
     reset();
   }
 }
@@ -216,26 +217,42 @@ bool MultiLineEdit::addToHistory(const QString &text, bool temporary) {
   if(text.isEmpty())
     return false;
 
-  Q_ASSERT(0 <= idx && idx <= history.count());
+  Q_ASSERT(0 <= _idx && _idx <= _history.count());
 
   if(temporary) {
     // 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(history.isEmpty() || text != history[idx - (int)(idx == history.count())]) {
-      tempHistory[idx] = text;
+    if(_history.isEmpty() || text != _history[_idx - (int)(_idx == _history.count())]) {
+      _tempHistory[_idx] = text;
       return true;
     }
   } else {
-    if(history.isEmpty() || text != history.last()) {
-      history << text;
-      tempHistory.clear();
+    if(_history.isEmpty() || text != _history.last()) {
+      _history << text;
+      _tempHistory.clear();
       return true;
     }
   }
   return false;
 }
 
+bool MultiLineEdit::event(QEvent *e) {
+  // We need to make sure that global shortcuts aren't eaten
+  if(e->type() == QEvent::ShortcutOverride) {
+    QKeyEvent* event = static_cast<QKeyEvent *>(e);
+    QKeySequence key = QKeySequence(event->key() | event->modifiers());
+    foreach(QAction *action, GraphicalUi::actionCollection()->actions()) {
+      if(action->shortcuts().contains(key)) {
+        e->ignore();
+        return false;
+      }
+    }
+  }
+
+  return MultiLineEditParent::event(e);
+}
+
 void MultiLineEdit::keyPressEvent(QKeyEvent *event) {
   // Workaround the fact that Qt < 4.5 doesn't know InsertLineSeparator yet
 #if QT_VERSION >= 0x040500
@@ -254,11 +271,7 @@ void MultiLineEdit::keyPressEvent(QKeyEvent *event) {
       on_returnPressed();
       return;
     }
-#ifdef HAVE_KDE
-    KTextEdit::keyPressEvent(event);
-#else
-    QTextEdit::keyPressEvent(event);
-#endif
+    MultiLineEditParent::keyPressEvent(event);
     return;
   }
 
@@ -309,6 +322,62 @@ void MultiLineEdit::keyPressEvent(QKeyEvent *event) {
     ;
   }
 
+  if(_emacsMode) {
+    if(event->modifiers() & Qt::ControlModifier) {
+      switch(event->key()) {
+        // move
+      case Qt::Key_A:
+        moveCursor(QTextCursor::StartOfLine);
+        return;
+      case Qt::Key_E:
+        moveCursor(QTextCursor::EndOfLine);
+        return;
+      case Qt::Key_F:
+        moveCursor(QTextCursor::Right);
+        return;
+      case Qt::Key_B:
+        moveCursor(QTextCursor::Left);
+        return;
+      case Qt::Key_Right:
+        moveCursor(QTextCursor::WordRight);
+        return;
+      case Qt::Key_Left:
+        moveCursor(QTextCursor::WordLeft);
+        return;
+
+        // modify
+      case Qt::Key_Y:
+        paste();
+        return;
+      case Qt::Key_K:
+        moveCursor(QTextCursor::EndOfLine, QTextCursor::KeepAnchor);
+        cut();
+        return;
+      }
+    }
+    else if(event->modifiers() & Qt::MetaModifier) {
+      switch(event->key()) {
+      case Qt::Key_Right:
+        moveCursor(QTextCursor::WordRight);
+        return;
+      case Qt::Key_Left:
+        moveCursor(QTextCursor::WordLeft);
+        return;
+      case Qt::Key_F:
+        moveCursor(QTextCursor::WordRight);
+        return;
+      case Qt::Key_B:
+        moveCursor(QTextCursor::WordLeft);
+        return;
+      case Qt::Key_Less:
+        moveCursor(QTextCursor::Start);
+        return;
+      case Qt::Key_Greater:
+        moveCursor(QTextCursor::End);
+        return;
+      }
+    }
+  }
 
 #ifdef HAVE_KDE
   KTextEdit::keyPressEvent(event);
@@ -317,98 +386,125 @@ void MultiLineEdit::keyPressEvent(QKeyEvent *event) {
 #endif
 }
 
-QString MultiLineEdit::convertHtmlToMircCodes(const QString &text) {
-  QRegExp regexHtmlContent = QRegExp("<p.*>(.*)</p>", Qt::CaseInsensitive);
-
-  QRegExp regexLines = QRegExp("(?:<p.*>(.*)</p>\\n?)", Qt::CaseInsensitive);
-  regexLines.setMinimal(true);
-
-  QRegExp regexStyles = QRegExp("(?:((<span.*>)(.*)</span>))", Qt::CaseInsensitive);
-  regexStyles.setMinimal(true);
-
-  QRegExp regexColors = QRegExp("((?:background-)?color):(#[0-9a-f]{6})", Qt::CaseInsensitive);
-  regexStyles.setMinimal(true);
-
-  QStringList result;
-  int posLines = 0;
-  QString htmlContent, pLine, line, line2, styleText, style, content;
-
-  if (regexHtmlContent.indexIn((text)) > -1) {
-    htmlContent = regexHtmlContent.cap();
-    while ((posLines = regexLines.indexIn(htmlContent, posLines)) != -1) {
-      pLine = regexLines.cap(1);
-      QStringList lines = pLine.split("<br />");
-      for (int i=0; i < lines.count(); i++) {
-        line = line2 = lines[i];
-        int posStyles = 0;
-        while ((posStyles = regexStyles.indexIn(line2, posStyles)) != -1) {
-          styleText = regexStyles.cap(1);
-          style = regexStyles.cap(2);
-          content = regexStyles.cap(3);
-
-          if (style.contains("font-weight:600;")) {
-            content.prepend('\x02');
-            content.append('\x02');
-          }
-          if (style.contains("font-style:italic;")) {
-            content.prepend('\x1d');
-            content.append('\x1d');
-          }
-          if (style.contains("text-decoration: underline;")) {
-            content.prepend('\x1f');
-            content.append('\x1f');
-          }
-          if (style.contains("color:#")) { // we have either foreground or background color or both
-            int posColors = 0;
-            QString mircFgColor, mircBgColor;
-            while ((posColors = regexColors.indexIn(style, posColors)) != -1) {
-              QString colorType = regexColors.cap(1);
-              QString color = regexColors.cap(2);
-
-              if (colorType == "color")
-                mircFgColor = _mircColorMap.key(color);
-
-              if (colorType == "background-color")
-                mircBgColor = _mircColorMap.key(color);
-
-              posColors += regexColors.matchedLength();
-            }
-            if (!mircBgColor.isEmpty())
-              content.prepend("," + mircBgColor);
-
-            // we need a fg color to be able to use a bg color
-            if (mircFgColor.isEmpty()) {
-              //FIXME try to use the current forecolor
-              mircFgColor = _mircColorMap.key(textColor().name());
-              if (mircFgColor.isEmpty())
-                mircFgColor = "01"; //use black if the current foreground color can't be converted
-            }
-
-            content.prepend(mircFgColor);
-            content.prepend('\x03');
-            content.append('\x03');
-          }
-
-          line.replace(styleText, content);
-          posStyles += regexStyles.matchedLength();
+QString MultiLineEdit::convertRichtextToMircCodes() {
+  bool underline, bold, italic, color;
+  QString mircText, mircFgColor, mircBgColor;
+  QTextCursor cursor = textCursor();
+  QTextCursor peekcursor = textCursor();
+  cursor.movePosition(QTextCursor::Start);
+
+  underline = bold = italic = color = false;
+
+  while (cursor.movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor)) {
+
+    if (cursor.selectedText() == QString(QChar(QChar::LineSeparator))
+      || cursor.selectedText() == QString(QChar(QChar::ParagraphSeparator))) {
+      if (color) {
+        color = false;
+        mircText.append('\x03');
+      }
+      if (underline) {
+        underline = false;
+        mircText.append('\x1f');
+      }
+      if (italic) {
+        italic = false;
+        mircText.append('\x1d');
+      }
+      if (bold) {
+        bold = false;
+        mircText.append('\x02');
+      }
+      mircText.append('\n');
+    }
+    else {
+      if (!bold && cursor.charFormat().font().bold()) {
+        bold = true;
+        mircText.append('\x02');
+      }
+      if (!italic && cursor.charFormat().fontItalic()) {
+        italic = true;
+        mircText.append('\x1d');
+      }
+      if (!underline && cursor.charFormat().fontUnderline()) {
+        underline = true;
+        mircText.append('\x1f');
+      }
+      if (!color && (cursor.charFormat().foreground().isOpaque() || cursor.charFormat().background().isOpaque())) {
+        color = true;
+        mircText.append('\x03');
+        mircFgColor = _mircColorMap.key(cursor.charFormat().foreground().color().name());
+        mircBgColor = _mircColorMap.key(cursor.charFormat().background().color().name());
+
+        if (mircFgColor.isEmpty()) {
+            mircFgColor = "01"; //use black if the current foreground color can't be converted
         }
 
-        // get rid of all remaining html tags
-        QRegExp regexTags = QRegExp("<.*>",Qt::CaseInsensitive);
-        regexTags.setMinimal(true);
-        line.replace(regexTags, "");
+        mircText.append(mircFgColor);
+        if (cursor.charFormat().background().isOpaque())
+          mircText.append("," + mircBgColor);
+      }
 
-        line.replace("&amp;","&");
-        line.replace("&lt;","<");
-        line.replace("&gt;",">");
-        line.replace("&quot;","\"");
+      mircText.append(cursor.selectedText());
 
-        result << line;
+      peekcursor.setPosition(cursor.position());
+      peekcursor.movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor);
+
+      if (mircCodesChanged(cursor, peekcursor)) {
+        if (color) {
+          color = false;
+          mircText.append('\x03');
+        }
+        if (underline) {
+          underline = false;
+          mircText.append('\x1f');
+        }
+        if (italic) {
+          italic = false;
+          mircText.append('\x1d');
+        }
+        if (bold) {
+          bold = false;
+          mircText.append('\x02');
+        }
       }
-      posLines += regexLines.matchedLength();
     }
+
+    cursor.clearSelection();
+  }
+  if (color) {
+    color = false;
+    mircText.append('\x03');
+  }
+  if (underline) {
+    underline = false;
+    mircText.append('\x1f');
   }
-  return result.join("\n");
+  if (italic) {
+    italic = false;
+    mircText.append('\x1d');
+  }
+  if (bold) {
+    bold = false;
+    mircText.append('\x02');
+  }
+
+  return mircText;
+}
+
+bool MultiLineEdit::mircCodesChanged(QTextCursor &cursor, QTextCursor &peekcursor) {
+  bool changed = false;
+  if (cursor.charFormat().font().bold() != peekcursor.charFormat().font().bold())
+    changed = true;
+  if (cursor.charFormat().fontItalic() != peekcursor.charFormat().fontItalic())
+    changed = true;
+  if (cursor.charFormat().fontUnderline() != peekcursor.charFormat().fontUnderline())
+    changed = true;
+  if (cursor.charFormat().foreground().color() != peekcursor.charFormat().foreground().color())
+    changed = true;
+  if (cursor.charFormat().background().color() != peekcursor.charFormat().background().color())
+    changed = true;
+  return changed;
 }
 
 QString MultiLineEdit::convertMircCodesToHtml(const QString &text) {
@@ -482,11 +578,11 @@ QString MultiLineEdit::convertMircCodesToHtml(const QString &text) {
         words[i] = "<span style=\"" + style + "\">" + words[i] + "</span>";
       }
   }
-  return words.join("");
+  return words.join("").replace("\n","<br />");
 }
 
 void MultiLineEdit::on_returnPressed() {
-  on_returnPressed(convertHtmlToMircCodes(html()));
+  on_returnPressed(convertRichtextToMircCodes());
 }
 
 void MultiLineEdit::on_returnPressed(const QString & text) {
@@ -498,7 +594,7 @@ void MultiLineEdit::on_returnPressed(const QString & text) {
       emit textEntered(line);
     }
     reset();
-    tempHistory.clear();
+    _tempHistory.clear();
   } else {
     emit noTextEntered();
   }
@@ -558,7 +654,7 @@ void MultiLineEdit::on_documentHeightChanged(qreal) {
 
 void MultiLineEdit::reset() {
   // every time the MultiLineEdit is cleared we also reset history index
-  idx = history.count();
+  _idx = _history.count();
   clear();
   QTextBlockFormat format = textCursor().blockFormat();
   format.setLeftMargin(leftMargin); // we want a little space between the frame and the contents
@@ -568,8 +664,7 @@ void MultiLineEdit::reset() {
 
 void MultiLineEdit::showHistoryEntry() {
   // if the user changed the history, display the changed line
-  setHtml(convertMircCodesToHtml(tempHistory.contains(idx) ? tempHistory[idx] : history[idx]));
-  //setPlainText(tempHistory.contains(idx) ? tempHistory[idx] : history[idx]);
+  setHtml(convertMircCodesToHtml(_tempHistory.contains(_idx) ? _tempHistory[_idx] : _history[_idx]));
   QTextCursor cursor = textCursor();
   QTextBlockFormat format = cursor.blockFormat();
   format.setLeftMargin(leftMargin); // we want a little space between the frame and the contents