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

Handle creating popup menus with far less crack, and for kicks, not occasionally spit backtraces trying to create menus. For bonus points, also don't pass the event onto the widget

This commit is contained in:
Chris Jones 2008-08-06 23:12:45 +01:00
parent d51ab3a7e2
commit 807921372b
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
terminatorlib/terminatorterm.py
View File

@ -123,7 +123,7 @@ class TerminatorTerm (gtk.VBox):
self._vte.connect ("key-press-event", self.on_vte_key_press) self._vte.connect ("key-press-event", self.on_vte_key_press)
self._vte.connect ("button-press-event", self.on_vte_button_press) self._vte.connect ("button-press-event", self.on_vte_button_press)
self._vte.connect ("popup-menu", self.on_vte_popup_menu) self._vte.connect ("popup-menu", self.create_popup_menu)
"""drag and drop""" """drag and drop"""
srcvtetargets = [ ( "vte", gtk.TARGET_SAME_APP, self.TARGET_TYPE_VTE ) ] srcvtetargets = [ ( "vte", gtk.TARGET_SAME_APP, self.TARGET_TYPE_VTE ) ]
dsttargets = [ ( "vte", gtk.TARGET_SAME_APP, self.TARGET_TYPE_VTE ), ('text/plain', 0, 0) , ("STRING", 0, 0), ("COMPOUND_TEXT", 0, 0)] dsttargets = [ ( "vte", gtk.TARGET_SAME_APP, self.TARGET_TYPE_VTE ), ('text/plain', 0, 0) , ("STRING", 0, 0), ("COMPOUND_TEXT", 0, 0)]
@ -629,7 +629,6 @@ text/plain
return False return False
# Left mouse button should transfer focus to this vte widget # Left mouse button should transfer focus to this vte widget
#LP#242612:
# we also need to give focus on the widget where the paste occured # we also need to give focus on the widget where the paste occured
if event.button in (1 ,2): if event.button in (1 ,2):
self._vte.grab_focus () self._vte.grab_focus ()
@ -637,7 +636,7 @@ text/plain
# Right mouse button should display a context menu if ctrl not pressed # Right mouse button should display a context menu if ctrl not pressed
if event.button == 3 and event.state & gtk.gdk.CONTROL_MASK == 0: if event.button == 3 and event.state & gtk.gdk.CONTROL_MASK == 0:
self.do_popup (event) self.create_popup_menu (self._vte, event)
return True return True
def on_vte_notify_enter (self, term, event): def on_vte_notify_enter (self, term, event):
@ -774,19 +773,17 @@ text/plain
pangodesc.set_size (fontsize) pangodesc.set_size (fontsize)
self._vte.set_font (pangodesc) self._vte.set_font (pangodesc)
def on_vte_popup_menu (self, term, event): def create_popup_menu (self, widget, event = None):
self.do_popup (event)
def do_popup (self, event = None):
menu = self.create_popup_menu (event)
menu.popup (None, None, None, event.button, event.time)
def create_popup_menu (self, event):
menu = gtk.Menu () menu = gtk.Menu ()
url = None url = 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 ()))
button = event.button
time = event.time
else:
button = 0
time = 0
if url: if url:
if url[1] != self.matches['email']: if url[1] != self.matches['email']:
@ -904,7 +901,9 @@ text/plain
menu.append (item) menu.append (item)
menu.show_all () menu.show_all ()
return menu menu.popup (None, None, None, button, time)
return True
def on_encoding_change (self, widget, encoding): def on_encoding_change (self, widget, encoding):
current = self._vte.get_encoding () current = self._vte.get_encoding ()