openclaw/deskflow
1
0
Fork 0
Code Issues Pull Requests Actions 17 Packages Projects Releases Wiki Activity

refactor: WlClipboard, use QProcess to get available mimeTypes

Browse Source
This commit is contained in:
sithlord48
2025-11-17 17:49:33 -05:00
committed by Chris Rizzitello
parent 9ed0b06a42
commit 7a60f0cc9e
2 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/lib/platform/WlClipboard.cpp
View File

@ -21,6 +21,7 @@
#include <unistd.h>
#include <QDateTime>
#include <QProcess>
#include <QStandardPaths>
namespace {
@ -28,6 +29,10 @@ namespace {
inline static const auto s_copyApp = QStringLiteral("wl-copy");
inline static const auto s_pasteApp = QStringLiteral("wl-paste");
// wl-clipboard args
inline static const auto s_listTypes = QStringLiteral("--list-types");
inline static const auto s_isPrimary = QStringLiteral("--primary");
// MIME types for different clipboard formats
inline static const auto s_mimeTypeText = QStringLiteral("text/plain;charset=utf-8");
inline static const auto s_mimeTypeHtml = QStringLiteral("text/html");
@ -322,9 +327,9 @@ bool WlClipboard::has(Format format) const
}
// Update cache by checking available MIME types
std::vector<std::string> availableTypes = const_cast<WlClipboard *>(this)->getAvailableMimeTypes();
const auto availableTypes = const_cast<WlClipboard *>(this)->getAvailableMimeTypes();
if (availableTypes.empty()) {
if (availableTypes.isEmpty()) {
// No types available - mark all formats as unavailable
for (int i = 0; i < static_cast<int>(Format::TotalFormats); ++i) {
m_cachedAvailable[i] = false;
@ -338,9 +343,9 @@ bool WlClipboard::has(Format format) const
m_cachedAvailable[i] = false;
if (!mimeType.isEmpty()) {
for (const std::string &available : availableTypes) {
for (const auto &available : availableTypes) {
if (available == mimeType || (currentFormat == Format::Text && available == "text/plain") ||
(currentFormat == Format::HTML && available.find("text/html") == 0)) {
(currentFormat == Format::HTML && available.startsWith("text/html"))) {
m_cachedAvailable[i] = true;
break;
}
@ -647,41 +652,33 @@ IClipboard::Format WlClipboard::mimeTypeToFormat(const QString &mimeType) const
return Format::Text; // Default fallback
}
std::vector<std::string> WlClipboard::getAvailableMimeTypes() const
QStringList WlClipboard::getAvailableMimeTypes() const
{
std::vector<const char *> args;
if (m_useClipboard) {
args = {"wl-paste", "--list-types", nullptr};
} else {
args = {"wl-paste", "--list-types", "-p", nullptr};
}
QProcess cmd;
cmd.setProgram(s_pasteApp);
std::string result = executeCommand(args);
std::vector<std::string> types;
QStringList args = {s_listTypes};
if (!m_useClipboard)
args.append(s_isPrimary);
if (!result.empty()) {
std::istringstream iss(result);
std::string type;
while (std::getline(iss, type)) {
if (!type.empty()) {
types.push_back(type);
}
}
}
cmd.setArguments(args);
cmd.start();
cmd.waitForFinished();
return types;
const static QChar newLine = QLatin1Char('\n');
return QString::fromLocal8Bit(cmd.readAll()).split(newLine);
}
void WlClipboard::monitorClipboard()
{
std::vector<std::string> lastTypes;
QStringList lastTypes;
int consecutiveErrors = 0;
while (!m_stopMonitoring) {
std::this_thread::sleep_for(std::chrono::milliseconds(kMonitorIntervalMs));
try {
// Check if clipboard content has changed by comparing available types
std::vector<std::string> currentTypes = getAvailableMimeTypes();
const auto currentTypes = getAvailableMimeTypes();
// Reset error counter on successful operation
consecutiveErrors = 0;

2
src/lib/platform/WlClipboard.h
View File

@ -78,7 +78,7 @@ private:
Format mimeTypeToFormat(const QString &mimeType) const;
//! Get available MIME types from clipboard
std::vector<std::string> getAvailableMimeTypes() const;
QStringList getAvailableMimeTypes() const;
//! Monitor clipboard changes in background thread
void monitorClipboard();