Merge pull request #661 from vssdeo/654-Plugin-Submission-SaveLastSessionLayout-Uses-Layout-to-Auto-Save-Last

[bug 654] - Plugin Submission : SaveLastSessionLayout Uses Layout to …

terminatorlib/plugins/save_last_session_layout.py

@@ -27,7 +27,7 @@ class SaveLastSessionLayout(plugin.Plugin):
       dbg("SaveLastSessionLayout Init")
       self.connect_signals()
 
-    #not used, but capability
+    #not used, but capability can be used to load automatically
     def load_session_layout(self, debugtab=False, widget=None, cwd=None, metadata=None, profile=None):
       dbg("SaveLastSessionLayout load layout")
       terminator = Terminator()
@@ -38,7 +38,7 @@ class SaveLastSessionLayout(plugin.Plugin):
       config = Config()
       terminator = Terminator()
       current_layout = terminator.describe_layout(save_cwd = True)
-      dbg("SaveLastSessionLayout: save layout(%s)" % str(current_layout))
+      dbg("SaveLastSessionLayout: save layout(%s)" % current_layout)
       res = config.replace_layout("SaveLastSessionLayout", current_layout)
       if (not res):
         r = config.add_layout("SaveLastSessionLayout", current_layout)
@@ -51,7 +51,14 @@ class SaveLastSessionLayout(plugin.Plugin):
         for term in Terminator().terminals:
             dbg("SaveLastSessionLayout connect_signals to term num:(%d)" % n)
             n = n + 1
-            term.connect('close-term', self.close, None)
+            # event close-term works, and does not require an additional
+            # event but has a race condition when
+            # there is only one terminal we are unable to get the
+            # describe_layout section
+
+            #term.connect('close-term', self.close, None)
+            term.connect('pre-close-term', self.close, None)
+
             #Can connect signal from terminal
             #term.connect('load-layout', self.load_session_layout, None)
 
@@ -60,10 +67,3 @@ class SaveLastSessionLayout(plugin.Plugin):
             self.emit_close_count = self.emit_close_count + 1
             self.save_session_layout("", "")
 
-    def connect_signals_delayed(self, term, event, arg1 = None):
-        def add_watch(self):
-            self.connect_signals()
-            return False
-        GObject.idle_add(add_watch, self)
-        return True
-

terminatorlib/terminal.py

@@ -36,6 +36,7 @@ class Terminal(Gtk.VBox):
     """Class implementing the VTE widget and its wrappings"""
 
     __gsignals__ = {
+        'pre-close-term': (GObject.SignalFlags.RUN_LAST, None, ()),
         'close-term': (GObject.SignalFlags.RUN_LAST, None, ()),
         'title-change': (GObject.SignalFlags.RUN_LAST, None,
             (GObject.TYPE_STRING,)),

terminatorlib/window.py

@@ -300,6 +300,14 @@ class Window(Container, Gtk.Window):
         """Handle window destruction"""
         dbg('destroying self')
         for terminal in self.get_terminals():
+            # Only for race condition, while closing a window with a single
+            # terminal. Could be useful in other scenarios.
+            # We can't get [[terminal1]] section using
+            # terminal.describe_layout() while terminal is closing.
+            # Also while receiving event on Plugins Side, if connected to term
+            # we can't use close-term as it starts to close terminal, so we
+            # send a pre-close-term before Example: Plugin SaveLastSessionLayout
+            terminal.emit('pre-close-term')
             terminal.close()
         self.cnxids.remove_all()
         self.terminator.deregister_window(self)