Made DND text follow settings for newline trimming and multiline prom…

…pt (#484) Fixes lxqt/qterminal#970 and fixes lxqt/qterminal#652
lxqt · Aug 26, 2022 · b53be2e · b53be2e
1 parent 95ccd87
commit b53be2e
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 17 deletions.
diff --git a/lib/TerminalDisplay.cpp b/lib/TerminalDisplay.cpp
@@ -2735,22 +2735,7 @@ void TerminalDisplay::emitSelection(bool useXselection,bool appendReturn)
     }
 
     if (_confirmMultilinePaste && text.contains(QLatin1Char('\r'))) {
-        QMessageBox confirmation(this);
-        confirmation.setWindowTitle(tr("Paste multiline text"));
-        confirmation.setText(tr("Are you sure you want to paste this text?"));
-        confirmation.setDetailedText(text);
-        confirmation.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
-        // Click "Show details..." to show those by default
-        const auto buttons = confirmation.buttons();
-        for( QAbstractButton * btn : buttons ) {
-            if (confirmation.buttonRole(btn) == QMessageBox::ActionRole && btn->text() == QMessageBox::tr("Show Details...")) {
-                Q_EMIT btn->clicked();
-                break;
-            }
-        }
-        confirmation.setDefaultButton(QMessageBox::Yes);
-        confirmation.exec();
-        if (confirmation.standardButton(confirmation.clickedButton()) != QMessageBox::Yes) {
+        if (!multilineConfirmation(text)) {
             return;
         }
     }
@@ -2798,6 +2783,29 @@ void TerminalDisplay::bracketText(QString& text) const
     }
 }
 
+bool TerminalDisplay::multilineConfirmation(const QString& text)
+{
+    QMessageBox confirmation(this);
+    confirmation.setWindowTitle(tr("Paste multiline text"));
+    confirmation.setText(tr("Are you sure you want to paste this text?"));
+    confirmation.setDetailedText(text);
+    confirmation.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
+    // Click "Show details..." to show those by default
+    const auto buttons = confirmation.buttons();
+    for( QAbstractButton * btn : buttons ) {
+        if (confirmation.buttonRole(btn) == QMessageBox::ActionRole && btn->text() == QMessageBox::tr("Show Details...")) {
+            Q_EMIT btn->clicked();
+            break;
+        }
+    }
+    confirmation.setDefaultButton(QMessageBox::Yes);
+    confirmation.exec();
+    if (confirmation.standardButton(confirmation.clickedButton()) != QMessageBox::Yes) {
+        return false;
+    }
+    return true;
+}
+
 void TerminalDisplay::setSelection(const QString& t)
 {
     if (QApplication::clipboard()->supportsSelection())
@@ -3209,9 +3217,23 @@ void TerminalDisplay::dropEvent(QDropEvent* event)
   else
   {
     dropText = event->mimeData()->text();
+
+    dropText.replace(QLatin1String("\r\n"), QLatin1String("\n"));
+    dropText.replace(QLatin1Char('\n'), QLatin1Char('\r'));
+    if (_trimPastedTrailingNewlines)
+    {
+      dropText.replace(QRegularExpression(QStringLiteral("\\r+$")), QString());
+    }
+    if (_confirmMultilinePaste && dropText.contains(QLatin1Char('\r')))
+    {
+      if (!multilineConfirmation(dropText))
+      {
+        return;
+      }
+    }
   }
 
-    emit sendStringToEmu(dropText.toLocal8Bit().constData());
+  emit sendStringToEmu(dropText.toLocal8Bit().constData());
 }
 
 void TerminalDisplay::doDrag()

diff --git a/lib/TerminalDisplay.h b/lib/TerminalDisplay.h
@@ -697,6 +697,9 @@ private slots:
     // the left and right are ignored.
     void scrollImage(int lines , const QRect& region);
 
+    // shows the multiline prompt
+    bool multilineConfirmation(const QString& text);
+
     void calcGeometry();
     void propagateSize();
     void updateImageSize();