#566:

* pass command line options to all "ClientExtras"
* add --no-swap-keys command line option for osx

git-svn-id: https://xpra.org/svn/Xpra/trunk@6427 3bb7dfac-3a0b-4e04-842a-767bc560f471

src/xpra/client/ui_client_base.py

@@ -291,7 +291,7 @@ def show_tray(*args):
                 log("failed to set pulseaudio audio tagging: %s", e)
 
         if ClientExtras is not None:
-            self.client_extras = ClientExtras(self)
+            self.client_extras = ClientExtras(self, opts)
 
         if opts.border:
             self.parse_border(opts.border)

src/xpra/platform/darwin/gui.py

@@ -97,10 +97,16 @@ def handleWakeNotification_(self, aNotification):
 
 
 class ClientExtras(object):
-    def __init__(self, client, blocking=False):
+    def __init__(self, client, opts, blocking=False):
+        log("ClientExtras.__init__(%s, %s, %s) swap_keys=%s", client, opts, blocking, opts.swap_keys)
         self.client = client
         self.blocking = blocking
         self.setup_event_loop()
+        if opts and client:
+            log("setting swap_keys=%s using %s", opts.swap_keys, client.keyboard_helper)
+            if client.keyboard_helper and client.keyboard_helper.keyboard:
+                log("%s.swap_keys=%s", client.keyboard_helper.keyboard, opts.swap_keys)
+                client.keyboard_helper.keyboard.swap_keys = opts.swap_keys
 
     def cleanup(self):
         self.client = None
@@ -139,7 +145,7 @@ def setup_event_loop(self):
 def main():
     from xpra.platform import init
     init("OSX Extras")
-    ClientExtras(None, True)
+    ClientExtras(None, None, True)
 
 
 if __name__ == "__main__":

src/xpra/platform/darwin/options.py

@@ -3,6 +3,10 @@
 # Xpra is released under the terms of the GNU GPL v2, or, at your option, any
 # later version. See the file COPYING for details.
 
-def add_client_options(parser):
-    #NONE!
-    pass
+def add_client_options(parser, defaults):
+    parser.add_option("--swap-keys", action="store_true",
+                          dest="swap_keys", default=defaults.swap_keys,
+                          help="Swaps the 'Command' and 'Control' keys (default: '%default')")
+    parser.add_option("--no-swap-keys", action="store_false",
+                          dest="swap_keys",
+                          help="Disables the swapping of the 'Command' and 'Control' keys")

src/xpra/platform/win32/gui.py

@@ -52,7 +52,7 @@ def get_native_system_tray_classes(*args):
 
 
 class ClientExtras(object):
-    def __init__(self, client):
+    def __init__(self, client, opts):
         self.client = client
         self._kh_warning = False
         self.setup_console_event_listener()
@@ -132,7 +132,7 @@ def resume():
         fake_client.suspend = suspend
         fake_client.resume = resume
         fake_client.keyboard_helper = None
-        ClientExtras(fake_client)
+        ClientExtras(fake_client, None)
 
         import gobject
         gobject.threads_init()

src/xpra/platform/win32/options.py

@@ -4,6 +4,6 @@
 # Xpra is released under the terms of the GNU GPL v2, or, at your option, any
 # later version. See the file COPYING for details.
 
-def add_client_options(parser):
+def add_client_options(parser, defaults):
     from xpra.platform.options_util import add_notray_option
     add_notray_option(parser, ", this will also disable notifications!")

src/xpra/platform/xposix/gui.py

@@ -63,7 +63,7 @@ def x11_bell():
 
 
 class ClientExtras(object):
-    def __init__(self, client):
+    def __init__(self, client, opts):
         self.client = client
         self._xsettings_watcher = None
         self._root_props_watcher = None

src/xpra/scripts/config.py

@@ -275,6 +275,7 @@ def read_xpra_defaults():
                     "exit-ssh"          : bool,
                     "opengl"            : bool,
                     "mdns"              : bool,
+                    "swap_keys"         : bool,
                     #arrays of strings (default value, allowed options):
                     "video-encoders"    : list,
                     "csc-modules"       : list,
@@ -366,6 +367,7 @@ def get_defaults():
                     "exit-ssh"          : True,
                     "opengl"            : OPENGL_DEFAULT,
                     "mdns"              : os.name=="posix" and not sys.platform.startswith("darwin"),
+                    "swap_keys"         : sys.platform.startswith("darwin"),    #only used on osx
                     "video-encoders"    : [],
                     "csc-modules"       : [],
                     "speaker-codec"     : [],

src/xpra/scripts/main.py

@@ -389,7 +389,7 @@ def parse_cmdline(cmdline):
                           help="Path to the default image which will be used for all windows (the application may override this)")
     # let the platform specific code add its own options:
     # adds "--no-tray" for platforms that support it
-    add_client_options(group)
+    add_client_options(group, defaults)
     hidden_options["tray"] =  True
     hidden_options["delay_tray"] =  False
     group.add_option("--tray-icon", action="store",