Merge lp:~andre-hilsendeger/terminator/rotate into lp:terminator/trunk

[Andre Hilsendeger]

Add functionality to rotate paned containers inside a terminator window.
VPaned becomes HPaned, and vice versa, while maintaining the split ratio.

Super+R: rotate clockwise
Super+Shift+R: rotate counter-clockwise

I've been missing this feature and maybe others too.

[Chris Jones (cmsj)]

review: Approve

=== modified file 'doc/terminator.1'
--- doc/terminator.1	2010-04-09 11:31:15 +0000
+++ doc/terminator.1	2012-04-04 16:03:19 +0000
@@ -77,6 +77,12 @@
 .SH "KEYBINDINGS"
 The following keybindings can be used to control Terminator:
 .TP 
+.B Super+R
+\fBR\fotate terminals clockwise.
+.TP 
+.B Super+Shift+R
+\fBR\fotate terminals counter-clockwise.
+.TP 
 .B Ctrl+Shift+O
 Split terminals H\fBo\fRrizontally.
 .TP 

=== modified file 'doc/terminator_config.5'
--- doc/terminator_config.5	2012-01-14 20:39:00 +0000
+++ doc/terminator_config.5	2012-04-04 16:03:19 +0000
@@ -171,6 +171,14 @@
 Move cursor focus to the terminal to the right.
 Default value: \fB<Alt>Right\fR
 .TP
+.B rotate_cw
+Rotate terminals clockwise.
+Default value: \fB<Super>R\fR
+.TP
+.B rotate_ccw
+Rotate terminals counter-clockwise.
+Default value: \fB<Super><Shift>R\fR
+.TP
 .B split_horiz
 Split the current terminal horizontally.
 Default value: \fB<Ctrl><Shift>O\fR

=== modified file 'terminatorlib/config.py'
--- terminatorlib/config.py	2012-01-14 20:39:00 +0000
+++ terminatorlib/config.py	2012-04-04 16:03:19 +0000
@@ -118,6 +118,8 @@
             'go_down'          : '<Alt>Down',
             'go_left'          : '<Alt>Left',
             'go_right'         : '<Alt>Right',
+            'rotate_cw'        : '<Super>r',
+            'rotate_ccw'       : '<Super><Shift>r',
             'split_horiz'      : '<Shift><Control>o',
             'split_vert'       : '<Shift><Control>e',
             'close_term'       : '<Shift><Control>w',

=== modified file 'terminatorlib/container.py'
--- terminatorlib/container.py	2011-08-22 20:05:38 +0000
+++ terminatorlib/container.py	2012-04-04 16:03:19 +0000
@@ -80,6 +80,10 @@
         """Default axis splitter. This should be implemented by subclasses"""
         raise NotImplementedError('split_axis')
 
+    def rotate(self, widget, clockwise):
+        """Rotate children in this container"""
+        raise NotImplementedError('rotate')
+
     def add(self, widget, metadata=None):
         """Add a widget to the container"""
         raise NotImplementedError('add')
@@ -265,4 +269,5 @@
         """Apply settings for our layout"""
         raise NotImplementedError('create_layout')
 
+
 # vim: set expandtab ts=4 sw=4:

=== modified file 'terminatorlib/paned.py'
--- terminatorlib/paned.py	2011-08-22 20:05:38 +0000
+++ terminatorlib/paned.py	2012-04-04 16:03:19 +0000
@@ -19,6 +19,7 @@
 
     position = None
     maker = None
+    ratio = 0.5
 
     def __init__(self):
         """Class initialiser"""
@@ -32,19 +33,6 @@
 
 
     # pylint: disable-msg=W0613
-    def set_initial_position(self, widget, event):
-        """Set the initial position of the widget"""
-        if not self.position:
-            if isinstance(self, gtk.VPaned):
-                self.position = self.allocation.height / 2
-            else:
-                self.position = self.allocation.width / 2
-
-        dbg("Paned::set_initial_position: Setting position to: %d" % self.position)
-        self.set_position(self.position)
-        self.cnxids.remove_signal(self, 'expose-event')
-
-    # pylint: disable-msg=W0613
     def split_axis(self, widget, vertical=True, cwd=None, sibling=None,
             widgetfirst=True):
         """Default axis splitter. This should be implemented by subclasses"""
@@ -76,13 +64,13 @@
     def add(self, widget, metadata=None):
         """Add a widget to the container"""
         if len(self.children) == 0:
-            self.pack1(widget, True, True)
+            self.pack1(widget, False, True)
             self.children.append(widget)
         elif len(self.children) == 1:
             if self.get_child1():
-                self.pack2(widget, True, True)
+                self.pack2(widget, False, True)
             else:
-                self.pack1(widget, True, True)
+                self.pack1(widget, False, True)
             self.children.append(widget)
         else:
             raise ValueError('Paned widgets can only have two children')
@@ -94,6 +82,7 @@
                     'split-vert': self.split_vert,
                     'title-change': self.propagate_title_change,
                     'resize-term': self.resizeterm,
+                    'size-allocate': self.new_size,
                     'zoom': top_window.zoom,
                     'tab-change': top_window.tab_change,
                     'group-all': top_window.group_all,
@@ -103,7 +92,9 @@
                     'move-tab': top_window.move_tab,
                     'maximise': [top_window.zoom, False],
                     'tab-new': [top_window.tab_new, widget],
-                    'navigate': top_window.navigate_terminal}
+                    'navigate': top_window.navigate_terminal,
+                    'rotate-cw': [top_window.rotate, True],
+                    'rotate-ccw': [top_window.rotate, False]}
 
             for signal in signals:
                 args = []
@@ -118,6 +109,7 @@
         elif isinstance(widget, gtk.Paned):
             try:
                 self.connect_child(widget, 'resize-term', self.resizeterm)
+                self.connect_child(widget, 'size-allocate', self.new_size)
             except TypeError:
                 err('Paned::add: %s has no signal resize-term' % widget)
 
@@ -260,6 +252,35 @@
         """We don't want focus, we want a Terminal to have it"""
         self.get_child1().grab_focus()
 
+    def rotate(self, widget, clockwise):
+        """Default rotation. This should be implemented by subclasses"""
+        if isinstance(self, HPaned):
+            container = VPaned()
+            reverse = not clockwise
+        else:
+            container = HPaned()
+            reverse = clockwise
+
+        container.ratio = self.ratio
+
+        self.get_parent().replace(self, container)
+
+        children = self.get_children()
+        if reverse:
+            container.ratio = 1 - container.ratio
+            children.reverse()
+
+        for child in children:
+            self.remove(child)
+            container.add(child)
+
+    def new_size(self, widget, allocation):
+        self.set_pos(int(self.ratio*self.get_length()))
+
+    def set_position(self, pos):
+        self.ratio = float(pos) / self.get_length()
+        self.set_pos(pos)
+
 class HPaned(Paned, gtk.HPaned):
     """Merge gtk.HPaned into our base Paned Container"""
     def __init__(self):
@@ -267,7 +288,12 @@
         Paned.__init__(self)
         gtk.HPaned.__init__(self)
         self.register_signals(HPaned)
-        self.cnxids.new(self, 'expose-event', self.set_initial_position)
+
+    def get_length(self):
+        return(self.allocation.width)
+
+    def set_pos(self, pos):
+        gtk.HPaned.set_position(self, pos)
 
 class VPaned(Paned, gtk.VPaned):
     """Merge gtk.VPaned into our base Paned Container"""
@@ -276,7 +302,12 @@
         Paned.__init__(self)
         gtk.VPaned.__init__(self)
         self.register_signals(VPaned)
-        self.cnxids.new(self, 'expose-event', self.set_initial_position)
+
+    def get_length(self):
+        return(self.allocation.height)
+
+    def set_pos(self, pos):
+        gtk.VPaned.set_position(self, pos)
 
 gobject.type_register(HPaned)
 gobject.type_register(VPaned)

=== modified file 'terminatorlib/prefseditor.py'
--- terminatorlib/prefseditor.py	2012-01-14 20:39:00 +0000
+++ terminatorlib/prefseditor.py	2012-04-04 16:03:19 +0000
@@ -84,6 +84,8 @@
                         'go_down'          : 'Focus the terminal below',
                         'go_left'          : 'Focus the terminal left',
                         'go_right'         : 'Focus the terminal right',
+                        'rotate_cw'        : 'Rotate terminals clockwise',
+                        'rotate_ccw'        : 'Rotate terminals counter-clockwise',
                         'split_horiz'      : 'Split horizontally',
                         'split_vert'       : 'Split vertically',
                         'close_term'       : 'Close terminal',

=== modified file 'terminatorlib/terminal.py'
--- terminatorlib/terminal.py	2012-01-14 20:39:00 +0000
+++ terminatorlib/terminal.py	2012-04-04 16:03:19 +0000
@@ -52,6 +52,8 @@
             (gobject.TYPE_STRING,)),
         'split-vert': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,
             (gobject.TYPE_STRING,)),
+        'rotate-cw': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, ()),
+        'rotate-ccw': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, ()),
         'tab-new': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,
             (gobject.TYPE_BOOLEAN, gobject.TYPE_OBJECT)),
         'tab-top-new': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, ()),
@@ -1509,6 +1511,12 @@
     def key_split_vert(self):
         self.emit('split-vert', self.terminator.pid_cwd(self.pid))
 
+    def key_rotate_cw(self):
+        self.emit('rotate-cw')
+
+    def key_rotate_ccw(self):
+        self.emit('rotate-ccw')
+
     def key_close_term(self):
         self.close()
 

=== modified file 'terminatorlib/window.py'
--- terminatorlib/window.py	2011-08-22 20:05:38 +0000
+++ terminatorlib/window.py	2012-04-04 16:03:19 +0000
@@ -479,6 +479,24 @@
         self.zoom_data = None
         self.set_property('term_zoomed', False)
 
+    def rotate(self, widget, clockwise):
+        """Rotate children in this window"""
+        maker = Factory()
+        # collect all paned children in breadth-first order
+        paned = []
+        for child in self.get_children():
+            if maker.isinstance(child, 'Paned'):
+                paned.append(child)
+        for p in paned:
+            for child in p.get_children():
+                if child not in paned and maker.isinstance(child, 'Paned'):
+                    paned.append(child)
+        # then propagate the rotation
+        for p in paned:
+            p.rotate(widget, clockwise)
+        self.show_all()
+        widget.grab_focus()
+
     def get_visible_terminals(self):
         """Walk down the widget tree to find all of the visible terminals.
         Mostly using Container::get_visible_terminals()"""