itdominator
/
terminator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix drag and drop of files (Schplurtz le Déboulonné, LP#1311481) and some tweaks (Steve Boddy) 

Schplurtz le Déboulonné
    - multiple files can be dropped in terminal
    - correctly sh-quote filenames, even those with '
    - also fixes LP#1311481 (\n after dropped filename)
Steve Boddy
    - changes to the logic, where all lines are now checked for the file:// prefix
    - text blocks now insert in full, not just first line
This commit is contained in:
Stephen Boddy 2015-07-13 00:11:44 +02:00
parent 6ffafe81d1 306bf03f67
commit 153b24946a
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
terminatorlib/terminal.py
View File

@ -1044,12 +1044,23 @@ class Terminal(gtk.VBox):
dbg('drag data received of type: %s' % selection_data.type) dbg('drag data received of type: %s' % selection_data.type)
if gtk.targets_include_text(drag_context.targets) or \ if gtk.targets_include_text(drag_context.targets) or \
gtk.targets_include_uri(drag_context.targets): gtk.targets_include_uri(drag_context.targets):
# copy text to destination # copy text with no modification yet to destination
txt = selection_data.data.strip(' ') txt = selection_data.data
if txt[0:7] == 'file://': txt_lines = txt.split( "\r\n" )
txt = "'%s'" % urllib.unquote(txt[7:]) if txt_lines[-1] == '':
else: for line in txt_lines[:-1]:
txt = txt.split('\n')[0] if line[0:7] != 'file://':
break
else:
# It is a list of crlf terminated file:// URL. let's
# iterate over all elements except the last one.
str=''
for fname in txt_lines[:-1]:
dbg('drag data fname: %s' % fname)
fname = "'%s'" % urllib.unquote(fname[7:].replace("'",
'\'\\\'\''))
str += fname + ' '
txt=str
for term in self.terminator.get_target_terms(self): for term in self.terminator.get_target_terms(self):
term.feed(txt) term.feed(txt)
return return