Merge lp:~pas-anddev/terminator/terminator-fixes into lp:terminator/trunk

[Pavel Khlebovich]

= Bug 805870 =

modified: window.py
This is the workaround for focus stealing prevention found in Guake and deskbar-applet.

= Bug 806424 =

modified: config.py, optionparser.py
Introduces commandline option --config (with -c as the alias) which makes it possible to use alternative configuration file.

While the issue is better solved by making Config instance a singleton, the fix is a bit dirty, but very noninvasive. It introduces global variable "options" in optionparser, but IMO it's not an issue since commandline arguments are never changed in runtime and variable's visibility is limited to the module.

=== modified file 'terminatorlib/config.py'
--- terminatorlib/config.py	2012-01-14 20:39:00 +0000
+++ terminatorlib/config.py	2012-03-30 21:48:19 +0000
@@ -421,6 +421,8 @@
         Borg.__init__(self, self.__class__.__name__)
 
         self.prepare_attributes()
+        import optionparse
+        self.command_line_options = optionparse.options
         self.load()
 
     def prepare_attributes(self):
@@ -520,7 +522,10 @@
             dbg('ConfigBase::load: config already loaded')
             return
 
-        filename = os.path.join(get_config_dir(), 'config')
+        if not self.command_line_options.config:
+            self.command_line_options.config = os.path.join(get_config_dir(), 'config')
+        filename = self.command_line_options.config
+
         dbg('looking for config file: %s' % filename)
         try:
             configfile = open(filename, 'r')
@@ -616,7 +621,7 @@
         if not os.path.isdir(config_dir):
             os.makedirs(config_dir)
         try:
-            parser.write(open(os.path.join(config_dir, 'config'), 'w'))
+            parser.write(open(self.command_line_options.config, 'w'))
         except Exception, ex:
             err('ConfigBase::save: Unable to save config: %s' % ex)
 
 
=== modified file 'terminatorlib/optionparse.py'
--- terminatorlib/optionparse.py	2010-09-04 09:03:57 +0000
+++ terminatorlib/optionparse.py	2012-03-30 21:48:19 +0000
@@ -26,6 +26,8 @@
 import version
 from translation import _
 
+options = None
+
 def execute_cb(option, opt, value, lparser):
     """Callback for use in parsing execute options"""
     assert value is None
@@ -40,7 +42,6 @@
     """Parse the command line options"""
     usage = "usage: %prog [options]"
 
-    configobj = config.Config()
     parser = OptionParser(usage)
 
     parser.add_option('-v', '--version', action='store_true', dest='version',
@@ -55,6 +56,8 @@
             help=_('Hide the window at startup'))
     parser.add_option('-T', '--title', dest='forcedtitle', help=_('Specify a \
 title for the window'))
+    parser.add_option('-c', '--config', dest='config', help=_('Specify a \
+config file'))
     parser.add_option('--geometry', dest='geometry', type='string', help=_('Set \
 the preferred size and position of the window (see X man page)'))
     parser.add_option('-e', '--command', dest='command', help=_('Specify a \
@@ -82,6 +85,7 @@
         parser.add_option(item, dest='dummy', action='store',
                 help=SUPPRESS_HELP)
 
+    global options
     (options, args) = parser.parse_args()
     if len(args) != 0:
         parser.error('Additional unexpected arguments found: %s' % args)
@@ -118,6 +122,7 @@
     if options.layout is None:
         options.layout = 'default'
 
+    configobj = config.Config()
     if options.profile and options.profile not in configobj.list_profiles():
         options.profile = None
 
 
=== modified file 'terminatorlib/window.py'
--- terminatorlib/window.py	2011-08-22 20:05:38 +0000
+++ terminatorlib/window.py	2012-03-30 21:48:19 +0000
@@ -273,6 +273,12 @@
             if self.position:
                 self.move(self.position[0], self.position[1])
             self.show()
+            self.grab_focus()
+            try:
+                t = gtk.gdk.x11_get_server_time(self.window)
+            except AttributeError:
+                t = 0
+            self.window.focus(t)
         else:
             self.position = self.get_position()
             self.hidefunc()