feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Terminal: Add search

Browse Source 
* Adds new search widget to terminal
* Adds new theme color "TerminalFindMatch"
* Fixes ESC key handling in terminal

Fixes: QTCREATORBUG-28946
Change-Id: I7b6057d13902a94a6bcd41dde6cc8ba8418cd585
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Marcus Tillmanns
2023-03-24 12:53:21 +01:00
parent 884a1d6f94
commit 9417f8b99e
25 changed files with 686 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/terminal/terminalwidget.h
View File

@@ -3,8 +3,11 @@
#pragma once
#include "terminalsearch.h"
#include "terminalsurface.h"
#include <aggregation/aggregate.h>
#include <utils/link.h>
#include <utils/qtcprocess.h>
#include <utils/terminalhooks.h>
@@ -26,6 +29,7 @@ class TerminalWidget : public QAbstractScrollArea
public:
TerminalWidget(QWidget *parent = nullptr,
const Utils::Terminal::OpenTerminalParameters &openParameters = {});
~TerminalWidget() override;
void setFont(const QFont &font);
@@ -42,6 +46,8 @@ public:
void clearContents();
TerminalSearch *search() { return m_search.get(); }
struct Selection
{
int start;
@@ -113,14 +119,16 @@ protected:
const QRectF &cellRect,
QPoint gridPos,
const Internal::TerminalCell &cell,
QFont &f) const;
QFont &f,
QList<SearchHit>::const_iterator &searchIt) const;
void paintCells(QPainter &painter, QPaintEvent *event) const;
void paintCursor(QPainter &painter) const;
void paintPreedit(QPainter &painter) const;
void paintSelectionOrBackground(QPainter &painter,
const Internal::TerminalCell &cell,
const QRectF &cellRect,
const QPoint gridPos) const;
bool paintFindMatches(QPainter &painter,
QList<SearchHit>::const_iterator &searchIt,
const QRectF &cellRect,
const QPoint gridPos) const;
bool paintSelection(QPainter &painter, const QRectF &cellRect, const QPoint gridPos) const;
void paintDebugSelection(QPainter &painter, const Selection &selection) const;
qreal topMargin() const;
@@ -132,7 +140,7 @@ protected:
QRect gridToViewport(QRect rect) const;
void updateViewport();
void updateViewport(const QRect &rect);
void updateViewportRect(const QRect &rect);
int textLineFromPixel(int y) const;
std::optional<int> textPosFromPoint(const QTextLayout &textLayout, QPoint p) const;
@@ -156,7 +164,7 @@ protected:
void flushVTerm(bool force);
bool setSelection(const std::optional<Selection> &selection);
bool setSelection(const std::optional<Selection> &selection, bool scroll = true);
QString textFromSelection() const;
void configBlinkTimer();
@@ -194,7 +202,7 @@ private:
QTimer m_scrollTimer;
int m_scrollDirection{0};
std::array<QColor, 18> m_currentColors;
std::array<QColor, 20> m_currentColors;
Utils::Terminal::OpenTerminalParameters m_openParameters;
@@ -208,6 +216,11 @@ private:
Utils::FilePath m_cwd;
Utils::CommandLine m_currentCommand;
std::unique_ptr<TerminalSearch> m_search;
Aggregation::Aggregate *m_aggregate{nullptr};
SearchHit m_lastSelectedHit{};
};
} // namespace Terminal