clipboard: Clang-tidy clean up and limit wayland clipboard size to 4000 bytes.

Author: wengxt

src/modules/clipboard/clipboard.cpp

@@ -5,21 +5,49 @@
  *
  */
 #include "clipboard.h"
+#include <algorithm>
+#include <cstddef>
 #include <cstdint>
+#include <iterator>
 #include <limits>
+#include <memory>
+#include <string>
 #include <unordered_set>
+#include <utility>
+#include "fcitx-config/iniparser.h"
 #include "fcitx-utils/event.h"
+#include "fcitx-utils/eventloopinterface.h"
 #include "fcitx-utils/i18n.h"
+#include "fcitx-utils/key.h"
+#include "fcitx-utils/keysym.h"
 #include "fcitx-utils/log.h"
+#include "fcitx-utils/macros.h"
 #include "fcitx-utils/misc_p.h"
 #include "fcitx-utils/utf8.h"
 #include "fcitx/addonfactory.h"
+#include "fcitx/addoninstance.h"
 #include "fcitx/addonmanager.h"
+#include "fcitx/candidatelist.h"
+#include "fcitx/event.h"
 #include "fcitx/inputcontext.h"
 #include "fcitx/inputcontextmanager.h"
 #include "fcitx/inputpanel.h"
+#include "fcitx/instance.h"
+#include "fcitx/text.h"
+#include "fcitx/userinterface.h"
 #include "clipboardentry.h"
 
+#ifdef ENABLE_X11
+#include <xcb/xcb.h>
+#include "xcb_public.h"
+#include "xcbclipboard.h"
+#endif
+#ifdef WAYLAND_FOUND
+#include <wayland-client-core.h>
+#include "wayland_public.h"
+#include "waylandclipboard.h"
+#endif
+
 namespace fcitx {
 
 namespace {
@@ -155,8 +183,8 @@ Clipboard::Clipboard(Instance *instance)
             wayland->call<IWaylandModule::addConnectionCreatedCallback>(
                 [this](const std::string &name, wl_display *display,
                        FocusGroup *) {
-                    waylandClipboards_[name].reset(
-                        new WaylandClipboard(this, name, display));
+                    waylandClipboards_[name] =
+                        std::make_unique<WaylandClipboard>(this, name, display);
                 });
         waylandClosedCallback_ =
             wayland->call<IWaylandModule::addConnectionClosedCallback>(
@@ -482,8 +510,8 @@ void Clipboard::refreshPasswordTimer() {
     }
 
     if (minTimestamp != std::numeric_limits<uint64_t>::max()) {
-        clearPasswordTimer_->setTime(minTimestamp +
-                                     oneSecond * (*config_.clearPasswordAfter));
+        clearPasswordTimer_->setTime(
+            minTimestamp + (oneSecond * (*config_.clearPasswordAfter)));
         FCITX_CLIPBOARD_DEBUG()
             << "Password Clearing Timer will be triggered after: "
             << clearPasswordTimer_->time() - now(CLOCK_MONOTONIC);

src/modules/clipboard/clipboard.h

@@ -10,11 +10,13 @@
 #include <cstddef>
 #include <memory>
 #include <string>
+#include <unordered_map>
 #include <vector>
 #include "fcitx-config/configuration.h"
 #include "fcitx-config/iniparser.h"
 #include "fcitx-config/option.h"
-#include "fcitx-utils/event.h"
+#include "fcitx-config/rawconfig.h"
+#include "fcitx-utils/eventloopinterface.h"
 #include "fcitx-utils/handlertable.h"
 #include "fcitx-utils/i18n.h"
 #include "fcitx-utils/key.h"
@@ -39,7 +41,7 @@
 
 namespace fcitx {
 
-constexpr size_t MAX_CLIPBOARD_SIZE = 4096;
+constexpr size_t MAX_CLIPBOARD_SIZE = 4000;
 constexpr char PASSWORD_MIME_TYPE[] = "x-kde-passwordManagerHint";
 
 FCITX_CONFIGURATION(

src/modules/clipboard/clipboardentry.h

@@ -7,7 +7,9 @@
 #ifndef _FCITX5_MODULES_CLIPBOARD_CLIPBOARDENTRY_H_
 #define _FCITX5_MODULES_CLIPBOARD_CLIPBOARDENTRY_H_
 
+#include <cstddef>
 #include <cstdint>
+#include <functional>
 #include <string>
 #include "fcitx-utils/log.h"
 
@@ -49,4 +51,4 @@ struct std::hash<fcitx::ClipboardEntry> {
     }
 };
 
-#endif // _FCITX5_MODULES_CLIPBOARD_CLIPBOARDENTRY_H_
+#endif // _FCITX5_MODULES_CLIPBOARD_CLIPBOARDENTRY_H_

src/modules/clipboard/waylandclipboard.cpp

@@ -5,10 +5,25 @@
  *
  */
 #include "waylandclipboard.h"
+#include <unistd.h>
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <string_view>
 #include <unordered_set>
+#include <utility>
+#include <vector>
+#include <wayland-client-core.h>
+#include <wayland-client-protocol.h>
 #include "fcitx-utils/event.h"
+#include "fcitx-utils/eventloopinterface.h"
+#include "fcitx-utils/fs.h"
+#include "fcitx-utils/log.h"
+#include "fcitx-utils/misc_p.h"
 #include "fcitx-utils/trackableobject.h"
+#include "fcitx-utils/unixfd.h"
 #include "clipboard.h"
+#include "display.h"
 #include "wl_seat.h"
 #include "zwlr_data_control_manager_v1.h"
 #include "zwlr_data_control_offer_v1.h"
@@ -127,12 +142,13 @@ void DataOffer::receiveData(DataReaderThread &thread,
 
     auto callbackWrapper =
         [this, callback = std::move(callback)](const std::vector<char> &data) {
-            return callback(data, isPassword_);
+            callback(data, isPassword_);
+            return;
         };
 
     thread_ = &thread;
     static const std::string passwordHint = PASSWORD_MIME_TYPE;
-    if (mimeTypes_.count(passwordHint)) {
+    if (mimeTypes_.contains(passwordHint)) {
         receiveDataForMime(passwordHint, [this, callbackWrapper](
                                              const std::vector<char> &data) {
             if (std::string_view(data.data(), data.size()) == "secret" &&
@@ -157,9 +173,9 @@ void DataOffer::receiveRealData(DataOfferDataCallback callback) {
     static const std::string utf8Mime = "text/plain;charset=utf-8";
     static const std::string textMime = "text/plain";
 
-    if (mimeTypes_.count(utf8Mime)) {
+    if (mimeTypes_.contains(utf8Mime)) {
         mime = utf8Mime;
-    } else if (mimeTypes_.count(textMime)) {
+    } else if (mimeTypes_.contains(textMime)) {
         mime = textMime;
     } else {
         return;
@@ -242,7 +258,7 @@ WaylandClipboard::WaylandClipboard(Clipboard *clipboard, std::string name,
           static_cast<wayland::Display *>(wl_display_get_user_data(display))) {
     display_->requestGlobals<wayland::ZwlrDataControlManagerV1>();
     globalConn_ = display_->globalCreated().connect(
-        [this](const std::string &interface, std::shared_ptr<void> ptr) {
+        [this](const std::string &interface, const std::shared_ptr<void> &ptr) {
             if (interface == wayland::ZwlrDataControlManagerV1::interface) {
                 if (ptr != manager_) {
                     deviceMap_.clear();
@@ -256,7 +272,7 @@ WaylandClipboard::WaylandClipboard(Clipboard *clipboard, std::string name,
             }
         });
     globalRemoveConn_ = display_->globalRemoved().connect(
-        [this](const std::string &interface, std::shared_ptr<void> ptr) {
+        [this](const std::string &interface, const std::shared_ptr<void> &ptr) {
             if (interface == wayland::ZwlrDataControlManagerV1::interface) {
                 deviceMap_.clear();
                 if (manager_ == ptr) {
@@ -281,7 +297,7 @@ void WaylandClipboard::refreshSeat() {
 
     auto seats = display_->getGlobals<wayland::WlSeat>();
     for (const auto &seat : seats) {
-        if (deviceMap_.count(seat.get())) {
+        if (deviceMap_.contains(seat.get())) {
             continue;
         }
 

src/modules/clipboard/waylandclipboard.h

@@ -7,11 +7,19 @@
 #ifndef _FCITX5_MODULES_CLIPBOARD_WAYLANDCLIPBOARD_H_
 #define _FCITX5_MODULES_CLIPBOARD_WAYLANDCLIPBOARD_H_
 
+#include <cstdint>
 #include <functional>
+#include <list>
+#include <memory>
+#include <string>
 #include <thread>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
+#include <wayland-client-core.h>
 #include "fcitx-utils/event.h"
 #include "fcitx-utils/eventdispatcher.h"
-#include "fcitx-utils/macros.h"
+#include "fcitx-utils/eventloopinterface.h"
 #include "fcitx-utils/signals.h"
 #include "fcitx-utils/trackableobject.h"
 #include "fcitx-utils/unixfd.h"

src/modules/clipboard/xcbclipboard.cpp

@@ -6,9 +6,14 @@
  */
 #include "xcbclipboard.h"
 #include <ctime>
+#include <memory>
+#include <string>
 #include <string_view>
+#include <utility>
 #include <xcb/xproto.h>
+#include "fcitx-utils/handlertable.h"
 #include "clipboard.h"
+#include "xcb_public.h"
 
 namespace fcitx {
 

src/modules/clipboard/xcbclipboard.h

@@ -7,7 +7,10 @@
 #ifndef _FCITX5_MODULES_CLIPBOARD_XCBCLIPBOARD_H_
 #define _FCITX5_MODULES_CLIPBOARD_XCBCLIPBOARD_H_
 
+#include <cstddef>
+#include <memory>
 #include <string>
+#include <vector>
 #include <xcb/xproto.h>
 #include "fcitx-utils/handlertable.h"
 #include "fcitx/addoninstance.h"
@@ -80,4 +83,4 @@ class XcbClipboard {
 
 } // namespace fcitx
 
-#endif // _FCITX5_MODULES_CLIPBOARD_XCBCLIPBOARD_H_
+#endif // _FCITX5_MODULES_CLIPBOARD_XCBCLIPBOARD_H_