Merge lp:~waldner/terminator/fast-resize into lp:terminator/gtk3

[Waldner]

Add new option for fast-resizing. Update glade and man page.

Add new option for fast-resizing. Update glade and man page.
Discussion at https://bugs.launchpad.net/terminator/+bug/1695935.

[Waldner (waldner)]

Any news on this?

[Bryce Harrington (bryce)]

> Any news on this?

I would recommend not to use the shift+arrow key combos. I suspect the reason they're unused is because for some people and some keyboards that combo is hit a lot accidentally. If alt+ctrl+shift+arrow is unused by anything, that might be a safer default.

As I think Stephen already mentioned, it's hard to find unused key combos for Terminator, so wise to avoid adding new ones unless absolutely necessary.

If the need for this patch is primarily due to need for configuring your terminal layout on startup, it may be overall better to look at creating a profile with pre-defined terminal window layouts. I can explain how to do this if that's your use case.

In the first comment of the bug report, the idea was floated to make the resize amount for ctrl+shift+arrow configurable. Would that satisfy your requirements? If so, it may be a way to avoid using up key combos.

[Waldner (waldner)]

After a bit of experimenting, I settled on the separate keyboard shortcut for fast resize because I wanted to be able to alternate regular (slow) and fast resizing as needed, depending on what I'm doing.
Also, using a preset configuration to be applied at terminal startup doesn't work for me, since I keep splitting/removing windows all the time and the need to do a fast resize at a given moment is dictated by the task I'm actually performing (eg, I need to quickly resize to better see a long log line, but then I resize back just as quickly).

Shift+arrow keys is what works for me, and as far as I can see it's unused in terminator (as per terminatorlib/config.py). I can certainly change the default to alt+ctrl+shift+arrow (also unused), if that helps to have a better change of merging.

[lp:~waldner/terminator/fast-resize]

1796. By Waldner on 2018-08-11

Safer default keyboard shortcuts for fast resize function, as per discussion
at https://code.launchpad.net/~waldner/terminator/fast-resize/+merge/341534

[Waldner (waldner)]

FWIW, here's the safer default of <Ctrl><Shift><Alt><arrow> implemented.

[Waldner (waldner)]

Is there anything else that should be done to get this in shape?

Unmerged revisions

1796. By Waldner on 2018-08-11

Safer default keyboard shortcuts for fast resize function, as per discussion
at https://code.launchpad.net/~waldner/terminator/fast-resize/+merge/341534

1795. By Waldner on 2018-03-16

New "fast resize" functionality, updated glade and man page.

=== modified file 'doc/terminator_config.5'
--- doc/terminator_config.5	2016-12-06 01:01:48 +0000
+++ doc/terminator_config.5	2018-08-11 15:07:16 +0000
@@ -78,6 +78,10 @@
 If set to True, the tab bar will not fill the width of the window. The titlebars of the tabs will only take as much space as is necessary for the text they contain. Except, that is, if the tabs no longer fit the width of the window - in that case scroll buttons will appear to move through the tabs.
 Default value: \fBFalse\fR
 .TP
+.B resize_multiplier \fR(integer)
+When resizing the terminal using "fast" mode (eg with Shift + arrow keys), how many rows or column to move at a time. Setting this to a higher value is useful especially for horizontal resizing on very wide screens. See \fBresize_up_fast\fR, \fBresize_down_fast\fR, \fBresize_left_fast\fR, \fBresize_right_fast\fR.
+Default value: \fB1\fR
+.TP
 .B try_posix_regexp \fR(boolean)
 If set to True, URL matching regexps will try to use POSIX style first, and fall back on GNU style on failure.  If you are on Linux but URL matches don't work, try setting this to True.  If you are not on Linux, but you get VTE warnings on startup saying "Error compiling regular expression", set this to False to silence them (they are otherwise harmless).
 Default value: \fBFalse\fR on Linux, \fBTrue\fR otherwise.
@@ -244,18 +248,34 @@
 Move the parent dragbar upwards.
 Default value: \fB<Ctrl><Shift>Up\fR
 .TP
+.B resize_up_fast
+Move the parent dragbar upwards (\fBresize_multiplier\fR rows at a time).
+Default value: \fB<Ctrl><Shift><Alt>Up\fR
+.TP
 .B resize_down
 Move the parent dragbar downwards.
 Default value: \fB<Ctrl><Shift>Down\fR
 .TP
+.B resize_down_fast
+Move the parent dragbar downwards (\fBresize_multiplier\fR rows at a time).
+Default value: \fB<Ctrl><Shift><Alt>Down\fR
+.TP
 .B resize_left
 Move the parent dragbar left.
 Default value: \fB<Ctrl><Shift>Left\fR
 .TP
+.B resize_left_fast
+Move the parent dragbar left (\fBresize_multiplier\fR columns at a time).
+Default value: \fB<Ctrl><Shift><Alt>Left\fR
+.TP
 .B resize_right
 Move the parent dragbar right.
 Default value: \fB<Ctrl><Shift>Right\fR
 .TP
+.B resize_right_fast
+Move the parent dragbar right (\fBresize_multiplier\fR columns at a time).
+Default value: \fB<Ctrl><Shift><Alt>Right\fR
+.TP
 .B move_tab_right
 Swap the current tab with the one to its right.
 Default value: \fB<Ctrl><Shift>Page_Down\fR

=== modified file 'terminatorlib/config.py'
--- terminatorlib/config.py	2017-02-01 09:03:29 +0000
+++ terminatorlib/config.py	2018-08-11 15:07:16 +0000
@@ -102,6 +102,7 @@
             'sticky'                : False,
             'use_custom_url_handler': False,
             'custom_url_handler'    : '',
+            'resize_multiplier'     : 1,
             'disable_real_transparency' : False,
             'title_hide_sizetext'   : False,
             'title_transmit_fg_color' : '#ffffff',
@@ -154,6 +155,10 @@
             'resize_down'      : '<Shift><Control>Down',
             'resize_left'      : '<Shift><Control>Left',
             'resize_right'     : '<Shift><Control>Right',
+            'resize_up_fast'   : '<Ctrl><Shift><Alt>Up',
+            'resize_down_fast' : '<Ctrl><Shift><Alt>Down',
+            'resize_left_fast' : '<Ctrl><Shift><Alt>Left',
+            'resize_right_fast': '<Ctrl><Shift><Alt>Right',
             'move_tab_right'   : '<Shift><Control>Page_Down',
             'move_tab_left'    : '<Shift><Control>Page_Up',
             'toggle_zoom'      : '<Shift><Control>x',

=== modified file 'terminatorlib/container.py'
--- terminatorlib/container.py	2017-02-11 18:59:31 +0000
+++ terminatorlib/container.py	2018-08-11 15:07:16 +0000
@@ -131,7 +131,7 @@
         self.terminator.group_hoover()
         return(True)
 
-    def resizeterm(self, widget, keyname):
+    def resizeterm(self, widget, keyname, fast = False):
         """Handle a keyboard event requesting a terminal resize"""
         raise NotImplementedError('resizeterm')
 

=== modified file 'terminatorlib/notebook.py'
--- terminatorlib/notebook.py	2017-02-13 16:30:37 +0000
+++ terminatorlib/notebook.py	2018-08-11 15:07:16 +0000
@@ -376,7 +376,7 @@
             err('Notebook::closetab: child is unknown type %s' % child)
             return
 
-    def resizeterm(self, widget, keyname):
+    def resizeterm(self, widget, keyname, fast = False):
         """Handle a keyboard event requesting a terminal resize"""
         raise NotImplementedError('resizeterm')
 

=== modified file 'terminatorlib/paned.py'
--- terminatorlib/paned.py	2017-02-13 16:30:37 +0000
+++ terminatorlib/paned.py	2018-08-11 15:07:16 +0000
@@ -31,7 +31,7 @@
         self.signals.append({'name': 'resize-term', 
                              'flags': GObject.SignalFlags.RUN_LAST,
                              'return_type': None, 
-                             'param_types': (GObject.TYPE_STRING,)})
+                             'param_types': (GObject.TYPE_STRING, GObject.TYPE_BOOLEAN)})
 
 
     # pylint: disable-msg=W0613
@@ -323,16 +323,22 @@
             parent.replace(self, child)
             del(self)
 
-    def resizeterm(self, widget, keyname):
+    def resizeterm(self, widget, keyname, fast = False):
         """Handle a keyboard event requesting a terminal resize"""
+
+        if fast:
+            multiplier = self.config['resize_multiplier']
+        else:
+            multiplier = 1
+
         if keyname in ['up', 'down'] and isinstance(self, Gtk.VPaned):
             # This is a key we can handle
             position = self.get_position()
 
             if self.maker.isinstance(widget, 'Terminal'):
-                fontheight = widget.vte.get_char_height()
+                fontheight = widget.vte.get_char_height() * multiplier
             else:
-                fontheight = 10
+                fontheight = 10 * multiplier
 
             if keyname == 'up':
                 self.set_position(position - fontheight)
@@ -343,9 +349,9 @@
             position = self.get_position()
 
             if self.maker.isinstance(widget, 'Terminal'):
-                fontwidth = widget.vte.get_char_width()
+                fontwidth = widget.vte.get_char_width() * multiplier
             else:
-                fontwidth = 10
+                fontwidth = 10 * multiplier
 
             if keyname == 'left':
                 self.set_position(position - fontwidth)
@@ -353,7 +359,7 @@
                 self.set_position(position + fontwidth)
         else:
             # This is not a key we can handle
-            self.emit('resize-term', keyname)
+            self.emit('resize-term', keyname, fast)
 
     def create_layout(self, layout):
         """Apply layout configuration"""

=== modified file 'terminatorlib/preferences.glade'
--- terminatorlib/preferences.glade	2016-12-13 21:08:02 +0000
+++ terminatorlib/preferences.glade	2018-08-11 15:07:16 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.2 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkListStore" id="BackspaceKeyListStore">
@@ -348,6 +348,11 @@
     <property name="step_increment">0.10000000000000001</property>
     <property name="page_increment">0.20000000000000001</property>
   </object>
+  <object class="GtkAdjustment" id="adjustment8">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkAdjustment" id="background_darkness_scale">
     <property name="upper">1</property>
     <property name="step_increment">0.10000000000000001</property>
@@ -1014,6 +1019,55 @@
                                     <property name="top_attach">0</property>
                                   </packing>
                                 </child>
+                                <child>
+                                  <object class="GtkLabel" id="label34">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="tooltip_text" translatable="yes">How many rows/columns at a time to resize with ctrl+shift+alt+arrow</property>
+                                    <property name="label" translatable="yes">Resize multiplier: </property>
+                                    <property name="xalign">0</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">3</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkScale" id="resize_multiplier_scale">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="hexpand">True</property>
+                                    <property name="adjustment">adjustment8</property>
+                                    <property name="digits">3</property>
+                                    <property name="draw_value">False</property>
+                                    <signal name="value-changed" handler="on_resize_multiplier_changed" swapped="no"/>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">2</property>
+                                    <property name="top_attach">3</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="resize_multiplier_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="halign">end</property>
+                                    <property name="label" translatable="yes">1</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="top_attach">3</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
                               </object>
                               <packing>
                                 <property name="expand">True</property>
@@ -1308,8 +1362,8 @@
                                             <property name="use_action_appearance">False</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="receives_default">True</property>
                                             <property name="focus_on_click">False</property>
+                                            <property name="receives_default">True</property>
                                             <property name="font">Sans 12</property>
                                             <property name="title" translatable="yes">Choose A Titlebar Font</property>
                                             <property name="use_font">True</property>
@@ -1535,8 +1589,8 @@
                                         <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
                                         <property name="focus_on_click">False</property>
+                                        <property name="receives_default">True</property>
                                         <property name="font">Sans 12</property>
                                         <property name="title" translatable="yes">Choose A Terminal Font</property>
                                         <property name="use_font">True</property>
@@ -1667,6 +1721,26 @@
                                 <property name="position">6</property>
                               </packing>
                             </child>
+                            <child>
+                              <object class="GtkBox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">7</property>
+                              </packing>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -3875,6 +3949,9 @@
         </child>
       </object>
     </child>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
   </object>
   <object class="GtkSizeGroup" id="sizegroup1">
     <widgets>

=== modified file 'terminatorlib/prefseditor.py'
--- terminatorlib/prefseditor.py	2017-06-24 02:02:38 +0000
+++ terminatorlib/prefseditor.py	2018-08-11 15:07:16 +0000
@@ -127,6 +127,10 @@
                         'resize_down'      : _('Resize the terminal down'),
                         'resize_left'      : _('Resize the terminal left'),
                         'resize_right'     : _('Resize the terminal right'),
+                        'resize_up_fast'   : _('Resize the terminal up (faster)'),
+                        'resize_down_fast' : _('Resize the terminal down (faster)'),
+                        'resize_left_fast' : _('Resize the terminal left (faster)'),
+                        'resize_right_fast': _('Resize the terminal right (faster)'),
                         'move_tab_right'   : _('Move the tab right'),
                         'move_tab_left'    : _('Move the tab left'),
                         'toggle_zoom'      : _('Maximize terminal'),
@@ -223,7 +227,6 @@
         """Update the preferences window with all the configuration from
         Config()"""
         guiget = self.builder.get_object
-
         ## Global tab
         # Mouse focus
         focus = self.config['focus']
@@ -292,6 +295,11 @@
         # homogeneous_tabbar
         widget = guiget('homogeneouscheck')
         widget.set_active(self.config['homogeneous_tabbar'])
+        # resize_multiplier
+        widget = guiget('resize_multiplier_scale')
+        widget.set_value(int(self.config['resize_multiplier']))
+        widget = guiget('resize_multiplier_label')
+        widget.set_text('%d' % (int(self.config['resize_multiplier'])))
         # DBus Server
         widget = guiget('dbuscheck')
         widget.set_active(self.config['dbus'])
@@ -700,6 +708,19 @@
         self.config['borderless'] = not widget.get_active()
         self.config.save()
 
+    def on_resize_multiplier_changed(self, widget):
+        """resize_multiplier setting changed"""
+        value = widget.get_value()
+        if value < 1:
+          value = 1
+        if value > 100:
+          value = 100
+        self.config['resize_multiplier'] = int(value)
+        self.config.save()
+        guiget = self.builder.get_object
+        label_widget = guiget('resize_multiplier_label')
+        label_widget.set_text('%d' % (int(value)))
+
     def on_extrastylingcheck_toggled(self, widget):
         """Extra styling setting changed"""
         self.config['extra_styling'] = widget.get_active()

=== modified file 'terminatorlib/terminal.py'
--- terminatorlib/terminal.py	2017-06-24 02:02:38 +0000
+++ terminatorlib/terminal.py	2018-08-11 15:07:16 +0000
@@ -56,7 +56,7 @@
         'maximise': (GObject.SignalFlags.RUN_LAST, None, ()),
         'unzoom': (GObject.SignalFlags.RUN_LAST, None, ()),
         'resize-term': (GObject.SignalFlags.RUN_LAST, None,
-            (GObject.TYPE_STRING,)),
+            (GObject.TYPE_STRING, GObject.TYPE_BOOLEAN)),
         'navigate': (GObject.SignalFlags.RUN_LAST, None,
             (GObject.TYPE_STRING,)),
         'tab-change': (GObject.SignalFlags.RUN_LAST, None,
@@ -1742,16 +1742,28 @@
         self.close()
 
     def key_resize_up(self):
-        self.emit('resize-term', 'up')
+        self.emit('resize-term', 'up', False)
 
     def key_resize_down(self):
-        self.emit('resize-term', 'down')
+        self.emit('resize-term', 'down', False)
 
     def key_resize_left(self):
-        self.emit('resize-term', 'left')
+        self.emit('resize-term', 'left', False)
 
     def key_resize_right(self):
-        self.emit('resize-term', 'right')
+        self.emit('resize-term', 'right', False)
+
+    def key_resize_up_fast(self):
+        self.emit('resize-term', 'up', True)
+
+    def key_resize_down_fast(self):
+        self.emit('resize-term', 'down', True)
+
+    def key_resize_left_fast(self):
+        self.emit('resize-term', 'left', True)
+
+    def key_resize_right_fast(self):
+        self.emit('resize-term', 'right', True)
 
     def key_move_tab_right(self):
         self.emit('move-tab', 'right')