Fix PuTTY paste mode so Ctrl-Right-Drag terminal still works

This commit is contained in:
Stephen Boddy 2015-12-01 00:12:15 +01:00
parent bc0903191d
commit f5050ff57a
1 changed files with 8 additions and 8 deletions

View File

@ -925,11 +925,11 @@ class Terminal(gtk.VBox):
return True return True
if self.config['putty_paste_style']: if self.config['putty_paste_style']:
btn_to_paste = self.MOUSEBUTTON_RIGHT middle_click = [self.popup_menu, (widget, event)]
btn_to_context_menu = self.MOUSEBUTTON_MIDDLE right_click = [self.paste_clipboard, (True, )]
else: else:
btn_to_paste = self.MOUSEBUTTON_MIDDLE middle_click = [self.paste_clipboard, (True, )]
btn_to_context_menu = self.MOUSEBUTTON_RIGHT right_click = [self.popup_menu, (widget, event)]
if event.button == self.MOUSEBUTTON_LEFT: if event.button == self.MOUSEBUTTON_LEFT:
# Ctrl+leftclick on a URL should open it # Ctrl+leftclick on a URL should open it
@ -937,14 +937,14 @@ class Terminal(gtk.VBox):
url = self.check_for_url(event) url = self.check_for_url(event)
if url: if url:
self.open_url(url, prepare=True) self.open_url(url, prepare=True)
elif event.button == btn_to_paste: elif event.button == self.MOUSEBUTTON_MIDDLE:
# middleclick should paste the clipboard # middleclick should paste the clipboard
self.paste_clipboard(True) middle_click[0](*middle_click[1])
return(True) return(True)
elif event.button == btn_to_context_menu: elif event.button == self.MOUSEBUTTON_RIGHT:
# rightclick should display a context menu if Ctrl is not pressed # rightclick should display a context menu if Ctrl is not pressed
if event.state & gtk.gdk.CONTROL_MASK == 0: if event.state & gtk.gdk.CONTROL_MASK == 0:
self.popup_menu(widget, event) right_click[0](*right_click[1])
return(True) return(True)
return(False) return(False)