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

refactor: WlClipboard mimetypes use QStrings

Browse source
This commit is contained in:
sithlord48 2025-11-10 07:06:49 -05:00 committed by Chris Rizzitello
parent 5ef4f64b11
commit 9ed0b06a42
2 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,13 +29,13 @@ inline static const auto s_copyApp = QStringLiteral("wl-copy");
inline static const auto s_pasteApp = QStringLiteral("wl-paste"); inline static const auto s_pasteApp = QStringLiteral("wl-paste");
// MIME types for different clipboard formats // MIME types for different clipboard formats
const char *const kMimeTypeText = "text/plain;charset=utf-8"; inline static const auto s_mimeTypeText = QStringLiteral("text/plain;charset=utf-8");
const char *const kMimeTypeHtml = "text/html"; inline static const auto s_mimeTypeHtml = QStringLiteral("text/html");
const char *const kMimeTypeBmp = "image/bmp"; inline static const auto s_mimeTypeBmp = QStringLiteral("image/bmp");
// Additional HTML MIME type variants // Additional HTML MIME type variants
const char *const kMimeTypeHtmlUtf8 = "text/html;charset=UTF-8"; const char *const s_mimeTypeHtmlUtf8 = "text/html;charset=UTF-8";
const char *const kMimeTypeHtmlWindows = "HTML Format"; const char *const s_mimeTypeHtmlWindows = "HTML Format";
// Command timeout (milliseconds) // Command timeout (milliseconds)
const int kCommandTimeout = 5000; const int kCommandTimeout = 5000;
@ -254,7 +254,7 @@ void WlClipboard::add(Format format, const std::string &data)
return; return;
} }
std::string mimeType = formatToMimeType(format); auto mimeType = formatToMimeType(format).toStdString();
if (mimeType.empty()) { if (mimeType.empty()) {
LOG_WARN("unsupported clipboard format: %d", format); LOG_WARN("unsupported clipboard format: %d", format);
return; return;
@ -334,10 +334,10 @@ bool WlClipboard::has(Format format) const
// Check each format against available types // Check each format against available types
for (int i = 0; i < static_cast<int>(Format::TotalFormats); ++i) { for (int i = 0; i < static_cast<int>(Format::TotalFormats); ++i) {
Format currentFormat = static_cast<Format>(i); Format currentFormat = static_cast<Format>(i);
std::string mimeType = formatToMimeType(currentFormat); const auto mimeType = formatToMimeType(currentFormat);
m_cachedAvailable[i] = false; m_cachedAvailable[i] = false;
if (!mimeType.empty()) { if (!mimeType.isEmpty()) {
for (const std::string &available : availableTypes) { for (const std::string &available : availableTypes) {
if (available == mimeType || (currentFormat == Format::Text && available == "text/plain") || if (available == mimeType || (currentFormat == Format::Text && available == "text/plain") ||
(currentFormat == Format::HTML && available.find("text/html") == 0)) { (currentFormat == Format::HTML && available.find("text/html") == 0)) {
@ -368,7 +368,7 @@ 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); std::string mimeType = formatToMimeType(format).toStdString();
if (mimeType.empty()) { if (mimeType.empty()) {
return std::string(); return std::string();
} }
@ -618,30 +618,30 @@ bool WlClipboard::executeCommandWithInput(const std::vector<const char *> &args,
} }
} }
std::string WlClipboard::formatToMimeType(Format format) const QString WlClipboard::formatToMimeType(Format format) const
{ {
switch (format) { switch (format) {
case Format::Text: case Format::Text:
return kMimeTypeText; return s_mimeTypeText;
case Format::HTML: case Format::HTML:
return kMimeTypeHtml; return s_mimeTypeHtml;
case Format::Bitmap: case Format::Bitmap:
return kMimeTypeBmp; return s_mimeTypeBmp;
default: default:
return std::string(); return {};
} }
} }
IClipboard::Format WlClipboard::mimeTypeToFormat(const std::string &mimeType) const IClipboard::Format WlClipboard::mimeTypeToFormat(const QString &mimeType) const
{ {
if (mimeType == kMimeTypeText || mimeType == "text/plain") { if (mimeType == s_mimeTypeText || mimeType == QStringLiteral("text/plain")) {
return Format::Text; return Format::Text;
} }
if (mimeType == kMimeTypeHtml || mimeType == kMimeTypeHtmlUtf8 || mimeType == kMimeTypeHtmlWindows || if (mimeType == s_mimeTypeHtml || mimeType == s_mimeTypeHtmlUtf8 || mimeType == s_mimeTypeHtmlWindows ||
mimeType.find("text/html") == 0) { mimeType.contains("text/html")) {
return Format::HTML; return Format::HTML;
} }
if (mimeType == kMimeTypeBmp || mimeType == "image/bmp") { if (mimeType == s_mimeTypeBmp) {
return Format::Bitmap; return Format::Bitmap;
} }
return Format::Text; // Default fallback return Format::Text; // Default fallback

5
src/lib/platform/WlClipboard.h
View file

@ -17,6 +17,7 @@
#include <thread> #include <thread>
#include <vector> #include <vector>
#include <QString>
//! Wayland clipboard implementation using wl-copy/wl-paste //! Wayland clipboard implementation using wl-copy/wl-paste
/*! /*!
This class implements clipboard functionality for Wayland environments This class implements clipboard functionality for Wayland environments
@ -71,10 +72,10 @@ private:
bool executeCommandWithInput(const std::vector<const char *> &args, const std::string &input) const; bool executeCommandWithInput(const std::vector<const char *> &args, const std::string &input) const;
//! Convert IClipboard format to MIME type //! Convert IClipboard format to MIME type
std::string formatToMimeType(Format format) const; QString formatToMimeType(Format format) const;
//! Convert MIME type to IClipboard format //! Convert MIME type to IClipboard format
Format mimeTypeToFormat(const std::string &mimeType) const; Format mimeTypeToFormat(const QString &mimeType) const;
//! Get available MIME types from clipboard //! Get available MIME types from clipboard
std::vector<std::string> getAvailableMimeTypes() const; std::vector<std::string> getAvailableMimeTypes() const;