fix: use runtime detection for Wayland clipboard#4497
Open
benignobjunior wants to merge 1 commit intoflameshot-org:masterfrom
Open
fix: use runtime detection for Wayland clipboard#4497benignobjunior wants to merge 1 commit intoflameshot-org:masterfrom
benignobjunior wants to merge 1 commit intoflameshot-org:masterfrom
Conversation
When compiled with USE_WAYLAND_CLIPBOARD, the clipboard now works correctly on both Wayland and X11 sessions. Previously, builds with USE_WAYLAND_CLIPBOARD=ON would always use KSystemClipboard, which doesn't work properly when running under X11 (e.g., via XWayland or QT_QPA_PLATFORM=xcb). This change adds a runtime check for the platform name: - 'wayland' -> uses KSystemClipboard (KF6 GuiAddons) - otherwise -> uses QApplication::clipboard() (standard Qt) This allows distros to ship a single binary that works on both display servers without requiring separate builds.
Collaborator
|
If KGuiAddons will compile on windows and Macos I would prefer to remove it as a compile time option and always build with it. That would simplify it even more. If its not cross platform then we can leave it like this. |
Contributor
Author
|
Hey! Good call. I checked the KGuiAddons source and yeah, it builds on all platforms. KSystemClipboard is always compiled and just uses QClipboard when Wayland isn't available, so no platform issues there. One thing though, I looked at the Flameshot CI and the Windows/macOS workflows don't install any KDE deps (pure Qt builds). Making KF6GuiAddons a hard dep would break those. What about auto-detection instead? find_package(KF6GuiAddons QUIET)
if(KF6GuiAddons_FOUND)
target_compile_definitions(flameshot PRIVATE USE_WAYLAND_CLIPBOARD=1)
target_link_libraries(flameshot KF6::GuiAddons)
message(STATUS "KF6GuiAddons found, Wayland clipboard support enabled")
else()
message(STATUS "KF6GuiAddons not found, using Qt clipboard")
endif()No cmake flag needed, if it's there it gets used. Linux distros pick it up automatically, Win/Mac CI stays untouched. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
When compiled with
USE_WAYLAND_CLIPBOARD=ON, the clipboard only works on Wayland sessions. Running the same binary on X11 (e.g., via XWayland orQT_QPA_PLATFORM=xcb) results in clipboard not working.Solution
Add runtime detection for the platform name:
wayland→ uses KSystemClipboard (KF6 GuiAddons)Benefits
USE_WAYLAND_CLIPBOARDTesting
Tested on CachyOS (Arch-based) with KDE Plasma 6:
QT_QPA_PLATFORM=xcb: clipboard works