Merge lp:~iq-0/terminator/terminator into lp:terminator/trunk

[Justin Ossevoort]

I wanted to add a simple feature: Always show tabs.

When I was investigating what needed to be done I came across a whole lot of conditionals around the use of a notebook in the terminator window. Instead of adding to the complexity of when a notebook could be present I thought it was better to simply always have a notebook present.

The reason a notebook is different from the HPaned and VPaned elements is that there can be at most 1. Any possible resources saved by not using a notebook are effectively used up by including more code to workaround the presense/absense of the notebook.

This code should handle old layouts well, but new layout will not include the 'Notebook' layer (which is effectively consolidated into 'Window'). It removes some duplicate logic about initialising a terminal. And finally it removes having to deal with what is in a Window (it's always a Notebook).

The new 'autohide_tabbar' option defaults to True, so it mimicks how Terminator now works, but setting it to false will always show the tabbar.

[lp:~iq-0/terminator/terminator]

1472. By <email address hidden> on 2013-10-18

Fix first terminal split on a tab

[Stephen Boddy (stephen-j-boddy)]

Hi Justin. Not sure if you're still around/interested, but perhaps you have noticed I've gotten through the outstanding merges, except for yours. Because it was a bit large and scary looking mostly.

Just to be clear up front, in principle I don't have a problem with the idea, but there are issues.

I've taken a branch and been playing with it, and I straight away notice a couple of functional problems, although it is not clear to me from a quick look at your commits what exactly is causing it.

1) Set homogeneous on, and scroll button off.
2) Exit and restart.
3) Create new tab, tabs as expected, (homogeneous, no buttons)
4) Set scroll buttons on, and click close.
5) The tabs disappear! *1
6) Create new tab
7) Tabs are back with the scroll buttons
8) Set scroll buttons off, and click close
9) Again the tabs disappear
10) Create new tab
11) Tabs are back, but they're a bit messed up, and corrupted, with text overlapping *2
12) Exit window

So things that need to be fixed before proper testing is possible:
*1 Doing anything with the tab settings seems to make the tabs disappear
*2 When turning off the scroll buttons it doesn't seem to go back to homogeneous properly.

I'm probably going to put a few comments below on the Diff.

review: Needs Fixing

[Stephen Boddy (stephen-j-boddy)]

Some comments on the diff.

Unmerged revisions

1472. By <email address hidden> on 2013-10-18

Fix first terminal split on a tab

1471. By <email address hidden> on 2013-10-15

Add option to disable autohide on tabbar

The new global config option is called 'autohide_tabbar' and defaults to True
which mimicks the current behaviour.

Instead of adding more conditionals to whether or not to use a Notebook this
patch changes Window to always have a Notebook. This simplifies a lot of code
paths and strips a layer from alle layouts that use tabs.

It could possibly be merged even further, but these changes removed the most
obvious redundant code paths and were enough to simply add 'set_show_tabs()' on
tab open/close to make it work.

=== modified file 'terminatorlib/config.py'
--- terminatorlib/config.py	2013-08-29 17:43:24 +0000
+++ terminatorlib/config.py	2013-10-18 12:39:11 +0000
@@ -85,6 +85,7 @@
             'tab_position'          : 'top',
             'close_button_on_tab'   : True,
             'hide_tabbar'           : False,
+            'autohide_tabbar'       : True,
             'scroll_tabbar'         : False,
             'homogeneous_tabbar'    : True,
             'hide_from_taskbar'     : False,

=== modified file 'terminatorlib/container.py'
--- terminatorlib/container.py	2013-09-25 22:07:01 +0000
+++ terminatorlib/container.py	2013-10-18 12:39:11 +0000
@@ -241,16 +241,22 @@
 
     def describe_layout(self, count, parent, global_layout, child_order):
         """Describe our current layout"""
-        layout = {}
         maker = Factory()
         mytype = maker.type(self)
         if not mytype:
             err('unable to detemine own type. %s' % self)
             return({})
 
-        layout['type'] = mytype
-        layout['parent'] = parent
-        layout['order'] = child_order
+        layout = None
+        if mytype == 'Notebook':
+            """Merge notebook with window"""
+            layout = global_layout[parent]
+            count = count - 1
+        else:
+            layout = {}
+            layout['type'] = mytype
+            layout['parent'] = parent
+            layout['order'] = child_order
 
         if hasattr(self, 'get_position'):
             position = self.get_position()

=== modified file 'terminatorlib/ipc.py'
--- terminatorlib/ipc.py	2012-10-30 00:11:24 +0000
+++ terminatorlib/ipc.py	2013-10-18 12:39:11 +0000
@@ -113,9 +113,8 @@
         maker = Factory()
         terminal = self.terminator.find_terminal_by_uuid(uuid)
         window = terminal.get_toplevel()
-        root_widget = window.get_children()[0]
-        if maker.isinstance(root_widget, 'Notebook'):
-            return root_widget.uuid.urn
+        notebook = window.get_child()
+        return notebook.uuid.urn
 
     @dbus.service.method(BUS_NAME)
     def get_terminal_tab_title(self, uuid):
@@ -123,9 +122,8 @@
         maker = Factory()
         terminal = self.terminator.find_terminal_by_uuid(uuid)
         window = terminal.get_toplevel()
-        root_widget = window.get_children()[0]
-        if maker.isinstance(root_widget, "Notebook"):
-            return root_widget.get_tab_label(terminal).get_label()
+        notebook = window.get_child()
+        return notebook.get_tab_label(terminal).get_label()
 
 def with_proxy(func):
     """Decorator function to connect to the session dbus bus"""

=== modified file 'terminatorlib/notebook.py'
--- terminatorlib/notebook.py	2013-09-04 22:50:12 +0000
+++ terminatorlib/notebook.py	2013-10-18 12:39:11 +0000
@@ -31,12 +31,6 @@
         gobject.type_register(Notebook)
         self.register_signals(Notebook)
         self.configure()
-
-        child = window.get_child()
-        window.remove(child)
-        window.add(self)
-        self.newtab(widget=child)
-
         self.show_all()
 
     def configure(self):
@@ -51,7 +45,7 @@
         if self.config['tab_position'] == 'hidden' or self.config['hide_tabbar']:
             self.set_show_tabs(False)
         else:
-            self.set_show_tabs(True)
+            self.set_show_tabs(not self.config['autohide_tabbar'])
             pos = getattr(gtk, 'POS_%s' % self.config['tab_position'].upper())
             self.set_tab_pos(pos)
 
@@ -82,8 +76,7 @@
             return
 
         children = layout['children']
-        if len(children) <= 1:
-            #Notebooks should have two or more children
+        if len(children) == 0:
             err('incorrect number of children for Notebook: %s' % layout)
             return
 
@@ -142,6 +135,8 @@
         else:
             container = maker.make('hpaned')
 
+        self.get_toplevel().set_pos_by_ratio = True
+
         if not sibling:
             sibling = maker.make('terminal')
             sibling.set_cwd(cwd)
@@ -167,6 +162,10 @@
         self.show_all()
         terminal.grab_focus()
 
+        while gtk.events_pending():
+            gtk.main_iteration_do(False)
+        self.get_toplevel().set_pos_by_ratio = False
+
     def add(self, widget, metadata=None):
         """Add a widget to the container"""
         dbg('adding a new tab')
@@ -266,9 +265,12 @@
         self.set_tab_label_packing(widget, not self.config['scroll_tabbar'],
                                    not self.config['scroll_tabbar'],
                                    gtk.PACK_START)
-
         self.set_tab_reorderable(widget, True)
         self.set_current_page(tabpos)
+
+        if self.config['autohide_tabbar'] and self.get_n_pages() > 1 and not self.get_show_tabs():
+            self.set_show_tabs(True)
+
         self.show_all()
         if maker.isinstance(widget, 'Terminal'):
             widget.grab_focus()
@@ -383,19 +385,9 @@
             if not page:
                 dbg('Removing empty page: %d' % numpages)
                 self.remove_page(numpages)
-
-        if self.get_n_pages() == 1:
-            dbg('Last page, removing self')
-            child = self.get_nth_page(0)
-            self.remove_page(0)
-            parent = self.get_parent()
-            parent.remove(self)
-            self.cnxids.remove_all()
-            parent.add(child)
-            del(self)
-            # Find the last terminal in the new parent and give it focus
-            terms = parent.get_visible_terminals()
-            terms.keys()[-1].grab_focus()
+        
+        if self.config['autohide_tabbar'] and self.get_n_pages() < 2 and self.get_show_tabs():
+            self.set_show_tabs(False)
 
 class TabLabel(gtk.HBox):
     """Class implementing a label widget for Notebook tabs"""

=== modified file 'terminatorlib/paned.py'
--- terminatorlib/paned.py	2013-09-02 14:54:07 +0000
+++ terminatorlib/paned.py	2013-10-18 12:39:11 +0000
@@ -39,10 +39,11 @@
         order = None
 
         self.remove(widget)
+        maker = Factory()
         if vertical:
-            container = VPaned()
+            container = maker.make('vpaned')
         else:
-            container = HPaned()
+            container = maker.make('hpaned')
         
         self.get_toplevel().set_pos_by_ratio = True
 

=== modified file 'terminatorlib/terminator.py'
--- terminatorlib/terminator.py	2013-09-04 20:59:27 +0000
+++ terminatorlib/terminator.py	2013-10-18 12:39:11 +0000
@@ -87,11 +87,11 @@
         try:
             import gnome
             import gnome.ui
-            self.gnome_program = gnome.init(APP_NAME, APP_VERSION)
             self.gnome_client = gnome.ui.master_client()
             self.gnome_client.connect_to_session_manager()
             self.gnome_client.connect('save-yourself', self.save_yourself)
             self.gnome_client.connect('die', self.die)
+            self.gnome_program = gnome.init(APP_NAME, APP_VERSION)
             dbg('GNOME session support enabled and registered')
         except (ImportError, AttributeError):
             self.gnome_client = False
@@ -187,15 +187,9 @@
     def new_window(self, cwd=None):
         """Create a window with a Terminal in it"""
         maker = Factory()
-        window = maker.make('Window')
-        terminal = maker.make('Terminal')
-        if cwd:
-            terminal.set_cwd(cwd)
-        window.add(terminal)
+        window = maker.make('Window', cwd=cwd)
         window.show(True)
-        terminal.spawn_child()
-
-        return(window, terminal)
+        return window
 
     def create_layout(self, layoutname):
         """Create all the parts necessary to satisfy the specified layout"""
@@ -261,7 +255,7 @@
                 err('invalid layout format. %s' % layout)
                 raise(ValueError)
             dbg('Creating a window')
-            window, terminal = self.new_window()
+            window = self.new_window()
             if layout[windef].has_key('position'):
                 parts = layout[windef]['position'].split(':')
                 if len(parts) == 2:
@@ -318,9 +312,7 @@
         # Update tab position if appropriate
         maker = Factory()
         for window in self.windows:
-            child = window.get_child()
-            if maker.isinstance(child, 'Notebook'):
-                child.configure()
+            window.configure()
 
     def create_group(self, name):
         """Create a new group"""

=== modified file 'terminatorlib/window.py'
--- terminatorlib/window.py	2013-09-04 21:02:24 +0000
+++ terminatorlib/window.py	2013-10-18 12:39:11 +0000
@@ -50,7 +50,7 @@
                             gobject.PARAM_READWRITE)
     }
 
-    def __init__(self):
+    def __init__(self, cwd=None):
         """Class initialiser"""
         self.terminator = Terminator()
         self.terminator.register_window(self)
@@ -91,6 +91,11 @@
         self.apply_icon(icon_to_apply)
         self.pending_set_rough_geometry_hint = False
 
+        maker = Factory()
+        notebook = maker.make('Notebook', window=self)
+        gtk.Window.add(self, notebook)
+        notebook.newtab(cwd=cwd)
+
     def do_get_property(self, prop):
         """Handle gobject getting a property"""
         if prop.name in ['term_zoomed', 'term-zoomed']:
@@ -241,11 +246,6 @@
         self.set_urgency_hint(False)
         # FIXME: Cause the terminal titlebars to update here
 
-    def is_child_notebook(self):
-        """Returns True if this Window's child is a Notebook"""
-        maker = Factory()
-        return(maker.isinstance(self.get_child(), 'Notebook'))
-
     def tab_new(self, widget=None, debugtab=False, _param1=None, _param2=None):
         """Make a new tab"""
         cwd = None
@@ -259,10 +259,6 @@
             cwd = widget.get_cwd()
             profile = widget.get_profile()
 
-        maker = Factory()
-        if not self.is_child_notebook():
-            dbg('Making a new Notebook')
-            notebook = maker.make('Notebook', window=self)
         return self.get_child().newtab(debugtab, cwd=cwd, profile=profile)
 
     def on_delete_event(self, window, event, data=None):
@@ -397,32 +393,8 @@
 
     def add(self, widget, metadata=None):
         """Add a widget to the window by way of gtk.Window.add()"""
-        maker = Factory()
-        gtk.Window.add(self, widget)
-        if maker.isinstance(widget, 'Terminal'):
-            signals = {'close-term': self.closeterm,
-                       'title-change': self.title.set_title,
-                       'split-horiz': self.split_horiz,
-                       'split-vert': self.split_vert,
-                       'unzoom': self.unzoom,
-                       'tab-change': self.tab_change,
-                       'group-all': self.group_all,
-                       'ungroup-all': self.ungroup_all,
-                       'group-tab': self.group_tab,
-                       'ungroup-tab': self.ungroup_tab,
-                       'move-tab': self.move_tab,
-                       'tab-new': [self.tab_new, widget],
-                       'navigate': self.navigate_terminal}
-
-            for signal in signals:
-                args = []
-                handler = signals[signal]
-                if isinstance(handler, list):
-                    args = handler[1:]
-                    handler = handler[0]
-                self.connect_child(widget, signal, handler, *args)
-
-            widget.grab_focus()
+        notebook = self.get_child()
+        notebook.add(widget)
 
     def remove(self, widget):
         """Remove our child widget by way of gtk.Window.remove()"""
@@ -430,6 +402,10 @@
         self.disconnect_child(widget)
         return(True)
 
+    def configure(self):
+        notebook = self.get_child()
+        notebook.configure()
+
     def get_children(self):
         """Return a single list of our child"""
         children = []
@@ -562,16 +538,14 @@
         if not hasattr(self, 'cached_maker'):
             self.cached_maker = Factory()
         maker = self.cached_maker
-        child = self.get_child()
+
+        notebook = self.get_child()
+        pagenum = notebook.get_current_page()
+        child = notebook.get_nth_page(pagenum)
 
         if not child:
             return([])
 
-        # If our child is a Notebook, reset to work from its visible child
-        if maker.isinstance(child, 'Notebook'):
-            pagenum = child.get_current_page()
-            child = child.get_nth_page(pagenum)
-
         if maker.isinstance(child, 'Container'):
             terminals.update(child.get_visible_terminals())
         elif maker.isinstance(child, 'Terminal'):
@@ -657,10 +631,6 @@
         maker = Factory()
         child = self.get_child()
 
-        if not maker.isinstance(child, 'Notebook'):
-            dbg('child is not a notebook, nothing to change to')
-            return
-
         if num == -1:
             # Go to the next tab
             cur = child.get_current_page()
@@ -702,10 +672,6 @@
         maker = Factory()
         notebook = self.get_child()
 
-        if not maker.isinstance(notebook, 'Notebook'):
-            dbg('not in a notebook, refusing to group tab')
-            return
-
         pagenum = notebook.get_current_page()
         while True:
             group = _('Tab %d') % pagenum
@@ -720,10 +686,6 @@
         maker = Factory()
         notebook = self.get_child()
 
-        if not maker.isinstance(notebook, 'Notebook'):
-            dbg('note in a notebook, refusing to ungroup tab')
-            return
-        
         for terminal in self.get_visible_terminals():
             terminal.set_group(None, None)
 
@@ -732,10 +694,6 @@
         maker = Factory()
         notebook = self.get_child()
 
-        if not maker.isinstance(notebook, 'Notebook'):
-            dbg('not in a notebook, refusing to move tab %s' % direction)
-            return
-
         dbg('moving tab %s' % direction)
         numpages = notebook.get_n_pages()
         page = notebook.get_current_page()
@@ -834,32 +792,27 @@
         if not layout.has_key('children'):
             err('layout describes no children: %s' % layout)
             return
-        children = layout['children']
-        if len(children) != 1:
-            # We're a Window, we can only have one child
+
+        if len(layout['children']) == 1:
+            child = layout['children'].values()[0]
+            if child['type'] == 'Notebook':
+                 if not child.has_key('children'):
+                     err('layout describes no children: %s' % child)
+                     return
+                 layout = child
+
+        if len(layout['children']) == 0:
+            # We're a Window, we should have at least 1 child
             err('incorrect number of children for Window: %s' % layout)
             return
 
-        child = children[children.keys()[0]]
-        terminal = self.get_children()[0]
-        dbg('Making a child of type: %s' % child['type'])
-        if child['type'] == 'VPaned':
-            self.split_axis(terminal, True)
-        elif child['type'] == 'HPaned':
-            self.split_axis(terminal, False)
-        elif child['type'] == 'Notebook':
+        i = 1
+        while i < len(layout['children']):
             self.tab_new()
-            i = 2
-            while i < len(child['children']):
-                self.tab_new()
-                i = i + 1
-        elif child['type'] == 'Terminal':
-            pass
-        else:
-            err('unknown child type: %s' % child['type'])
-            return
+            i = i + 1
 
-        self.get_children()[0].create_layout(child)
+        notebook = self.get_child()
+        notebook.create_layout(layout)
 
 class WindowTitle(object):
     """Class to handle the setting of the window title"""