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

Unify the the preparation of URLs so they work properly with ctrl-click, and also to reduce duplication. Closes LP #344617

This commit is contained in:
Chris Jones 2009-03-19 22:03:44 +00:00
parent 2c7648c7e4
commit 2ea44fb8bc
1 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
terminatorlib/terminatorterm.py
View File

@ -282,6 +282,19 @@ class TerminatorTerm (gtk.VBox):
os.putenv ('COLORTERM', 'gnome-terminal') os.putenv ('COLORTERM', 'gnome-terminal')
dbg ('SEGBUG: TerminatorTerm __init__ complete') dbg ('SEGBUG: TerminatorTerm __init__ complete')
def prepareurl (self, url, match):
dbg ("prepareurl: Checking '%s' with a match of '%s'" % (url, match))
if match == self.matches['email'] and url[0:7] != 'mailto:':
url = 'mailto:' + url
elif match == self.matches['addr_only'] and url[0:3] == 'ftp':
url = 'ftp://' + url
elif match == self.matches['addr_only']:
url = 'http://' + url
elif match == self.matches['launchpad']:
url = 'https://bugs.launchpad.net/bugs/%s' % re.sub (r'[^0-9]+', '', url)
return url
def openurl (self, url): def openurl (self, url):
dbg ('openurl: viewing %s'%url) dbg ('openurl: viewing %s'%url)
try: try:
@ -743,14 +756,7 @@ text/plain
if event.button == 1: if event.button == 1:
url = self._vte.match_check (int (event.x / self._vte.get_char_width ()), int (event.y / self._vte.get_char_height ())) url = self._vte.match_check (int (event.x / self._vte.get_char_width ()), int (event.y / self._vte.get_char_height ()))
if url: if url:
if (url[0][0:7] != "mailto:") & (url[1] == self.matches['email']): self.openurl (self.prepareurl (url[0], url[1]))
address = "mailto:" + url[0]
elif url[1] == self.matches['launchpad']:
# the only part of 'launchpad' we need are the actual numbers for the bug
address = "https://bugs.launchpad.net/bugs/%s" % re.sub(r'[^0-9]+', '', url[0])
else:
address = url[0]
self.openurl ( address )
return False return False
# Left mouse button should transfer focus to this vte widget # Left mouse button should transfer focus to this vte widget
@ -1052,6 +1058,7 @@ text/plain
def create_popup_menu (self, widget, event = None): def create_popup_menu (self, widget, event = None):
menu = gtk.Menu () menu = gtk.Menu ()
url = None url = None
address = None
if event: if event:
url = self._vte.match_check (int (event.x / self._vte.get_char_width ()), int (event.y / self._vte.get_char_height ())) url = self._vte.match_check (int (event.x / self._vte.get_char_width ()), int (event.y / self._vte.get_char_height ()))
@ -1062,35 +1069,19 @@ text/plain
time = 0 time = 0
if url: if url:
if url[1] != self.matches['email']: address = self.prepareurl (url[0], url[1])
# Add protocol if we launch a URL without it, otherwise xdg-open won't open it
if url[1] == self.matches['addr_only']: if url[1] == self.matches['email']:
if url[0][0:3] == "ftp": nameopen = _("_Send Mail To...")
# "ftp.foo.bar" -> "ftp://ftp.foo.bar" namecopy = _("_Copy Email Address")
address = "ftp://" + url[0] item = gtk.MenuItem (nameopen)
else: else:
# Assume http
address = "http://" + url[0]
elif url[1] == self.matches['launchpad']:
# the only part of 'launchpad' we need are the actual numbers for the bug
address = "https://bugs.launchpad.net/bugs/%s" % re.sub(r'[^0-9]+', '', url[0])
else:
address = url[0]
nameopen = _("_Open Link") nameopen = _("_Open Link")
namecopy = _("_Copy Link Address") namecopy = _("_Copy Link Address")
iconopen = gtk.image_new_from_stock(gtk.STOCK_JUMP_TO, gtk.ICON_SIZE_MENU) iconopen = gtk.image_new_from_stock(gtk.STOCK_JUMP_TO, gtk.ICON_SIZE_MENU)
item = gtk.ImageMenuItem (nameopen) item = gtk.ImageMenuItem (nameopen)
item.set_property('image', iconopen) item.set_property('image', iconopen)
else:
if url[0][0:7] != "mailto:":
address = "mailto:" + url[0]
else:
address = url[0]
nameopen = _("_Send Mail To...")
namecopy = _("_Copy Email Address")
item = gtk.MenuItem (nameopen)
item.connect ("activate", lambda menu_item: self.openurl (address)) item.connect ("activate", lambda menu_item: self.openurl (address))
menu.append (item) menu.append (item)