smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: WlClipboard::get use QProcess

Browse source
This commit is contained in:
sithlord48 2025-11-17 20:11:16 -05:00 committed by Chris Rizzitello
parent 7a60f0cc9e
commit c5f7a3792a
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/lib/platform/WlClipboard.cpp
View file

@ -32,6 +32,8 @@ inline static const auto s_pasteApp = QStringLiteral("wl-paste");
// wl-clipboard args // wl-clipboard args
inline static const auto s_listTypes = QStringLiteral("--list-types"); inline static const auto s_listTypes = QStringLiteral("--list-types");
inline static const auto s_isPrimary = QStringLiteral("--primary"); inline static const auto s_isPrimary = QStringLiteral("--primary");
inline static const auto s_noNewLine = QStringLiteral("-n");
inline static const auto s_readType = QStringLiteral("-t%1");
// MIME types for different clipboard formats // MIME types for different clipboard formats
inline static const auto s_mimeTypeText = QStringLiteral("text/plain;charset=utf-8"); inline static const auto s_mimeTypeText = QStringLiteral("text/plain;charset=utf-8");
@ -373,19 +375,23 @@ std::string WlClipboard::get(Format format) const
return m_cachedData[static_cast<int>(format)]; return m_cachedData[static_cast<int>(format)];
} }
std::string mimeType = formatToMimeType(format).toStdString(); auto mimeType = formatToMimeType(format);
if (mimeType.empty()) { if (mimeType.isEmpty()) {
return std::string(); return std::string();
} }
std::vector<const char *> args; QProcess cmd;
if (m_useClipboard) { cmd.setProgram(s_pasteApp);
args = {"wl-paste", "-t", mimeType.c_str(), nullptr};
} else {
args = {"wl-paste", "-t", mimeType.c_str(), "-p", nullptr};
}
std::string data = const_cast<WlClipboard *>(this)->executeCommand(args); QStringList args = {s_noNewLine, s_readType.arg(mimeType)};
if (!m_useClipboard)
args.append(s_isPrimary);
cmd.setArguments(args);
cmd.start();
cmd.waitForFinished();
auto data = cmd.readAll().toStdString();
// Update cache // Update cache
m_cachedData[static_cast<int>(format)] = data; m_cachedData[static_cast<int>(format)] = data;