Skip to content
GitLab
Commit c6f5dc79 authored by Tomaz Canabrava's avatar Tomaz Canabrava Committed by Tomaz Canabrava
Browse files

Split Filter.cpp into corresponding new files 

This reduces buildtime when touching on unrelated Filter
classes.
parent 3ef259fc
Expand all Hide whitespace changes
Inline Side-by-side
src/CMakeLists.txt
View file @ c6f5dc79
......@@ -62,7 +62,16 @@ set(konsoleprivate_SRCS ${sessionadaptors_SRCS}
FontDialog.cpp
Emulation.cpp
widgets/DetachableTabBar.cpp
Filter.cpp
filterHotSpots/FileFilter.cpp
filterHotSpots/FileFilterHotspot.cpp
filterHotSpots/FilterChain.cpp
filterHotSpots/Filter.cpp
filterHotSpots/HotSpot.cpp
filterHotSpots/RegExpFilter.cpp
filterHotSpots/RegExpFilterHotspot.cpp
filterHotSpots/TerminalImageFilterChain.cpp
filterHotSpots/UrlFilter.cpp
filterHotSpots/UrlFilterHotspot.cpp
History.cpp
HistoryFile.cpp
HistoryScroll.cpp
......
src/Filter.cpp deleted 100644 → 0
View file @ 3ef259fc
This diff is collapsed.
src/Filter.h deleted 100644 → 0
View file @ 3ef259fc
/*
Copyright 2007-2008 by Robert Knight <robertknight@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA.
*/
#ifndef FILTER_H
#define FILTER_H
// Qt
#include <QList>
#include <QSet>
#include <QObject>
#include <QPointer>
#include <QStringList>
#include <QRegularExpression>
#include <QMultiHash>
#include <QRect>
#include <QPoint>
// KDE
#include <KFileItemActions>
#include <KFileItem>
#include <KIO/PreviewJob>
#include <memory>
// Konsole
#include "Character.h"
class QAction;
class QMenu;
class QMouseEvent;
class KFileItem;
namespace Konsole {
class Session;
/**
* A filter processes blocks of text looking for certain patterns (such as URLs or keywords from a list)
* and marks the areas which match the filter's patterns as 'hotspots'.
*
* Each hotspot has a type identifier associated with it ( such as a link or a highlighted section ),
* and an action. When the user performs some activity such as a mouse-click in a hotspot area ( the exact
* action will depend on what is displaying the block of text which the filter is processing ), the hotspot's
* activate() method should be called. Depending on the type of hotspot this will trigger a suitable response.
*
* For example, if a hotspot represents a URL then a suitable action would be opening that URL in a web browser.
* Hotspots may have more than one action, in which case the list of actions can be obtained using the
* actions() method.
*
* Different subclasses of filter will return different types of hotspot.
* Subclasses must reimplement the process() method to examine a block of text and identify sections of interest.
* When processing the text they should create instances of Filter::HotSpot subclasses for sections of interest
* and add them to the filter's list of hotspots using addHotSpot()
*/
class Filter
{
public:
/**
* Represents an area of text which matched the pattern a particular filter has been looking for.
*
* Each hotspot has a type identifier associated with it ( such as a link or a highlighted section ),
* and an action. When the user performs some activity such as a mouse-click in a hotspot area ( the exact
* action will depend on what is displaying the block of text which the filter is processing ), the hotspot's
* activate() method should be called. Depending on the type of hotspot this will trigger a suitable response.
*
* For example, if a hotspot represents a URL then a suitable action would be opening that URL in a web browser.
* Hotspots may have more than one action, in which case the list of actions can be obtained using the
* actions() method. These actions may then be displayed in a popup menu or toolbar for example.
*/
class HotSpot : public QObject
{
// krazy suggest using Q_OBJECT here but moc can not handle
// nested classes
// QObject derived classes should use the Q_OBJECT macro
public:
/**
* Constructs a new hotspot which covers the area from (@p startLine,@p startColumn) to (@p endLine,@p endColumn)
* in a block of text.
*/
HotSpot(int startLine, int startColumn, int endLine, int endColumn);
virtual ~HotSpot();
enum Type {
// the type of the hotspot is not specified
NotSpecified,
// this hotspot represents a clickable link
Link,
// this hotspot represents a clickable e-mail address
EMailAddress,
// this hotspot represents a marker
Marker
};
/** Returns the line when the hotspot area starts */
int startLine() const;
/** Returns the line where the hotspot area ends */
int endLine() const;
/** Returns the column on startLine() where the hotspot area starts */
int startColumn() const;
/** Returns the column on endLine() where the hotspot area ends */
int endColumn() const;
/**
* Returns the type of the hotspot. This is usually used as a hint for views on how to represent
* the hotspot graphically. eg. Link hotspots are typically underlined when the user mouses over them
*/
Type type() const;
/**
* Causes the action associated with a hotspot to be triggered.
*
* @param object The object which caused the hotspot to be triggered. This is
* typically null ( in which case the default action should be performed ) or
* one of the objects from the actions() list. In which case the associated
* action should be performed.
*/
virtual void activate(QObject *object = nullptr) = 0;
/**
* Returns a list of actions associated with the hotspot which can be used in a
* menu or toolbar
*/
virtual QList<QAction *> actions();
/**
* Setups a menu with actions for the hotspot.
*/
virtual void setupMenu(QMenu *menu);
protected:
/** Sets the type of a hotspot. This should only be set once */
void setType(Type type);
private:
int _startLine;
int _startColumn;
int _endLine;
int _endColumn;
Type _type;
};
/** Constructs a new filter. */
Filter();
virtual ~Filter();
/** Causes the filter to process the block of text currently in its internal buffer */
virtual void process() = 0;
/**
* Empties the filters internal buffer and resets the line count back to 0.
* All hotspots are deleted.
*/
void reset();
/** Returns the hotspot which covers the given @p line and @p column, or 0 if no hotspot covers that area */
QSharedPointer<HotSpot> hotSpotAt(int line, int column) const;
/** Returns the list of hotspots identified by the filter */
QList<QSharedPointer<HotSpot>> hotSpots() const;
/** Returns the list of hotspots identified by the filter which occur on a given line */
/**
* TODO: Document me
*/
void setBuffer(const QString *buffer, const QList<int> *linePositions);
protected:
/** Adds a new hotspot to the list */
void addHotSpot(QSharedPointer<HotSpot> spot);
/** Returns the internal buffer */
const QString *buffer();
/** Converts a character position within buffer() to a line and column */
std::pair<int,int> getLineColumn(int position);
private:
Q_DISABLE_COPY(Filter)
QMultiHash<int, QSharedPointer<HotSpot>> _hotspots;
QList<QSharedPointer<HotSpot>> _hotspotList;
const QList<int> *_linePositions;
const QString *_buffer;
};
/**
* A filter which searches for sections of text matching a regular expression and creates a new RegExpFilter::HotSpot
* instance for them.
*
* Subclasses can reimplement newHotSpot() to return custom hotspot types when matches for the regular expression
* are found.
*/
class RegExpFilter : public Filter
{
public:
/**
* Type of hotspot created by RegExpFilter. The capturedTexts() method can be used to find the text
* matched by the filter's regular expression.
*/
class HotSpot : public Filter::HotSpot
{
public:
HotSpot(int startLine, int startColumn, int endLine, int endColumn,
const QStringList &capturedTexts);
void activate(QObject *object = nullptr) override;
/** Returns the texts found by the filter when matching the filter's regular expression */
QStringList capturedTexts() const;
private:
QStringList _capturedTexts;
};
/** Constructs a new regular expression filter */
RegExpFilter();
/**
* Sets the regular expression which the filter searches for in blocks of text.
*
* Regular expressions which match the empty string are treated as not matching
* anything.
*/
void setRegExp(const QRegularExpression &regExp);
/** Returns the regular expression which the filter searches for in blocks of text */
QRegularExpression regExp() const;
/**
* Reimplemented to search the filter's text buffer for text matching regExp()
*
* If regexp matches the empty string, then process() will return immediately
* without finding results.
*/
void process() override;
protected:
/**
* Called when a match for the regular expression is encountered. Subclasses should reimplement this
* to return custom hotspot types
*/
virtual QSharedPointer<Filter::HotSpot> newHotSpot(int startLine, int startColumn, int endLine,
int endColumn, const QStringList &capturedTexts);
private:
QRegularExpression _searchText;
};
/** A filter which matches URLs in blocks of text */
class UrlFilter : public RegExpFilter
{
public:
/**
* Hotspot type created by UrlFilter instances. The activate() method opens a web browser
* at the given URL when called.
*/
class HotSpot : public RegExpFilter::HotSpot
{
public:
HotSpot(int startLine, int startColumn, int endLine, int endColumn,
const QStringList &capturedTexts);
~HotSpot() override;
QList<QAction *> actions() override;
/**
* Open a web browser at the current URL. The url itself can be determined using
* the capturedTexts() method.
*/
void activate(QObject *object = nullptr) override;
private:
enum UrlType {
StandardUrl,
Email,
Unknown
};
UrlType urlType() const;
};
UrlFilter();
protected:
QSharedPointer<Filter::HotSpot> newHotSpot(int, int, int, int, const QStringList &) override;
private:
static const QRegularExpression FullUrlRegExp;
static const QRegularExpression EmailAddressRegExp;
// combined OR of FullUrlRegExp and EmailAddressRegExp
static const QRegularExpression CompleteUrlRegExp;
};
/**
* A filter which matches files according to POSIX Portable Filename Character Set
* https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_267
*/
class FileFilter : public RegExpFilter
{
public:
/**
* Hotspot type created by FileFilter instances.
*/
class HotSpot : public RegExpFilter::HotSpot
{
public:
HotSpot(int startLine, int startColumn, int endLine, int endColumn,
const QStringList &capturedTexts, const QString &filePath);
~HotSpot() override;
QList<QAction *> actions() override;
/**
* Opens kate for editing the file.
*/
void activate(QObject *object = nullptr) override;
void setupMenu(QMenu *menu) override;
KFileItem fileItem() const;
void requestThumbnail(Qt::KeyboardModifiers modifiers, const QPoint &pos);
void thumbnailRequested();
static void stopThumbnailGeneration();
private:
void showThumbnail(const KFileItem& item, const QPixmap& preview);
QString _filePath;
KFileItemActions _menuActions;
QPoint _eventPos;
QPoint _thumbnailPos;
Qt::KeyboardModifiers _eventModifiers;
bool _thumbnailFinished;
/* This variable stores the pointer of the active HotSpot that
* is generating the thumbnail now, so we can bail out early.
* it's not used for pointer access.
*/
static qintptr currentThumbnailHotspot;
static bool _canGenerateThumbnail;
static QPointer<KIO::PreviewJob> _previewJob;
};
explicit FileFilter(Session *session);
void process() override;
protected:
QSharedPointer<Filter::HotSpot> newHotSpot(int, int, int, int, const QStringList &) override;
private:
QPointer<Session> _session;
QString _dirPath;
QSet<QString> _currentDirContents;
};
/**
* A chain which allows a group of filters to be processed as one.
* The chain owns the filters added to it and deletes them when the chain itself is destroyed.
*
* Use addFilter() to add a new filter to the chain.
* When new text to be filtered arrives, use addLine() to add each additional
* line of text which needs to be processed and then after adding the last line, use
* process() to cause each filter in the chain to process the text.
*
* After processing a block of text, the reset() method can be used to set the filter chain's
* internal cursor back to the first line.
*
* The hotSpotAt() method will return the first hotspot which covers a given position.
*
* The hotSpots() method return all of the hotspots in the text and on
* a given line respectively.
*/
class FilterChain
{
public:
virtual ~FilterChain();
/** Adds a new filter to the chain. The chain will delete this filter when it is destroyed */
void addFilter(Filter *filter);
/** Removes a filter from the chain. The chain will no longer delete the filter when destroyed */
void removeFilter(Filter *filter);
/** Removes all filters from the chain */
void clear();
/** Resets each filter in the chain */
void reset();
/**
* Processes each filter in the chain
*/
void process();
/** Sets the buffer for each filter in the chain to process. */
void setBuffer(const QString *buffer, const QList<int> *linePositions);
/** Returns the first hotspot which occurs at @p line, @p column or 0 if no hotspot was found */
QSharedPointer<Filter::HotSpot> hotSpotAt(int line, int column) const;
/** Returns a list of all the hotspots in all the chain's filters */
QList<QSharedPointer<Filter::HotSpot>> hotSpots() const;
protected:
QList<Filter *> _filters;
};
/** A filter chain which processes character images from terminal displays */
class TerminalImageFilterChain : public FilterChain
{
public:
TerminalImageFilterChain();
~TerminalImageFilterChain() override;
/**
* Set the current terminal image to @p image.
*
* @param image The terminal image
* @param lines The number of lines in the terminal image
* @param columns The number of columns in the terminal image
* @param lineProperties The line properties to set for image
*/
void setImage(const Character * const image, int lines, int columns,
const QVector<LineProperty> &lineProperties);
private:
Q_DISABLE_COPY(TerminalImageFilterChain)
/* usually QStrings and QLists are not supposed to be in the heap, here we have a problem:
we need a shared memory space between many filter objeccts, defined by this TerminalImage. */
std::unique_ptr<QString> _buffer;
std::unique_ptr<QList<int>> _linePositions;
};
}
#endif //FILTER_H
src/filterHotSpots/FileFilter.cpp 0 → 100644
View file @ c6f5dc79
/*
Copyright 2007-2008 by Robert Knight <robertknight@gmail.com>
Copyright 2020 by Tomaz Canabrava <tcanabrava@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA.
*/
#include "FileFilter.h"
#include <QDir>
#include "session/Session.h"
#include "session/SessionManager.h"
#include "Profile.h"
#include "FileFilterHotspot.h"
using namespace Konsole;
FileFilter::FileFilter(Session *session) :
_session(session)
, _dirPath(QString())
, _currentDirContents()
{
Profile::Ptr profile = SessionManager::instance()->sessionProfile(_session);
QString wordCharacters = profile->wordCharacters();
/* The wordCharacters can be a potentially broken regexp,
* so let's fix it manually if it has some troublesome characters.
*/
// Add a folder delimiter at the beginning.
if (wordCharacters.contains(QLatin1Char('/'))) {
wordCharacters.remove(QLatin1Char('/'));
wordCharacters.prepend(QStringLiteral("\\/"));
}
// Add minus at the end.
if (wordCharacters.contains(QLatin1Char('-'))){
wordCharacters.remove(QLatin1Char('-'));
wordCharacters.append(QLatin1Char('-'));
}
static auto re = QRegularExpression(
/* First part of the regexp means 'strings with spaces and starting with single quotes'
* Second part means "Strings with double quotes"
* Last part means "Everything else plus some special chars
* This is much smaller, and faster, than the previous regexp
* on the HotSpot creation we verify if this is indeed a file, so there's
* no problem on testing on random words on the screen.
*/
QLatin1String("'[^']+'") // Matches everything between single quotes.
+ QStringLiteral(R"RX(|"[^"]+")RX") // Matches everything inside double quotes
+ QStringLiteral(R"RX(|[\w%1]+)RX").arg(wordCharacters) // matches a contiguous line of alphanumeric characters plus some special ones defined in the profile.
,
QRegularExpression::DontCaptureOption);
setRegExp(re);
}
/**
* File Filter - Construct a filter that works on local file paths using the
* posix portable filename character set combined with KDE's mimetype filename
* extension blob patterns.
* https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_267
*/
QSharedPointer<HotSpot> FileFilter::newHotSpot(int startLine, int startColumn, int endLine,
int endColumn, const QStringList &capturedTexts)
{
if (_session.isNull()) {
return nullptr;
}
QString filename = capturedTexts.first();
if (filename.startsWith(QLatin1Char('\'')) && filename.endsWith(QLatin1Char('\''))) {
filename.remove(0, 1);
filename.chop(1);
}
// Return nullptr if it's not:
// <current dir>/filename
// <current dir>/childDir/filename
auto match = std::find_if(_currentDirContents.cbegin(), _currentDirContents.cend(),
[filename](const QString &s) { return filename.startsWith(s); });
if (match == _currentDirContents.cend()) {
return nullptr;
}
return QSharedPointer<HotSpot>(new FileFilterHotSpot(startLine, startColumn, endLine, endColumn, capturedTexts, _dirPath + filename));
}
void FileFilter::process()
{
const QDir dir(_session->currentWorkingDirectory());
// Do not re-process.
if (_dirPath != dir.canonicalPath() + QLatin1Char('/')) {
_dirPath = dir.canonicalPath() + QLatin1Char('/');
#if QT_VERSION >= QT_VERSION_CHECK(5,14,0)
const auto tmpList = dir.entryList(QDir::Dirs | QDir::Files);
_currentDirContents = QSet<QString>(std::begin(tmpList), std::end(tmpList));
#else
_currentDirContents = QSet<QString>::fromList(dir.entryList(QDir::Dirs | QDir::Files));
#endif
}
RegExpFilter::process();
}
src/filterHotSpots/FileFilter.h 0 → 100644
View file @ c6f5dc79
/*
Copyright 2007-2008 by Robert Knight <robertknight@gmail.com>
Copyright 2020 by Tomaz Canabrava <tcanabrava@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA.
*/
#ifndef FILE_FILTER
#define FILE_FILTER
#include <QPointer>
#include <QString>
#include <QSet>
#include "RegExpFilter.h"
namespace Konsole {
class Session;
class HotSpot;
/**
* A filter which matches files according to POSIX Portable Filename Character Set
* https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_267
*/
class FileFilter : public RegExpFilter
{
public:
explicit FileFilter(Session *session);
void process() override;
protected:
QSharedPointer<HotSpot> newHotSpot(int, int, int, int, const QStringList &) override