From 10bc18124110d963826f1d9631f88198e5c9ebb4 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Wed, 20 Nov 2024 03:34:51 -0500 Subject: [PATCH] Try to fix an issue where xclip is not being found even though it is installed. --- .../commands/export_clipboard_to_x.py | 37 +++++++++++++++---- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/src/fenrirscreenreader/commands/commands/export_clipboard_to_x.py b/src/fenrirscreenreader/commands/commands/export_clipboard_to_x.py index de73f68d..64e129b4 100644 --- a/src/fenrirscreenreader/commands/commands/export_clipboard_to_x.py +++ b/src/fenrirscreenreader/commands/commands/export_clipboard_to_x.py @@ -25,32 +25,53 @@ class command(): if self.env['runtime']['memoryManager'].isIndexListEmpty('clipboardHistory'): self.env['runtime']['outputManager'].presentText(_('clipboard empty'), interrupt=True) return - + clipboard = self.env['runtime']['memoryManager'].getIndexListElement('clipboardHistory') user = self.env['general']['currUser'] - + + # First try to find xclip in common locations + xclip_paths = [ + '/usr/bin/xclip', + '/bin/xclip', + '/usr/local/bin/xclip' + ] + + xclip_path = None + for path in xclip_paths: + if os.path.isfile(path) and os.access(path, os.X_OK): + xclip_path = path + break + + if not xclip_path: + self.env['runtime']['outputManager'].presentText( + 'xclip not found in common locations', + interrupt=True + ) + return + for display in range(10): p = Popen( - ['su', user, '-c', f"xclip -d :{display} -selection clipboard"], + ['su', user, '-p', '-c', f"{xclip_path} -d :{display} -selection clipboard"], stdin=PIPE, stdout=PIPE, stderr=PIPE, preexec_fn=os.setpgrp ) stdout, stderr = p.communicate(input=clipboard.encode('utf-8')) - + self.env['runtime']['outputManager'].interruptOutput() - + stderr = stderr.decode('utf-8') stdout = stdout.decode('utf-8') - + if stderr == '': break - + if stderr != '': self.env['runtime']['outputManager'].presentText(stderr, soundIcon='', interrupt=False) else: self.env['runtime']['outputManager'].presentText('exported to the X session.', interrupt=True) - + except Exception as e: self.env['runtime']['outputManager'].presentText(str(e), soundIcon='', interrupt=False) + def setCallback(self, callback): pass