From d47d9fd7bc66829f7fead25053f647ae406d78ef Mon Sep 17 00:00:00 2001 From: chrys Date: Sun, 12 Mar 2017 22:12:43 +0100 Subject: [PATCH] sync --- config/keyboard/desktop.conf | 2 +- .../commands/commands/export_clipboard_to_x.py | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/config/keyboard/desktop.conf b/config/keyboard/desktop.conf index c4af2f4b..23901fc5 100644 --- a/config/keyboard/desktop.conf +++ b/config/keyboard/desktop.conf @@ -110,6 +110,6 @@ KEY_FENRIR,KEY_C=copy_marked_to_clipboard KEY_FENRIR,KEY_V=paste_clipboard # linux specific -#=export_clipboard_to_x +KEY_FENRIR,KEY_SHIFT,KEY_R=export_clipboard_to_x KEY_FENRIR,KEY_CTRL,KEY_UP=inc_alsa_volume KEY_FENRIR,KEY_CTRL,KEY_DOWN=dec_alsa_volume diff --git a/src/fenrir/commands/commands/export_clipboard_to_x.py b/src/fenrir/commands/commands/export_clipboard_to_x.py index 4e64824a..4e81906c 100644 --- a/src/fenrir/commands/commands/export_clipboard_to_x.py +++ b/src/fenrir/commands/commands/export_clipboard_to_x.py @@ -20,30 +20,39 @@ class command(): def getDescription(self): return _('export the current fenrir clipboard to X clipboard') def run(self): - _thread.start_new_thread(self._threadRun , ()) + print('drin') + _thread.start_new_thread(self._threadRun , ()) def _threadRun(self): + print('jo') try: currClipboard = self.env['commandBuffer']['currClipboard'] + print(currClipboard) + if currClipboard < 0: self.env['runtime']['outputManager'].presentText(_('clipboard empty'), interrupt=True) + print('1') return if not self.env['commandBuffer']['clipboard']: self.env['runtime']['outputManager'].presentText(_('clipboard empty'), interrupt=True) + print('2') return if not self.env['commandBuffer']['clipboard'][currClipboard]: self.env['runtime']['outputManager'].presentText(_('clipboard empty'), interrupt=True) + print('3') return if self.env['commandBuffer']['clipboard'][currClipboard] == '': self.env['runtime']['outputManager'].presentText(_('clipboard empty'), interrupt=True) + print('4') return - - p = Popen('su -c "echo -n \"' + self.env['commandBuffer']['clipboard'][currClipboard] +'\" | xclip -selection c' + self.env['generalInformation']['currUser'] , stdout=PIPE, stderr=PIPE, shell=True) + print('doit') + p = Popen('su -c "echo -n \"' + self.env['commandBuffer']['clipboard'][currClipboard] +'\" | xclip -d :0 -selection c' + self.env['generalInformation']['currUser'] , stdout=PIPE, stderr=PIPE, shell=True) stdout, stderr = p.communicate() self.env['runtime']['outputManager'].interruptOutput() screenEncoding = self.env['runtime']['settingsManager'].getSetting('screen', 'encoding') stderr = stderr.decode(screenEncoding, "replace").encode('utf-8').decode('utf-8') stdout = stdout.decode(screenEncoding, "replace").encode('utf-8').decode('utf-8') + print('test:',stderr,stdout) if stderr != '': self.env['runtime']['outputManager'].presentText(stdout , soundIcon='', interrupt=False) else: