Enable layout(variant)[option,...] format in IBusEngineDesc.layout

ui/gtk3/panel.vala

 /* vim:set et sts=4 sw=4:
  *
  * ibus - The Input Bus
  *
  * Copyright(c) 2011 Peng Huang <shawn.p.huang@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or(at your option) any later version.
@@ skipping 193 matching lines @@
             m_config.watch("panel", "use_custom_font");
             update_engines(m_config.get_value("general", "preload_engines"),
                            m_config.get_value("general", "engines_order"));
         } else {
             update_engines(null, null);
         }
 
         set_custom_font();
     }
 
+    private void set_layout(IBus.EngineDesc engine) {
+        string keymap = engine.get_layout().dup();

[Peng, 2012/10/04 13:32:02]

Could you add some comments about layout sample here? So I can understand how
you parse the layout.

+        string layout = null;
+        string variant = null;
+        string option = null;
+        string arg = null;

[Peng, 2012/10/04 13:32:02]

Can we use GString in vala? So you may use g_string_append_printf() to make code
simpler.

+        int index;
+
+        if ("(" in keymap) {
+            if (!(")" in keymap)) {
+                warning("The layout %s in the engine %s is not correct",
+                        keymap, engine.get_name());
+                return;
+            }
+            index = keymap.index_of("(", 0);
+            if (layout == null || layout == "") {
+                layout = keymap.substring(0, index);
+            }
+            keymap = keymap.substring(index + 1, -1);
+            index = keymap.index_of(")", 0);
+            variant = keymap.substring(0, index);
+            keymap = keymap.substring(index + 1, -1);
+        }
+
+        if ("[" in keymap) {
+            if (!("]" in keymap)) {
+                warning("The layout %s in the engine %s is not correct",
+                        keymap, engine.get_name());
+                return;
+            }
+            index = keymap.index_of("[", 0);
+            if (layout == null || layout == "") {
+                layout = keymap.substring(0, index);
+            }
+            keymap = keymap.substring(index + 1, -1);
+            index = keymap.index_of("]", 0);
+            option = keymap.substring(0, index);
+            keymap = keymap.substring(index + 1, -1);
+        }
+
+        if (layout == null || layout == "") {
+            layout = keymap.dup();
+        }
+
+        if (layout != null && layout != "" && layout != "default") {
+            arg = "%s -layout %s".printf(arg ?? "", layout);
+        }
+        if (variant != null && variant != "" && variant != "default") {
+            arg = "%s -variant %s".printf(arg ?? "", variant);
+        }
+        if (option != null && option != "" && option != "default") {
+            /*TODO: Need to get the session XKB options */
+            arg = "%s -option -option %s".printf(arg ?? "", option);
+        }
+
+        if (arg == null) {
+            return;
+        }
+
+        string cmdline = "setxkbmap %s".printf(arg);
+        try {
+            if (!GLib.Process.spawn_command_line_sync(cmdline)) {
+                warning("Switch xkb layout to %s failed.",
+                    engine.get_layout());
+            }
+        } catch (GLib.SpawnError e) {
+            warning("execute setxkblayout failed");
+        }
+    }
+
     private void switch_engine(int i, bool force = false) {
         GLib.assert(i >= 0 && i < m_engines.length);
 
         // Do not need switch
         if (i == 0 && !force)
             return;
 
         IBus.EngineDesc engine = m_engines[i];
 
         if (!m_bus.set_global_engine(engine.get_name())) {
             warning("Switch engine to %s failed.", engine.get_name());
             return;
         }
         // set xkb layout
-        string cmdline = "setxkbmap %s".printf(engine.get_layout());
-        try {
-            if (!GLib.Process.spawn_command_line_sync(cmdline)) {
-                warning("Switch xkb layout to %s failed.",
-                    engine.get_layout());
-            }
-        } catch (GLib.SpawnError e) {
-            warning("Execute setxkbmap failed: %s", e.message);
-        }
+        set_layout(engine);
     }
 
     private void config_value_changed_cb(IBus.Config config,
                                          string section,
                                          string name,
                                          Variant variant) {
         if (section == "general" && name == "preload_engines") {
             update_engines(variant, null);
             return;
         }
@@ skipping 304 matching lines @@
         string[] names = {};
         foreach(var desc in m_engines) {
             names += desc.get_name();
         }
         if (m_config != null)
             m_config.set_value("general",
                                "engines_order",
                                new GLib.Variant.strv(names));
     }
 }