Fix Window.select_layout. Freeze 'layout' of windows

Author: tony

tmuxp/cli.py

@@ -196,7 +196,9 @@ def setup_logger(logger=None, level='INFO'):
         logger = logging.getLogger()
     if not logger.handlers:
         channel = logging.StreamHandler()
-        channel.setFormatter(log.LogFormatter())
+        channel.setFormatter(log.DebugLogFormatter())
+
+        #channel.setFormatter(log.LogFormatter())
         logger.setLevel(level)
         logger.addHandler(channel)
 
@@ -263,7 +265,11 @@ def load_workspace(config_file, args):
                 builder.session.attach_session()
         return
     except Exception as e:
+        import traceback
+
+        print(traceback.format_exc())
         logger.error(e)
+
         choice = prompt_choices(
             'Error loading workspace. (k)ill, (a)ttach, (d)etach?',
             choices=['k', 'a', 'd'],

tmuxp/window.py

@@ -110,11 +110,17 @@ def select_layout(self, layout=None):
         :param layout: string of the layout, 'even-horizontal', 'tiled', etc.
         :type layout: string
         '''
-        self.tmux(
+
+
+        proc = self.tmux(
             'select-layout',
+            '-t%s:%s' % (self.get('session_id'), self.get('window_index')),
             layout
         )
 
+        if proc.stderr:
+            raise Exception(proc.stderr)
+
     @property
     def target(self):
         return "%s:%s" % (self.session.get('session_id'), self.get('window_id'))

tmuxp/workspacebuilder.py

@@ -141,8 +141,9 @@ def build(self, session=None):
                 assert(isinstance(p, Pane))
                 p = p
 
-            if 'layout' in wconf:
-                w.select_layout(wconf['layout'])
+                if 'layout' in wconf:
+                    logger.error(wconf['layout'])
+                    w.select_layout(wconf['layout'])
 
     def iter_create_windows(self, s):
         ''' generator that creates tmux windows, yields :class:`Window` object
@@ -206,6 +207,10 @@ def iter_create_panes(self, w, wconf):
                 p = w.attached_pane()
                 assert(isinstance(p, Pane))
 
+            if 'layout' in wconf:
+                logger.error(wconf['layout'])
+                w.select_layout(wconf['layout'])
+
             for cmd in pconf['shell_command']:
                 p.send_keys(cmd)
 
@@ -227,6 +232,7 @@ def freeze(session):
         wconf = {}
         wconf['options'] = w.show_window_options()
         wconf['window_name'] = w.get('window_name')
+        wconf['layout'] = w.get('window_layout')
         wconf['panes'] = []
         logger.error(w)
         logger.error(dict(w))