Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/FolderColumns.qml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ Item {

Selecting { id: selecting; view: here }
function focusView() { here.forceActiveFocus() }
// The preview's ↑ and ↓: the row above or below in the current column.
function stepRow(direction) { direction < 0 ? here.decrementCurrentIndex() : here.incrementCurrentIndex() }
function menuAnchor() { return here.currentItem }

// Every column has a menu: on an item there, or on the column's folder.
Expand Down
2 changes: 2 additions & 0 deletions src/FolderGrid.qml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ GridView {
signal cursorLetGo()
function letGo() { selecting.letGo(); cursorLetGo() }
function focusView() { forceActiveFocus() }
// The preview's ↑ and ↓: the tile above or below, as the arrow keys move here.
function stepRow(direction) { direction < 0 ? moveCurrentIndexUp() : moveCurrentIndexDown() }
// Where the keyboard's menu (Alt+Return) opens: beside the cursor's item.
function menuAnchor() { return currentItem }

Expand Down
2 changes: 2 additions & 0 deletions src/FolderList.qml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ ListView {
signal cursorLetGo()
function letGo() { selecting.letGo(); cursorLetGo() }
function focusView() { forceActiveFocus() }
// The preview's ↑ and ↓: the row above or below.
function stepRow(direction) { direction < 0 ? decrementCurrentIndex() : incrementCurrentIndex() }
// Where the keyboard's menu (Alt+Return) opens: beside the cursor's item.
function menuAnchor() { return currentItem }

Expand Down
3 changes: 3 additions & 0 deletions src/FolderPane.qml
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,9 @@ FocusScope {
Connections {
target: backend
function onSelectRequested(name) { if (view.item) view.item.select(backend.folder.indexOf(name), false) }
// Followed now, not later as a re-read is: the preview waits for the
// new item before its next arrow.
function onStepRequested(direction) { if (view.item) { view.item.stepRow(direction); pane.follow() } }
function onActivateRequested() { if (pane.host) { pane.host.raise(); pane.host.requestActivate() } }
}

Expand Down
22 changes: 19 additions & 3 deletions src/PreviewWindow.qml
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,24 @@ ApplicationWindow {
Shortcut { sequence: "Left"; context: Qt.ApplicationShortcut; onActivated: win.rtl ? previewer.next() : previewer.previous() }
Shortcut { sequence: "Right"; context: Qt.ApplicationShortcut; onActivated: win.rtl ? previewer.previous() : previewer.next() }
Shortcut { sequences: ["Return", "Enter"]; context: Qt.ApplicationShortcut; onActivated: previewer.open() }
Shortcut { sequences: ["Up"]; context: Qt.ApplicationShortcut; onActivated: win.call("scroll", -1) }
Shortcut { sequences: ["Down"]; context: Qt.ApplicationShortcut; onActivated: win.call("scroll", 1) }
// ↑ and ↓ scroll what's taller than the window (a long text, a zoomed
// picture, a PDF); anything that fits moves to the item above or below,
// as the arrows do in the folder.
function upDown(direction) {
// A text still being read looks short; stepping past it then would
// skip a long one. The next press, once it's in, knows which.
if (previewer.readingText)
return
const v = win.view
const scrolls = v && typeof v.scroll === "function"
&& (v.contentHeight === undefined || v.contentHeight > v.height + 1)
if (scrolls)
v.scroll(direction)
else
previewer.stepRow(direction)
Comment thread
greptile-apps[bot] marked this conversation as resolved.
Resolved
}
Shortcut { sequences: ["Up"]; context: Qt.ApplicationShortcut; onActivated: win.upDown(-1) }
Shortcut { sequences: ["Down"]; context: Qt.ApplicationShortcut; onActivated: win.upDown(1) }
Shortcut { sequences: [StandardKey.MoveToPreviousPage]; context: Qt.ApplicationShortcut; onActivated: win.call("page", -1) }
Shortcut { sequences: [StandardKey.MoveToNextPage]; context: Qt.ApplicationShortcut; onActivated: win.call("page", 1) }
Shortcut { sequences: [StandardKey.ZoomIn, "Ctrl+="]; context: Qt.ApplicationShortcut; onActivated: win.call("zoomBy", 1.25) }
Expand Down Expand Up @@ -180,7 +196,7 @@ ApplicationWindow {
visible: win.helpVisible
onDismissed: win.helpVisible = false
shortcuts: [
[win.rtl ? "→ / ←" : "← / →", qsTr("Previous / next file")],
[win.rtl ? "→ ← ↑ ↓" : "← → ↑ ↓", qsTr("Previous / next file")],
["⏎", qsTr("Open in its app")],
["↑ ↓ PgUp PgDn", qsTr("Scroll")],
["Ctrl+= / Ctrl+-", qsTr("Zoom in / out")],
Expand Down
9 changes: 9 additions & 0 deletions src/backend.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,15 @@ Backend::Backend(const QString &home, QObject *parent)
connect(&m_preview, &QProcess::readyReadStandardOutput, this, [this] {
while (m_preview.canReadLine()) {
const QString shown = QString::fromUtf8(m_preview.readLine()).trimmed();
if (shown.startsWith("step ")) {
// The view moves and sends its new item right away (or
// nothing, at the first or last row); "stepped" after it
// lets the preview take the arrows that came meanwhile.
emit stepRequested(shown.mid(5).toInt() < 0 ? -1 : 1);
if (previewing())
m_preview.write("stepped\n");
continue;
}
m_previewed = shown;
const QFileInfo info(shown);
if (info.absolutePath() == path())
Expand Down
3 changes: 3 additions & 0 deletions src/backend.h
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,9 @@ class Backend : public QObject {
void detailsChanged();
void newWindowRequested(const QString &path);
void selectRequested(const QString &name);
// The preview's ↑ or ↓ on a file it can't scroll: move one row in the
// folder view, whose layout only this window knows.
void stepRequested(int direction);
void activateRequested();

private:
Expand Down
82 changes: 68 additions & 14 deletions src/previewer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <QFutureWatcher>
#include <QImageReader>
#include <QMimeDatabase>
#include <QTimer>
#include <QUrl>
#include <QtConcurrent>
#include <cstdio>
Expand Down Expand Up @@ -185,14 +186,64 @@ QString Previewer::type() const {
return QMimeDatabase().mimeTypeForName(m_entries.at(m_index).mime).comment();
}

void Previewer::next() {
if (m_index + 1 < m_entries.size())
setIndex(m_index + 1, true);
void Previewer::next() { move(Move::Next); }
void Previewer::previous() { move(Move::Previous); }
void Previewer::stepRow(int direction) { move(direction < 0 ? Move::Up : Move::Down); }

void Previewer::move(Move move) {
if (m_awaitingStep) {
m_queued.append(move);
return;
}
// On its own, the preview has no rows: ↑ and ↓ go to the previous and
// next file.
if (!m_reporting && (move == Move::Up || move == Move::Down))
move = move == Move::Up ? Move::Previous : Move::Next;
switch (move) {
case Move::Previous:
if (m_index > 0)
setIndex(m_index - 1, true);
break;
case Move::Next:
if (m_index + 1 < m_entries.size())
setIndex(m_index + 1, true);
break;
case Move::Up:
case Move::Down: {
m_awaitingStep = true;
// A reply that never comes (a Folio too old to send it, or stuck)
// holds the arrows for a second, not for good.
const quint64 step = ++m_step;
QTimer::singleShot(1000, this, [this, step] {
if (step == m_step)
stepped();
});
report(move == Move::Up ? "step -1" : "step 1");
break;
}
}
}

void Previewer::stepped() {
m_awaitingStep = false;
++m_step;
while (!m_awaitingStep && !m_queued.isEmpty())
move(m_queued.takeFirst());
}

void Previewer::previous() {
if (m_index > 0)
setIndex(m_index - 1, true);
void Previewer::receive(const QString &line) {
if (line == "stepped")
stepped();
else if (!line.isEmpty())
show(line);
}

void Previewer::report(const QString &line) {
emit reported(line);
if (m_overStdio) {
std::fprintf(stdout, "%s\n", line.toUtf8().constData());
std::fflush(stdout);
}
}

void Previewer::open() {
Expand All @@ -208,6 +259,7 @@ void Previewer::setIndex(int index, bool report) {
const FolderModel::Entry e = m_entries.at(index);
m_viewer = viewerFor(e.mime, e.isDir);
m_text.clear();
m_readingText = false;

// A folder's count and first pictures, and a text's opening part, are
// read off the UI thread: a big folder, or any file on a slow mount,
Expand All @@ -216,6 +268,7 @@ void Previewer::setIndex(int index, bool report) {
const bool count = e.isDir && e.itemCount < 0;
const bool text = m_viewer == "text" || m_viewer == "markdown";
if (count || text) {
m_readingText = text;
auto *watcher = new QFutureWatcher<QPair<FolderModel::Entry, QString>>(this);
connect(watcher, &QFutureWatcherBase::finished, this, [this, watcher, generation, text] {
watcher->deleteLater();
Expand All @@ -224,6 +277,7 @@ void Previewer::setIndex(int index, bool report) {
const auto [entry, read] = watcher->result();
m_entries[m_index] = entry;
m_text = read;
m_readingText = false;
// A ".txt" that turns out to be binary is shown as a plain file.
if (text && m_text.isEmpty() && entry.size > 0)
m_viewer = "other";
Expand All @@ -244,14 +298,15 @@ void Previewer::setIndex(int index, bool report) {
emit changed();
emit listed();

if (report && m_reporting) {
std::fprintf(stdout, "%s\n", e.path.toUtf8().constData());
std::fflush(stdout);
}
if (report && m_reporting)
this->report(e.path);
}

void Previewer::connectToFolio() {
void Previewer::connectToFolio(bool overStdio) {
m_reporting = true;
m_overStdio = overStdio;
if (!overStdio)
return;
m_stdin = new QSocketNotifier(STDIN_FILENO, QSocketNotifier::Read, this);
connect(m_stdin, &QSocketNotifier::activated, this, [this] {
char buffer[4096];
Expand All @@ -264,10 +319,9 @@ void Previewer::connectToFolio() {
m_pending.append(buffer, n);
int newline;
while ((newline = m_pending.indexOf('\n')) >= 0) {
const QString path = QString::fromUtf8(m_pending.left(newline));
const QString line = QString::fromUtf8(m_pending.left(newline));
m_pending.remove(0, newline + 1);
if (!path.isEmpty())
show(path);
receive(line);
}
});
}
33 changes: 30 additions & 3 deletions src/previewer.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@
//
// Talks to the Folio window that started it over stdin and stdout, one path
// per line: Folio writes the item selected in its grid, the preview writes
// the item it steps to, and each side follows the other.
// the item it steps to, and each side follows the other. ↑ and ↓ are written
// as "step -1" and "step 1": rows belong to the folder view, so Folio moves
// its selection, sends the new item back, then "stepped". Arrows pressed
// before that wait for it: taken from the old item, they'd undo the move.
class Previewer : public QObject {
Q_OBJECT
// Listing the folder only changes where the item sits among its
Expand All @@ -26,6 +29,9 @@ class Previewer : public QObject {
Q_PROPERTY(QString viewer READ viewer NOTIFY changed)
Q_PROPERTY(QString url READ url NOTIFY changed)
Q_PROPERTY(QString text READ text NOTIFY changed)
// A text's opening part is still being read: until it's in, its length
// (whether ↑ and ↓ scroll it or step past it) isn't known.
Q_PROPERTY(bool readingText READ readingText NOTIFY changed)
Q_PROPERTY(QString type READ type NOTIFY changed)

public:
Expand All @@ -34,8 +40,12 @@ class Previewer : public QObject {
// Shows the file right away, then lists its folder in the background so
// the arrow keys can step to its neighbours.
void start(const QString &path, bool showHidden, const QString &sort);
// Reads paths from stdin and reports steps on stdout.
void connectToFolio();
// Reads paths from stdin and reports steps on stdout; the tests leave
// stdin and stdout alone and talk through receive() and reported().
void connectToFolio(bool overStdio = true);
// One line from Folio: a path to show, or "stepped" once it has moved a
// row for ↑ or ↓.
void receive(const QString &line);
// Shows another file; one in the same folder keeps the list.
void show(const QString &path);
// Lists the folder again, keeping the file shown: after a language
Expand All @@ -48,10 +58,14 @@ class Previewer : public QObject {
QString viewer() const { return m_viewer; }
QString url() const;
QString text() const { return m_text; }
bool readingText() const { return m_readingText; }
QString type() const;

Q_INVOKABLE void next();
Q_INVOKABLE void previous();
// ↑ or ↓: the item above or below in the Folio window's view, or the
// previous or next file when the preview runs on its own.
Q_INVOKABLE void stepRow(int direction);
Q_INVOKABLE void open();

// Which view shows a type: image, animated, thumbnail, video, audio,
Expand All @@ -69,21 +83,34 @@ class Previewer : public QObject {
signals:
void changed();
void listed();
// A line for Folio: the path stepped to, or "step -1" / "step 1".
void reported(const QString &line);

private:
enum class Move { Previous, Next, Up, Down };
void move(Move move);
void stepped();
void setIndex(int index, bool report);
void report(const QString &line);

QVector<FolderModel::Entry> m_entries;
int m_index = -1;
QString m_viewer;
QString m_text;
bool m_readingText = false;
bool m_showHidden = false;
QString m_sort = "name";
quint64 m_generation = 0;
// The newest item read in the background; older readings are dropped,
// or skipped when they haven't started.
std::shared_ptr<std::atomic<quint64>> m_reading = std::make_shared<std::atomic<quint64>>(0);
bool m_reporting = false;
bool m_overStdio = false;
// Set from a "step" until Folio's "stepped"; the arrows pressed meanwhile
// wait in m_queued, in order.
bool m_awaitingStep = false;
quint64 m_step = 0;
QVector<Move> m_queued;
QSocketNotifier *m_stdin = nullptr;
QByteArray m_pending;
};
Loading