Merge xkb related changes.

ui/gtk/panel.py

 # vim:set et sts=4 sw=4:
 #
 # ibus - The Input Bus
 #
 # Copyright(c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
 # Copyright(c) 2007-2010 Red Hat, Inc.
 #
 # 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
@@ skipping 50 matching lines @@
     def __init__(self, bus):
         super(Panel, self).__init__(bus)
         self.__bus = bus
         self.__config = self.__bus.get_config()
         self.__focus_ic = None
         self.__setup_pid = 0
         self.__prefix = os.getenv("IBUS_PREFIX")
         self.__data_dir = path.join(self.__prefix, "share", "ibus")
         # self.__icons_dir = path.join(self.__data_dir, "icons")
         self.__setup_cmd = path.join(self.__prefix, "bin", "ibus-setup")
+        self.__setxkbmap_cmd = path.join(self.__prefix, "bin", "setxkbmap")
+        self.__current_xkb_layout = ""
+        self.__default_xkb_layout = "us"
+        if bus.get_use_sys_layout():
+            self.__set_xkb_layout(self.__default_xkb_layout)
 
         # hanlder signal
         signal.signal(signal.SIGCHLD, self.__sigchld_cb)
 
         # connect bus signal
         self.__config.connect("value-changed", self.__config_value_changed_cb)
         self.__config.connect("reloaded", self.__config_reloaded_cb)
         # self.__bus.config_add_watch("panel")
 
         # add icon search path
@@ skipping 117 matching lines @@
 
     def focus_in(self, ic):
         self.reset()
         self.__focus_ic = ibus.InputContext(self.__bus, ic)
         enabled = self.__focus_ic.is_enabled()
         self.__language_bar.set_enabled(enabled)
 
         if not enabled:
             self.__set_im_icon(ICON_KEYBOARD)
             self.__set_im_name(None)
+            if self.__bus.get_use_sys_layout():
+                self.__set_xkb_layout(self.__default_xkb_layout)
         else:
             engine = self.__focus_ic.get_engine()
             if engine:
                 self.__set_im_icon(engine.icon)
                 self.__set_im_name(engine.longname)
+                if self.__bus.get_use_sys_layout():
+                    self.__set_xkb_layout(engine.layout)
             else:
                 self.__set_im_icon(ICON_KEYBOARD)
                 self.__set_im_name(None)
+                if self.__bus.get_use_sys_layout():
+                    self.__set_xkb_layout(self.__default_xkb_layout)
         self.__language_bar.focus_in()
 
     def focus_out(self, ic):
         self.reset()
         self.__focus_ic = None
         self.__language_bar.set_enabled(False)
         self.__language_bar.focus_out()
         self.__set_im_icon(ICON_KEYBOARD)
         self.__set_im_name(None)
+        if self.__bus.get_use_sys_layout():
+            self.__set_xkb_layout(self.__default_xkb_layout)
 
     def state_changed(self):
         if not self.__focus_ic:
             return
 
         enabled = self.__focus_ic.is_enabled()
         self.__language_bar.set_enabled(enabled)
 
         if enabled == False:
             self.reset()
             self.__set_im_icon(ICON_KEYBOARD)
             self.__set_im_name(None)
+            if self.__bus.get_use_sys_layout():
+                self.__set_xkb_layout(self.__default_xkb_layout)
         else:
             engine = self.__focus_ic.get_engine()
             if engine:
                 self.__set_im_icon(engine.icon)
                 self.__set_im_name(engine.longname)
+                if self.__bus.get_use_sys_layout():
+                    self.__set_xkb_layout(engine.layout)
             else:
                 self.__set_im_icon(ICON_KEYBOARD)
                 self.__set_im_name(None)
-
+                if self.__bus.get_use_sys_layout():
+                    self.__set_xkb_layout(self.__default_xkb_layout)
 
     def reset(self):
         self.__candidate_panel.reset()
         self.__language_bar.reset()
 
     def start_setup(self):
         self.__start_setup()
 
     def do_destroy(self):
         gtk.main_quit()
@@ skipping 255 matching lines @@
 
     def __start_setup(self):
         if self.__setup_pid != 0:
             pid, state = os.waitpid(self.__setup_pid, os.P_NOWAIT)
             if pid != self.__setup_pid:
                 os.kill(self.__setup_pid, signal.SIGUSR1)
                 return
             self.__setup_pid = 0
         self.__setup_pid = os.spawnl(os.P_NOWAIT, self.__setup_cmd, "ibus-setup")
 
+    def __set_xkb_layout(self, layout):
+        # if it's not a us keyboard layout, then we need to load us layout
+        # into the second group. Otherwise applications' key bindings may
+        # not work correctly.
+        if layout != "us" and not layout.startswith("us("):
+            layout = layout + ",us"
+
+        if self.__current_xkb_layout == layout:
+            return;
+
+        self.__current_xkb_layout = layout
+
+        # FIXME: It's an ugly hack. libxklavier might be used to make it more
+        # reliable.
+        try:
+            os.spawnv(os.P_WAIT, self.__setxkbmap_cmd,
+                      [ "setxkbmap", "-layout", layout ] )
+        except:
+            print >> sys.stderr, "Failed to run %s" % self.__setxkbmap_cmd