let's commit some of tom's patches again, for maximal hilarity
This commit is contained in:
commit
c0afcb5d32
44
terminator
44
terminator
@ -25,8 +25,12 @@ APP_VERSION = '0.9'
|
||||
import os, platform, sys, string, time, math
|
||||
from optparse import OptionParser
|
||||
|
||||
import gettext
|
||||
gettext.install (APP_NAME)
|
||||
try:
|
||||
import gettext
|
||||
gettext.install (APP_NAME)
|
||||
except:
|
||||
def _ (text):
|
||||
return text
|
||||
|
||||
# import unix-lib
|
||||
import pwd
|
||||
@ -136,21 +140,7 @@ class TerminatorTerm:
|
||||
self._vte.add_events (gtk.gdk.ENTER_NOTIFY_MASK)
|
||||
self._vte.connect ("enter_notify_event", self.on_vte_notify_enter)
|
||||
|
||||
self.matches['full_uri'] = self._vte.match_add ('''[[:<:]](news:|telnet:|nntp:|file:/|https?:|ftps?:|webcal:)//([-A-Za-z0-9]+(:[-A-Za-z0-9,?;.:/!%$^*&~"#']+)?@)?[-A-Za-z0-9.]+(:[0-9]+)?(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\"])?[[:>:]]/?''')
|
||||
if self.matches['full_uri'] == -1:
|
||||
self.matches['full_uri'] = self._vte.match_add ('''\<(news:|telnet:|nntp:|file:/|https?:|ftps?:|webcal:)//([-A-Za-z0-9]+(:[-A-Za-z0-9,?;.:/!%$^*&~"#']+)?@)?[-A-Za-z0-9.]+(:[0-9]+)?(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\"])?\>/?''')
|
||||
|
||||
self.matches['addr_only'] = self._vte.match_add ('''[[:<:]](www|ftp)[-A-Za-z0-9]*\.[-A-Za-z0-9.]+(:[0-9]+)?(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\"])?[[:>:]]/?''')
|
||||
if self.matches['addr_only'] == -1:
|
||||
self.matches['addr_only'] = self._vte.match_add ('''\<(www|ftp)[-A-Za-z0-9]*\.[-A-Za-z0-9.]+(:[0-9]+)?(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\"])?\>/?''')
|
||||
|
||||
self.matches['email'] = self._vte.match_add ('''[[:<:]](mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9][a-z0-9-]*(\.[a-z0-9][a-z0-9-]*)+[[:>:]]''')
|
||||
if self.matches['email'] == -1:
|
||||
self.matches['email'] = self._vte.match_add ('''\<(mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9][a-z0-9-]*(\.[a-z0-9][a-z0-9-]*)+\>''')
|
||||
|
||||
self.matches['nntp'] = self._vte.match_add ('''[[:<:]]news:[-A-Z\^_a-z{|}~!"#$%&'()*+,./0-9;:=?`]+@[-A-Za-z0-9.]+(:[0-9]+)?[[:>:]]''')
|
||||
if self.matches['nntp'] == -1:
|
||||
self.matches['nntp'] = self._vte.match_add ('''\<news:[-A-Z\^_a-z{|}~!"#$%&'()*+,./0-9;:=?`]+@[-A-Za-z0-9.]+(:[0-9]+)?\>''')
|
||||
self.add_matches()
|
||||
|
||||
env_proxy = os.getenv ('http_proxy')
|
||||
if not env_proxy:
|
||||
@ -158,6 +148,26 @@ class TerminatorTerm:
|
||||
|
||||
self.spawn_child ()
|
||||
|
||||
def add_matches (self, lboundry="[[:<:]]", rboundry="[[:>:]]"):
|
||||
userchars = "-A-Za-z0-9"
|
||||
passchars = "-A-Za-z0-9,?;.:/!%$^*&~\"#'"
|
||||
hostchars = "-A-Za-z0-9"
|
||||
pathchars = "-A-Za-z0-9_$.+!*(),;:@&=?/~#%"
|
||||
schemes = "(news:|telnet:|nntp:|file:/|https?:|ftps?:|webcal:)"
|
||||
user = "[" + userchars + "]+(:[" + passchars + "]+)?"
|
||||
urlpath = "/[" + pathchars + "]*[^]'.}>) \t\r\n,\\\"]"
|
||||
|
||||
self.matches['full_uri'] = self._vte.match_add(lboundry + schemes + "//(" + user + "@)?[" + hostchars +".]+(:[0-9]+)?(" + urlpath + ")?" + rboundry + "/?")
|
||||
|
||||
# FreeBSD works with [[:<:]], Linux works with \<
|
||||
if self.matches['full_uri'] == -1:
|
||||
if lboundry != "\\<":
|
||||
self.add_matches(lboundry = "\\<", rboundry = "\\>")
|
||||
else:
|
||||
self.matches['addr_only'] = self._vte.match_add (lboundry + "(www|ftp)[" + hostchars + "]*\.[" + hostchars + ".]+(:[0-9]+)?(" + urlpath + ")?" + rboundry + "/?")
|
||||
self.matches['email'] = self._vte.match_add (lboundry + "(mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9][a-z0-9-]*(\.[a-z0-9][a-z0-9-]*)+" + rboundry)
|
||||
self.matches['nntp'] = self._vte.match_add (lboundry + '''news:[-A-Z\^_a-z{|}~!"#$%&'()*+,./0-9;:=?`]+@[-A-Za-z0-9.]+(:[0-9]+)?''' + rboundry)
|
||||
|
||||
def spawn_child (self, event=None):
|
||||
update_records = self.conf.update_records
|
||||
login = self.conf.login_shell
|
||||
|
Loading…
Reference in New Issue
Block a user