Skip to content

fix(linux): paste via xclip on X11 regardless of clipboard ownership #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
trouni wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(linux): paste via xclip on X11 regardless of clipboard ownership #171

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions ClipCascade_Desktop/src/clipboard/clipboard_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@ def __init__(self, config: Config):
self.sys_tray: TaskbarPanel = None
self.is_files_download_enabled = False

if PLATFORM.startswith(LINUX) and XMODE:
self.is_x_clipboard_owner = clipboard_monitor.is_x_clipboard_owner()

def set_tray_ref(self, sys_tray: TaskbarPanel):
"""
Sets the system tray reference.
Expand Down Expand Up @@ -218,7 +215,7 @@ def paste(self, payload: any, payload_type: str = "text"):
if PLATFORM == WINDOWS or PLATFORM == MACOS:
pyperclip.copy(payload)
elif PLATFORM.startswith(LINUX):
if XMODE and self.is_x_clipboard_owner:
if XMODE:
ClipboardManager.execute_command(
"xclip",
"-selection",
Expand Down Expand Up @@ -258,7 +255,7 @@ def paste(self, payload: any, payload_type: str = "text"):
png_data = output.getvalue()

clipboard_monitor.enable_block_image_once() # Block image copy to prevent deadlock
if XMODE and self.is_x_clipboard_owner:
if XMODE:
ClipboardManager.execute_command(
"xclip",
"-selection",
Expand Down