Merge lp:~nemilya/terminator/putty_paste_style into lp:terminator/trunk

[Nemilya]

Solution for this:
https://bugs.launchpad.net/terminator/+bug/1416682

Option 'Putty paste style' to make ex-putty (ex-windows) users little happy :)

May be make some text corrections?

Thanks!

[Stephen Boddy (stephen-j-boddy)]

Other than the one in-line comment below, it's a nice clean simple patch. I'll apply it as is.

I do have one thing I'm undecided on, and that is whether this should be per profile, or global. I can't imagine someone would need this to be per profile, because it would be *very* confusing switching between two terminals operating different ways. It may be that I'll consider moving the setting into the global section. Or perhaps you have some counter-argument?

Anyhow, thanks for the contribution.

review: Approve

[Nemilya (nemilya)]

Thanks for merging!

=== modified file 'doc/manual/_build/html/_sources/preferences.txt'
--- doc/manual/_build/html/_sources/preferences.txt	2015-08-21 00:11:31 +0000
+++ doc/manual/_build/html/_sources/preferences.txt	2015-09-22 14:53:14 +0000
@@ -256,6 +256,11 @@
   This puts the selection into the copy/paste buffer, as well as being
   available on middle-click.
 
+**Putty paste style** (default: off)
+
+  Make right mouse button in Putty-style: right button - paste from 
+  clipboard, middle - open popup (for ex-Putty users).
+
 **Select-by-word characters** (default: ``-A-Za-z0-9,./?%&#:_``)
 
   Using double-click to select text will use this pattern to define

=== modified file 'doc/manual/source/preferences.rst'
--- doc/manual/source/preferences.rst	2015-08-21 00:11:31 +0000
+++ doc/manual/source/preferences.rst	2015-09-22 14:53:14 +0000
@@ -256,6 +256,11 @@
   This puts the selection into the copy/paste buffer, as well as being
   available on middle-click.
 
+**Putty paste style** (default: off)
+
+  Make right mouse button in Putty-style: right button - paste from 
+  clipboard, middle - open popup (for ex-Putty users).
+
 **Select-by-word characters** (default: ``-A-Za-z0-9,./?%&#:_``)
 
   Using double-click to select text will use this pattern to define

=== modified file 'doc/terminator_config.5'
--- doc/terminator_config.5	2015-07-10 19:36:33 +0000
+++ doc/terminator_config.5	2015-09-22 14:53:14 +0000
@@ -489,6 +489,10 @@
 .B copy_on_selection \fR(boolean)
 If set to True, text selections will be automatically copied to the clipboard, in addition to being made the Primary selection.
 Default value: \fBFalse\fR
+.TP
+.B putty_paste_style \fR(boolean)
+If set to True, right mouse click - paste Primary selection, middle mouse click - popup menu.
+Default value: \fBFalse\fR
 
 .SH layouts
 

=== modified file 'terminatorlib/config.py'
--- terminatorlib/config.py	2015-08-08 02:11:30 +0000
+++ terminatorlib/config.py	2015-09-22 14:53:14 +0000
@@ -242,6 +242,7 @@
                 'force_no_bell'         : False,
                 'cycle_term_tab'        : True,
                 'copy_on_selection'     : False,
+                'putty_paste_style'     : False,
                 'alternate_screen_scroll': True,
                 'split_to_group'        : False,
                 'autoclean_groups'      : True,

=== modified file 'terminatorlib/preferences.glade'
--- terminatorlib/preferences.glade	2015-08-10 19:45:48 +0000
+++ terminatorlib/preferences.glade	2015-09-22 14:53:14 +0000
@@ -1590,6 +1590,22 @@
                                 <property name="position">5</property>
                               </packing>
                             </child>
+                            <child>
+                              <object class="GtkCheckButton" id="putty_paste_style">
+                                <property name="label" translatable="yes">Putty paste style</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="on_putty_paste_style_toggled" swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">6</property>
+                              </packing>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>

=== modified file 'terminatorlib/prefseditor.py'
--- terminatorlib/prefseditor.py	2015-08-20 22:15:05 +0000
+++ terminatorlib/prefseditor.py	2015-09-22 14:53:14 +0000
@@ -425,6 +425,9 @@
         # Copy on selection
         widget = guiget('copy_on_selection')
         widget.set_active(self.config['copy_on_selection'])
+        # Putty paste style
+        widget = guiget('putty_paste_style')
+        widget.set_active(self.config['putty_paste_style'])
         # Word chars
         widget = guiget('word_chars_entry')
         widget.set_text(self.config['word_chars'])
@@ -722,6 +725,11 @@
         self.config['copy_on_selection'] = widget.get_active()
         self.config.save()
 
+    def on_putty_paste_style_toggled(self, widget):
+        """Putty paste style setting changed"""
+        self.config['putty_paste_style'] = widget.get_active()
+        self.config.save()
+
     def on_cursor_blink_toggled(self, widget):
         """Cursor blink setting changed"""
         self.config['cursor_blink'] = widget.get_active()

=== modified file 'terminatorlib/terminal.py'
--- terminatorlib/terminal.py	2015-09-19 03:21:36 +0000
+++ terminatorlib/terminal.py	2015-09-22 14:53:14 +0000
@@ -77,6 +77,10 @@
 
     TARGET_TYPE_VTE = 8
 
+    LEFT_CLICK = 1
+    MIDDLE_CLICK = 2
+    RIGHT_CLICK = 3    
+
     terminator = None
     vte = None
     terminalbox = None
@@ -895,17 +899,25 @@
             # Suppress double-click behavior
             return True
 
-        if event.button == 1:
+        if self.config['putty_paste_style']:
+            btn_to_paste        = self.RIGHT_CLICK
+            btn_to_context_menu = self.MIDDLE_CLICK
+        else:
+            btn_to_paste        = self.MIDDLE_CLICK
+            btn_to_context_menu = self.RIGHT_CLICK
+
+
+        if event.button == self.LEFT_CLICK:
             # Ctrl+leftclick on a URL should open it
             if event.state & gtk.gdk.CONTROL_MASK == gtk.gdk.CONTROL_MASK:
                 url = self.check_for_url(event)
                 if url:
                     self.open_url(url, prepare=True)
-        elif event.button == 2:
+        elif event.button == btn_to_paste:
             # middleclick should paste the clipboard
             self.paste_clipboard(True)
             return(True)
-        elif event.button == 3:
+        elif event.button == btn_to_context_menu:
             # rightclick should display a context menu if Ctrl is not pressed
             if event.state & gtk.gdk.CONTROL_MASK == 0:
                 self.popup_menu(widget, event)