diff options
Diffstat (limited to 'kde/patch/konsole')
4 files changed, 0 insertions, 208 deletions
diff --git a/kde/patch/konsole/konsole.cursor.antialias.patch b/kde/patch/konsole/konsole.cursor.antialias.patch deleted file mode 100644 index 596ccaa..0000000 --- a/kde/patch/konsole/konsole.cursor.antialias.patch +++ /dev/null @@ -1,83 +0,0 @@ -From eccfb1f62bbf67ebffee11e241bd05757b826ff1 Mon Sep 17 00:00:00 2001 -From: Wolfgang Bauer <wbauer@tmo.at> -Date: Mon, 4 Mar 2019 09:59:45 -0500 -Subject: [PATCH] Fix ibeam and underline cursor rendering - -Summary: -Since anti-aliasing was enabled in the painter, coordinates need to -be shifted half a pixel so that they align with the pixel grid, -otherwise the result gets "blurred" due to the anti-aliasing. -And as parts of the blurred shape leak outside the cursor rectangle, -this also leaves artifacts when the cursor moves or blinks as these -parts are not cleared. - -This is basically the same as commit -e7085310d6d594823d0ed491fa8bdbd99dec4932 for the -standard block cursor. - -BUG: 402589 - -Test Plan: -- Switch cursor shape to "I-Beam" or "Underline" in the "Advanced" -profile settings - -The cursors are a single line again now, before they were blurred by -anti-aliasing. - -Screenshots: -Before: -{F6656366} -{F6656370} - -After: -{F6656371} -{F6656373} - -Also, there are no more artifacts when the cursor is moved or -cursor blinking is enabled. - -Reviewers: #konsole, hindenburg - -Reviewed By: #konsole, hindenburg - -Subscribers: hindenburg, konsole-devel - -Tags: #konsole - -Differential Revision: https://phabricator.kde.org/D19513 ---- - src/TerminalDisplay.cpp | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) - -diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp -index 543b8970..397422c4 100644 ---- a/src/TerminalDisplay.cpp -+++ b/src/TerminalDisplay.cpp -@@ -716,16 +716,18 @@ void TerminalDisplay::drawCursor(QPainter& painter, - } - } - } else if (_cursorShape == Enum::UnderlineCursor) { -- painter.drawLine(cursorRect.left(), -- cursorRect.bottom(), -- cursorRect.right(), -- cursorRect.bottom()); -+ QLineF line(cursorRect.left() + 0.5, -+ cursorRect.bottom() - 0.5, -+ cursorRect.right() - 0.5, -+ cursorRect.bottom() - 0.5); -+ painter.drawLine(line); - - } else if (_cursorShape == Enum::IBeamCursor) { -- painter.drawLine(cursorRect.left(), -- cursorRect.top(), -- cursorRect.left(), -- cursorRect.bottom()); -+ QLineF line(cursorRect.left() + 0.5, -+ cursorRect.top() + 0.5, -+ cursorRect.left() + 0.5, -+ cursorRect.bottom() - 0.5); -+ painter.drawLine(line); - } - } - - diff --git a/kde/patch/konsole/konsole.konsolepart.segfault.closing.after.contextmenu.patch b/kde/patch/konsole/konsole.konsolepart.segfault.closing.after.contextmenu.patch deleted file mode 100644 index fcdbb84..0000000 --- a/kde/patch/konsole/konsole.konsolepart.segfault.closing.after.contextmenu.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 1d7142ed24ef370ae984c0441d5b325b42656bd7 Mon Sep 17 00:00:00 2001 -From: Maximilian Schiller <manimax3@outlook.de> -Date: Fri, 29 May 2020 07:36:02 -0400 -Subject: Fix konsolepart segfault when closing after showing context menu - -Assign the _view as the parent to the KXMLGuiFactory because the -factory is referencing the view widget as its associated widget. Since -the TerminalDisplay gets destructed first this is now a dangling -pointer. If the view is set as the parent the factory gets cleaned up -correctly. Also cleanup the created clientBuilder after destruction -because it can't have a parent and would probably leak memory. - -BUG: 415762 -FIXED-IN: 20.08.0 -See also !87 ---- - src/SessionController.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/SessionController.cpp b/src/SessionController.cpp -index e72f342..542955d 100644 ---- a/src/SessionController.cpp -+++ b/src/SessionController.cpp -@@ -1732,11 +1732,13 @@ void SessionController::showDisplayContextMenu(const QPoint& position) - if (factory() == nullptr) { - if (clientBuilder() == nullptr) { - setClientBuilder(new KXMLGUIBuilder(_view)); -+ -+ // Client builder does not get deleted automatically -+ connect(this, &QObject::destroyed, this, [this]{ delete clientBuilder(); }); - } - -- auto factory = new KXMLGUIFactory(clientBuilder(), this); -+ auto factory = new KXMLGUIFactory(clientBuilder(), _view); - factory->addClient(this); -- ////qDebug() << "Created xmlgui factory" << factory; - } - - QPointer<QMenu> popup = qobject_cast<QMenu*>(factory()->container(QStringLiteral("session-popup-menu"), this)); --- -cgit v1.1 - - diff --git a/kde/patch/konsole/konsole.konsolepart.segfault.closing.session.via.menu.patch b/kde/patch/konsole/konsole.konsolepart.segfault.closing.session.via.menu.patch deleted file mode 100644 index 914031b..0000000 --- a/kde/patch/konsole/konsole.konsolepart.segfault.closing.session.via.menu.patch +++ /dev/null @@ -1,58 +0,0 @@ -From fdfae25665731882687da8721e58c3c56a3babf8 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella <nicolas.fella@gmx.de> -Date: Thu, 28 May 2020 09:28:06 -0400 -Subject: Fix crash when closing session in KonsolePart via menu - -This close method is also used when closing a Konsole session -via the X on the tabbar and tabheader. - -FIXED-IN: 20.08.0 -BUG: 420817 -BUG: 420695 -BUG: 415762 - -See merge request !87 ---- - src/SessionController.cpp | 23 +++++++++++++++-------- - 1 file changed, 15 insertions(+), 8 deletions(-) - -diff --git a/src/SessionController.cpp b/src/SessionController.cpp -index 006ba8b..e72f342 100644 ---- a/src/SessionController.cpp -+++ b/src/SessionController.cpp -@@ -999,16 +999,23 @@ void SessionController::closeSession() - return; - } - -- if (confirmClose()) { -- if (_session->closeInNormalWay()) { -+ if (!confirmClose()) { -+ return; -+ } -+ -+ if (!_session->closeInNormalWay()) { -+ if (!confirmForceClose()) { - return; -- } else if (confirmForceClose()) { -- if (_session->closeInForceWay()) { -- return; -- } else { -- qCDebug(KonsoleDebug) << "Konsole failed to close a session in any way."; -- } - } -+ -+ if (!_session->closeInForceWay()) { -+ qCDebug(KonsoleDebug) << "Konsole failed to close a session in any way."; -+ return; -+ } -+ } -+ -+ if (factory()) { -+ factory()->removeClient(this); - } - } - --- -cgit v1.1 - - diff --git a/kde/patch/konsole/konsole.term.is.konsole.patch b/kde/patch/konsole/konsole.term.is.konsole.patch deleted file mode 100644 index 443b9f1..0000000 --- a/kde/patch/konsole/konsole.term.is.konsole.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -uar konsole-17.12.3.orig/src/Profile.cpp konsole-17.12.3/src/Profile.cpp ---- konsole-17.12.3.orig/src/Profile.cpp 2018-03-01 23:54:01.000000000 +0100 -+++ konsole-17.12.3/src/Profile.cpp 2018-04-03 21:17:11.897873304 +0200 -@@ -157,7 +157,7 @@ - // See Pty.cpp on why Arguments is populated - setProperty(Arguments, QStringList() << QString::fromUtf8(qgetenv("SHELL"))); - setProperty(Icon, QStringLiteral("utilities-terminal")); -- setProperty(Environment, QStringList() << QStringLiteral("TERM=xterm-256color") << QStringLiteral("COLORTERM=truecolor")); -+ setProperty(Environment, QStringList() << QStringLiteral("TERM=konsole") << QStringLiteral("COLORTERM=truecolor")); - setProperty(LocalTabTitleFormat, QStringLiteral("%d : %n")); - setProperty(RemoteTabTitleFormat, QStringLiteral("(%u) %H")); - setProperty(ShowTerminalSizeHint, true); -diff -uar konsole-17.12.3.orig/src/Pty.cpp konsole-17.12.3/src/Pty.cpp ---- konsole-17.12.3.orig/src/Pty.cpp 2018-03-01 23:54:01.000000000 +0100 -+++ konsole-17.12.3/src/Pty.cpp 2018-04-03 21:18:18.898007801 +0200 -@@ -229,7 +229,7 @@ - - // extra safeguard to make sure $TERM is always set - if (!isTermEnvAdded) { -- setEnv(QStringLiteral("TERM"), QStringLiteral("xterm-256color")); -+ setEnv(QStringLiteral("TERM"), QStringLiteral("konsole")); - } - } - |