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

Couple of non-Egmont patches: 

* Fix middle-click insert primary selection for Wayland (N/A) to insert from clipboard instead
* Remove invalid double-quote (") from the pathchar for url regex matching
This commit is contained in:
Stephen Boddy 2015-12-02 22:52:26 +01:00
parent 7518c16588 3e44db0b95
commit 9a1afde0ae
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -62,6 +62,10 @@ terminator GTK3:
(Steve Boddy, LP#1494606) (Steve Boddy, LP#1494606)
* Fix PuTTY paste mode so Ctrl-Right-Drag, and application mouse * Fix PuTTY paste mode so Ctrl-Right-Drag, and application mouse
handling in terminal still works (Steve Boddy) handling in terminal still works (Steve Boddy)
* Fix middle-click insert primary selection for Wayland (N/A) to
insert from clipboard instead (Mattias Eriksson)
* Remove invalid double-quote (") from the pathchar for url regex
matching (Steve Boddy, LP#1514578)
terminator 0.97: terminator 0.97:
* Allow font dimming in inactive terminals * Allow font dimming in inactive terminals

9
terminatorlib/terminal.py
View File

@ -13,7 +13,7 @@ from gi.repository import Vte
import subprocess import subprocess
import urllib import urllib
from util import dbg, err, spawn_new_terminator, make_uuid, manual_lookup from util import dbg, err, spawn_new_terminator, make_uuid, manual_lookup, display_manager
import util import util
from config import Config from config import Config
from cwd import get_default_cwd from cwd import get_default_cwd
@ -262,7 +262,7 @@ class Terminal(Gtk.VBox):
userchars = "-A-Za-z0-9" userchars = "-A-Za-z0-9"
passchars = "-A-Za-z0-9,?;.:/!%$^*&~\"#'" passchars = "-A-Za-z0-9,?;.:/!%$^*&~\"#'"
hostchars = "-A-Za-z0-9" hostchars = "-A-Za-z0-9"
pathchars = "-A-Za-z0-9_$.+!*(),;:@&=?/~#%'\"" pathchars = "-A-Za-z0-9_$.+!*(),;:@&=?/~#%'"
schemes = "(news:|telnet:|nntp:|file:/|https?:|ftps?:|webcal:)" schemes = "(news:|telnet:|nntp:|file:/|https?:|ftps?:|webcal:)"
user = "[" + userchars + "]+(:[" + passchars + "]+)?" user = "[" + userchars + "]+(:[" + passchars + "]+)?"
urlpath = "/[" + pathchars + "]*[^]'.}>) \t\r\n,\\\"]" urlpath = "/[" + pathchars + "]*[^]'.}>) \t\r\n,\\\"]"
@ -924,11 +924,12 @@ class Terminal(Gtk.VBox):
# Suppress double-click behavior # Suppress double-click behavior
return True return True
use_primary = (display_manager() != 'WAYLAND')
if self.config['putty_paste_style']: if self.config['putty_paste_style']:
middle_click = [self.popup_menu, (widget, event)] middle_click = [self.popup_menu, (widget, event)]
right_click = [self.paste_clipboard, (True, )] right_click = [self.paste_clipboard, (use_primary, )]
else: else:
middle_click = [self.paste_clipboard, (True, )] middle_click = [self.paste_clipboard, (use_primary, )]
right_click = [self.popup_menu, (widget, event)] right_click = [self.popup_menu, (widget, event)]
if event.button == self.MOUSEBUTTON_LEFT: if event.button == self.MOUSEBUTTON_LEFT: