From a8f02d4be33f87cf97039736407cd13e795b992b Mon Sep 17 00:00:00 2001

From: fujiwarat <takao.fujiwara1@gmail.com>

Date: Fri, 18 Nov 2011 18:05:42 +0900

Subject: [PATCH] Add XKB layouts

---

 Makefile.am                  |    7 +

 configure.ac                 |   56 +

 data/ibus.schemas.in         |   47 +

 ibus-1.0.pc.in               |    2 +

 ibus/Makefile.am             |   26 +

 ibus/__init__.py             |    2 +

 ibus/bus.py                  |    3 +

 ibus/interface/iibus.py      |    3 +

 ibus/xkblayout.py.in         |  360 ++++

 ibus/xkbxml.py.in            |  419 ++++

 setup/Makefile.am            |    1 +

 setup/enginecombobox.py      |    7 +-

 setup/main.py                |    3 +

 setup/setup.ui               |  609 ++++++-

 setup/xkbsetup.py            |  457 +++++

 src/Makefile.am              |    5 +

 src/ibus.h                   |    1 +

 src/ibusxkbxml.c             |  441 +++++

 src/ibusxkbxml.h             |  172 ++

 ui/gtk/panel.py              |   41 +

 xkb/Makefile.am              |  107 +

 xkb/Makefile.am.orig         |  104 +

 xkb/gtkimcontextsimpleseqs.h | 4484 ++++++++++++++++++++++++++++++++++++++++++

 xkb/ibus-engine-xkb-main.c   |  303 +++

 xkb/ibus-engine-xkb-main.h   |   32 +

 xkb/ibus-simple-engine.c     | 1003 ++++++++++

 xkb/ibus-simple-engine.h     |   13 +

 xkb/ibus-xkb-main.c          |  112 ++

 xkb/xkblayout.xml.in         |   16 +

 xkb/xkblayoutconfig.xml.in   |    6 +

 xkb/xkblib.c                 |  327 +++

 xkb/xkblib.h                 |   41 +

 xkb/xkbxml.c                 |  345 ++++

 xkb/xkbxml.h                 |  113 ++

 34 files changed, 9664 insertions(+), 4 deletions(-)

 create mode 100644 ibus/xkblayout.py.in

 create mode 100644 ibus/xkbxml.py.in

 create mode 100644 setup/xkbsetup.py

 create mode 100644 src/ibusxkbxml.c

 create mode 100644 src/ibusxkbxml.h

 create mode 100644 xkb/Makefile.am

 create mode 100644 xkb/Makefile.am.orig

 create mode 100644 xkb/gtkimcontextsimpleseqs.h

 create mode 100644 xkb/ibus-engine-xkb-main.c

 create mode 100644 xkb/ibus-engine-xkb-main.h

 create mode 100644 xkb/ibus-simple-engine.c

 create mode 100644 xkb/ibus-simple-engine.h

 create mode 100644 xkb/ibus-xkb-main.c

 create mode 100644 xkb/xkblayout.xml.in

 create mode 100644 xkb/xkblayoutconfig.xml.in

 create mode 100644 xkb/xkblib.c

 create mode 100644 xkb/xkblib.h

 create mode 100644 xkb/xkbxml.c

 create mode 100644 xkb/xkbxml.h

diff --git a/Makefile.am b/Makefile.am

index ff0fabc..056ddfc 100644

--- a/Makefile.am

+++ b/Makefile.am

@@ -42,6 +42,12 @@ DAEMON_DIRS =       \

 	$(NULL)

 endif

+if ENABLE_XKB

+XKB_DIRS =          \

+	xkb             \

+	$(NULL)

+endif

+

 if ENABLE_MEMCONF

 MEMCONF_DIRS = \

 	memconf \

@@ -66,6 +72,7 @@ SUBDIRS =           \

 	$(DAEMON_DIRS)  \

 	$(PYTHON_DIRS)  \

 	$(GCONF_DIRS)   \

+	$(XKB_DIRS)     \

 	$(MEMCONF_DIRS) \

 	$(DCONF_DIRS)   \

 	$(NULL)

diff --git a/configure.ac b/configure.ac

index f452666..227e28e 100644

--- a/configure.ac

+++ b/configure.ac

@@ -221,6 +221,60 @@ else

     enable_xim="no (disabled, use --enable-xim to enable)"

 fi

+AC_ARG_ENABLE(xkb,

+    AS_HELP_STRING([--disable-xkb],

+                   [Do not build xkb]),

+    [enable_xkb=$enableval],

+    [enable_xkb=yes]

+)

+

+AM_CONDITIONAL([ENABLE_XKB], [test x"$enable_xkb" = x"yes"])

+if test x"$enable_xkb" = x"yes"; then

+    PKG_CHECK_MODULES(X11, [

+        x11

+    ])

+    PKG_CHECK_MODULES(XKB,

+        [xkbfile],,

+        [XKB_LIBS="-lxkbfile"]

+    )

+    AC_DEFINE(HAVE_XKB, 1, [define to 1 if you have xkbfile])

+    HAVE_IBUS_XKB=true

+else

+    enable_xkb="no (disabled, use --enable-xkb to enable)"

+    HAVE_IBUS_XKB=false

+fi

+AC_SUBST(HAVE_IBUS_XKB)

+

+# define XKB rules file

+AC_ARG_WITH(xkb-rules-xml,

+    AS_HELP_STRING([--with-xkb-rules-xml[=$DIR/evdev.xml]],

+        [Set evdev.xml file path (default: /usr/share/X11/xkb/rules/evdev.xml)]),

+    XKB_RULES_XML_FILE=$with_xkb_rules_xml,

+    XKB_RULES_XML_FILE="/usr/share/X11/xkb/rules/evdev.xml"

+)

+AC_DEFINE_UNQUOTED(XKB_RULES_XML_FILE, "$XKB_RULES_XML_FILE",

+    [Define file path of evdev.xml])

+AC_SUBST(XKB_RULES_XML_FILE)

+

+# define XKB preload layouts

+AC_ARG_WITH(xkb-preload-layouts,

+    AS_HELP_STRING([--with-xkb-preload-layouts[=layout,...]],

+        [Set preload xkb layouts (default: us,fr,de,...)]),

+    XKB_PRELOAD_LAYOUTS=$with_xkb_preload_layouts,

+    [XKB_PRELOAD_LAYOUTS=""\

+"us,us(chr),us(dvorak),ad,al,am,ara,az,ba,bd,be,bg,br,bt,by,"\

+"de,dk,ca,ch,cn(tib),cz,ee,epo,es,et,fi,fo,fr,"\

+"gb,ge,ge(dsb),ge(ru),ge(os),gh,gh(akan),gh(ewe),gh(fula),gh(ga),gh(hausa),"\

+"gn,gr,hu,hr,ie,ie(CloGaelach),il,"\

+"in,in(ben),in(guj),in(guru),in(jhelum),in(kan),in(mal),in(ori),in(tam),"\

+"in(tel),in(urd-phonetic),in(bolnagri),iq,iq(ku),ir,ir(ku),is,it,"\

+"kg,kh,kz,la,latam,lk,lk(tam_unicode),lt,lv,ma,ma(tifinagh),mal,mao,"\

+"me,mk,mm,mt,mv,ng,ng(hausa),ng,ng(igbo),ng(yoruba),nl,no,no(smi),np,"\

+"pk,pl,pl(csb),pt,ro,rs,ru,ru(cv),ru(kom),ru(sah),ru(tt),ru(xal),"\

+"se,si,sk,sy,sy(ku),th,tj,tr,ua,uz,vn"]

+)

+AC_SUBST(XKB_PRELOAD_LAYOUTS)

+

 # GObject introspection

 GOBJECT_INTROSPECTION_CHECK([0.6.8])

@@ -478,6 +532,7 @@ bindings/Makefile

 bindings/vala/Makefile

 dconf/Makefile

 dconf/dconf.xml.in

+xkb/Makefile

 ])

 AC_OUTPUT

@@ -493,6 +548,7 @@ Build options:

   Build gtk2 immodule       $enable_gtk2

   Build gtk3 immodule       $enable_gtk3

   Build XIM agent server    $enable_xim

+  Build XKB                 $enable_xkb

   Build python modules      $enable_python

   Build gconf modules       $enable_gconf

   Build memconf modules     $enable_memconf

diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in

index 663358c..e0a6a37 100644

--- a/data/ibus.schemas.in

+++ b/data/ibus.schemas.in

@@ -191,6 +191,53 @@

       </locale>

     </schema>

     <schema>

+      <key>/schemas/desktop/ibus/general/system_keyboard_layout</key>

+      <applyto>/desktop/ibus/general/system_keyboard_layout</applyto>

+      <owner>ibus</owner>

+      <type>string</type>

+      <default>default</default>

+      <gettext_domain>ibus</gettext_domain>

+      <locale name="C">

+        <short>Set system keyboard layout</short>

+            <long>Override default system keyboard layout. default is 'default'</long>

+      </locale>

+    </schema>

+    <schema>

+      <key>/schemas/desktop/ibus/general/system_keyboard_option</key>

+      <applyto>/desktop/ibus/general/system_keyboard_option</applyto>

+      <owner>ibus</owner>

+      <type>string</type>

+      <default>default</default>

+      <gettext_domain>ibus</gettext_domain>

+      <locale name="C">

+        <short>Set system keyboard option</short>

+            <long>Override default system keyboard option. default is 'default'</long>

+      </locale>

+    </schema>

+    <schema>

+      <key>/schemas/desktop/ibus/general/use_xmodmap</key>

+      <applyto>/desktop/ibus/general/use_xmodmap</applyto>

+      <owner>ibus</owner>

+      <type>bool</type>

+      <default>true</default>

+      <locale name="C">

+        <short>Use xmodmap</short>

+           <long>Run xmodmap if .xmodmap/.Xmodmap exists.</long>

+      </locale>

+    </schema>

+    <schema>

+      <key>/schemas/desktop/ibus/general/xkb_latin_layouts</key>

+      <applyto>/desktop/ibus/general/xkb_latin_layouts</applyto>

+      <owner>ibus</owner>

+      <type>list</type>

+      <list_type>string</list_type>

+      <default>[ara,bg,cz,dev,gr,gur,in,jp(kana),mal,mkd,ru,ua]</default>

+      <locale name="C">

+        <short>Latin layout which have no ASCII</short>

+	    <long>us layout is appended to the latin layouts. variant is not needed.</long>

+      </locale>

+    </schema>

+    <schema>

       <key>/schemas/desktop/ibus/panel/use_custom_font</key>

       <applyto>/desktop/ibus/panel/use_custom_font</applyto>

       <owner>ibus</owner>

diff --git a/ibus-1.0.pc.in b/ibus-1.0.pc.in

index 9f593ab..51eb67a 100644

--- a/ibus-1.0.pc.in

+++ b/ibus-1.0.pc.in

@@ -4,6 +4,8 @@ libdir=@libdir@

 includedir=@includedir@

 datadir=@datadir@

 pkgdatadir=@datadir@/ibus

+have_ibus_xkb=@HAVE_IBUS_XKB@

+ibus_xkb=@libexecdir@/ibus-xkb

 Name: IBus

 Description: IBus Library

diff --git a/ibus/Makefile.am b/ibus/Makefile.am

index c71df1b..508c98f 100644

--- a/ibus/Makefile.am

+++ b/ibus/Makefile.am

@@ -58,12 +58,38 @@ nodist_ibus_PYTHON = \

 ibusdir = @pkgpythondir@

+xkblayout_py_in_files = \

+	xkblayout.py.in \

+	xkbxml.py.in \

+	$(NULL)

+xkblayout_py_DATA = $(xkblayout_py_in_files:.py.in=.py)

+xkblayout_pydir = @pkgpythondir@

+

+ibus_PYTHON += $(xkblayout_py_DATA)

+

+if ENABLE_XKB

+XKB_COMMAND=\\\"$(libexecdir)/ibus-xkb\\\"

+HAVE_XKB=True

+else

+XKB_COMMAND="None"

+HAVE_XKB=False

+endif

+

+%.py : %.py.in

+	@sed -e "s|\@XKB_COMMAND\@|$(XKB_COMMAND)|g" \

+	     -e "s|\@XKB_RULES_XML_FILE\@|$(XKB_RULES_XML_FILE)|g" \

+	     -e "s|\@HAVE_XKB\@|$(HAVE_XKB)|g" \

+	     -e "s|\@datadir\@|$(datadir)|g" \

+	$< > $@

+

 EXTRA_DIST = \

 	_config.py.in \

+	$(xkblayout_py_in_files) \

 	$(NULL)

 CLEANFILES = \

 	*.pyc \

+	$(xkblayout_py_DATA) \

 	$(NULL)

 DISTCLEANFILES = \

diff --git a/ibus/__init__.py b/ibus/__init__.py

index 7c8f8be..3c25605 100644

--- a/ibus/__init__.py

+++ b/ibus/__init__.py

@@ -41,4 +41,6 @@ from text import *

 from observedpath import *

 from enginedesc import *

 from component import *

+from xkblayout import *

+from xkbxml import *

 from _config import *

diff --git a/ibus/bus.py b/ibus/bus.py

index a8a458d..84b4140 100644

--- a/ibus/bus.py

+++ b/ibus/bus.py

@@ -163,6 +163,9 @@ class Bus(object.Object):

             data = serializable.deserialize_object(data)

         return data

+    def get_use_sys_layout(self):

+        return self.__ibus.GetUseSysLayout();

+

     def introspect_ibus(self):

         return self.__ibus.Introspect()

diff --git a/ibus/interface/iibus.py b/ibus/interface/iibus.py

index 678d517..7de56fc 100644

--- a/ibus/interface/iibus.py

+++ b/ibus/interface/iibus.py

@@ -75,6 +75,9 @@ class IIBus(dbus.service.Object):

     @method(in_signature="v", out_signature="v")

     def Ping(self, data, dbusconn): pass

+    @method(out_signature="b")

+    def GetUseSysLayout(self, dbusconn): pass

+

     @signal(signature="")

     def RegistryChanged(self): pass

diff --git a/ibus/xkblayout.py.in b/ibus/xkblayout.py.in

new file mode 100644

index 0000000..c0c95ce

--- /dev/null

+++ b/ibus/xkblayout.py.in

@@ -0,0 +1,360 @@

+# vim:set et sts=4 sw=4:

+#

+# ibus - The Input Bus

+#

+# Copyright (c) 2011 Takao Fujiwara <takao.fujiwara1@gmail.com>

+# Copyright (c) 2011 Peng Huang <shawn.p.huang@gmail.com>

+# Copyright (c) 2011 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

+# version 2 of the License, or (at your option) any later version.

+#

+# This library is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU Lesser General Public License for more details.

+#

+# You should have received a copy of the GNU Lesser General Public

+# License along with this program; if not, write to the

+# Free Software Foundation, Inc., 59 Temple Place, Suite 330,

+# Boston, MA  02111-1307  USA

+

+__all__ = (

+        'XKBLayout',

+    )

+

+import os, sys, time

+import glib

+

+XKB_COMMAND = @XKB_COMMAND@

+XKB_SESSION_TIME_OUT = 30.0

+XMODMAP_CMD = 'xmodmap'

+XMODMAP_KNOWN_FILES = ['.xmodmap', '.xmodmaprc', '.Xmodmap', '.Xmodmaprc']

+

+class XKBLayout():

+    def __init__(self, config = None, command=XKB_COMMAND):

+        self.__config = config

+        self.__command = command

+        self.__use_xkb = True

+        self.__xkb_pid = None

+        self.__xmodmap_pid = None

+        self.__use_xmodmap = True

+        if self.__command == None:

+            self.__use_xkb = False

+        self.__default_layout = self.get_layout()

+        self.__default_model = self.get_model()

+        self.__default_option = self.get_option()

+        self.__time_lag_session_xkb_layout = True

+        self.__time_lag_session_xkb_option = True

+        self.__time_lag_session_xkb_timer = time.time()

+        self.__xkb_latin_layouts = []

+        if config != None:

+            self.__xkb_latin_layouts = list(self.__config.get_value('general',

+                                                                    'xkb_latin_layouts',

+                                                                    []))

+            self.__use_xmodmap = bool(self.__config.get_value('general',

+                                                              'use_xmodmap',

+                                                              True))

+

+

+    def __get_model_from_layout(self, layout):

+        left_bracket = layout.find('(')

+        right_bracket = layout.find(')')

+        if left_bracket >= 0 and right_bracket > left_bracket:

+            return (layout[:left_bracket] + layout[right_bracket + 1:], \

+                    layout[left_bracket + 1:right_bracket])

+        return (layout, 'default')

+

+    def __get_option_from_layout(self, layout):

+        left_bracket = layout.find('[')

+        right_bracket = layout.find(']')

+        if left_bracket >= 0 and right_bracket > left_bracket:

+            return (layout[:left_bracket] + layout[right_bracket + 1:], \

+                    layout[left_bracket + 1:right_bracket])

+        return (layout, 'default')

+

+    def __get_output_from_cmdline(self, arg, string):

+        exec_command = '%s %s' % (self.__command, arg)

+        retval = None

+        for line in os.popen(exec_command).readlines():

+            line = line.strip()

+            if line.startswith(string):

+                retval = line[len(string):]

+                break

+        return retval

+

+    def __get_userhome(self):

+        if 'HOME' not in os.environ:

+            import pwd

+            userhome = pwd.getpwuid(os.getuid()).pw_dir

+        else:

+            userhome = os.environ['HOME']

+        userhome = userhome.rstrip('/')

+        return userhome

+

+    def __get_fullpath(self, command):

+        if 'PATH' in os.environ:

+            envpath = os.environ['PATH']

+        else:

+            envpath = os.defpath

+        PATH = envpath.split(os.pathsep)

+        for dir in PATH:

+            filepath = os.path.join(dir, command)

+            if os.path.exists(filepath):

+                return filepath

+        return None

+

+    def __set_layout_cb(self, pid, status):

+        if self.__xkb_pid != pid:

+            print >> sys.stderr, \

+                'ibus.xkblayout: set_layout_cb has another pid'

+            return

+        self.__xkb_pid.close()

+        self.__xkb_pid = None

+        self.set_xmodmap()

+

+    def __set_xmodmap_cb(self, pid, status):

+        if self.__xmodmap_pid != pid:

+            print >> sys.stderr, \

+                'ibus.xkblayout: set_xmodmap_cb has another pid'

+            return

+        self.__xmodmap_pid.close()

+        self.__xmodmap_pid = None

+

+    def use_xkb(self, enable):

+        if self.__command == None:

+            return

+        self.__use_xkb = enable

+

+    def get_layout(self):

+        if not self.__use_xkb:

+            return None

+        return self.__get_output_from_cmdline('--get', 'layout: ')

+

+    def get_model(self):

+        if not self.__use_xkb:

+            return None

+        return self.__get_output_from_cmdline('--get', 'model: ')

+

+    def get_option(self):

+        if not self.__use_xkb:

+            return None

+        return self.__get_output_from_cmdline('--get', 'option: ')

+

+    def get_group(self):

+        if not self.__use_xkb:

+            return 0

+        return int(self.__get_output_from_cmdline('--get-group', 'group: '))

+

+    def set_layout(self, layout='default', model='default', option='default'):

+        if not self.__use_xkb:

+            return

+        if layout == None:

+            return

+        if self.__default_layout == None:

+            # Maybe opening display was failed in constructor.

+            self.reload_default_layout()

+        if self.__default_layout == None:

+            return

+        layout = str(layout)

+        # if set_default_layout() is not default, the default layout is

+        # pulled from the current XKB. But it's possible gnome-settings-daemon

+        # does not run yet. I added XKB_SESSION_TIME_OUT for the timer.

+        if self.__time_lag_session_xkb_layout == True:

+            self.__default_layout = self.get_layout()

+            self.__default_model = self.get_model()

+        if self.__time_lag_session_xkb_option == True:

+            self.__default_option = self.get_option()

+        if (self.__time_lag_session_xkb_layout == True or \

+            self.__time_lag_session_xkb_option == True ) and \

+           (time.time() - self.__time_lag_session_xkb_timer \

+            > XKB_SESSION_TIME_OUT):

+            self.__time_lag_session_xkb_layout = False

+            self.__time_lag_session_xkb_option = False

+        if layout == 'default':

+            layout = self.__default_layout

+        else:

+            self.__time_lag_session_xkb_layout = False

+        if model != None:

+            model = str(model)

+            if model == 'default':

+                (layout, model) = self.__get_model_from_layout(layout)

+            if model == 'default':

+                model = self.__default_model

+            else:

+                self.__time_lag_session_xkb_layout = False

+        if option != None:

+            option = str(option)

+            if option == 'default':

+                (layout, engine_option) = self.__get_option_from_layout(layout)

+                if engine_option != None and engine_option != 'default':

+                    option = self.__default_option

+                    if option == None:

+                        option = engine_option

+                    else:

+                        option = '%s,%s' % (option, engine_option)

+                    self.__time_lag_session_xkb_option = False

+            if option == 'default':

+                option = self.__default_option

+        need_us_layout = False

+        for latin_layout in self.__xkb_latin_layouts:

+            latin_layout = str(latin_layout)

+            # layout 'in' and model 'eng' is English layout.

+            if layout == latin_layout and model != 'eng':

+                need_us_layout = True

+                break

+            if model != None and layout + '(' + model + ')' == latin_layout:

+                need_us_layout = True

+                break

+        if need_us_layout:

+            layout = layout + ',us'

+            if model != None:

+                model = model + ','

+        if layout == self.get_layout() and \

+           model == self.get_model() and \

+           option == self.get_option():

+            return

+        args = []

+        args.append(self.__command)

+        args.append('--layout')

+        args.append(layout)

+        if model != None:

+            args.append('--model')

+            args.append(model)

+        if option != None:

+            args.append('--option')

+            args.append(option)

+        pid = glib.spawn_async(argv=args,

+                               flags=glib.SPAWN_DO_NOT_REAP_CHILD)[0]

+        self.__xkb_pid = pid

+        glib.child_watch_add(self.__xkb_pid, self.__set_layout_cb)

+

+    def set_default_layout(self, layout='default', model='default'):

+        if not self.__use_xkb:

+            return

+        if layout == None:

+            print >> sys.stderr, 'ibus.xkblayout: None layout'

+            return

+        if model == None:

+            print >> sys.stderr, 'ibus.xkblayout: None model'

+            return

+        if layout == 'default':

+            self.__default_layout = self.get_layout()

+            self.__default_model = self.get_model()

+        else:

+            if model == 'default':

+                (layout, model) = self.__get_model_from_layout(layout)

+            self.__default_layout = layout

+            self.__time_lag_session_xkb_layout = False

+            if model == 'default':

+                self.__default_model = None

+            else:

+                self.__default_model = model

+

+    def set_default_option(self, option='default'):

+        if not self.__use_xkb:

+            return

+        if option == None:

+            print >> sys.stderr, 'ibus.xkblayout: None option'

+            return

+        if option == 'default':

+            self.__default_option = self.get_option()

+        else:

+            self.__default_option = option

+            self.__time_lag_session_xkb_option = False

+

+    def get_default_layout(self):

+        return [self.__default_layout, self.__default_model];

+

+    def get_default_option(self):

+        return self.__default_option

+

+    def reload_default_layout(self):

+        if not self.__use_xkb:

+            return

+        self.__default_layout = self.get_layout()

+        self.__default_model = self.get_model()

+        self.__default_option = self.get_option()

+

+    def set_xmodmap(self):

+        if not self.__use_xmodmap:

+            return

+        if self.__xmodmap_pid != None:

+            return

+        xmodmap_cmdpath = self.__get_fullpath(XMODMAP_CMD)

+        if xmodmap_cmdpath == None:

+            xmodmap_cmdpath = XMODMAP_CMD

+        for xmodmap_file in XMODMAP_KNOWN_FILES:

+            xmodmap_filepath = os.path.join(self.__get_userhome(), xmodmap_file)

+            if not os.path.exists(xmodmap_filepath):

+                continue

+            pid = glib.spawn_async(argv=[xmodmap_cmdpath, xmodmap_filepath],

+                                   flags=glib.SPAWN_DO_NOT_REAP_CHILD)[0]

+            self.__xmodmap_pid = pid

+            glib.child_watch_add(self.__xmodmap_pid, self.__set_xmodmap_cb)

+            break

+

+

+def test():

+    import gtk

+    import ibus

+

+    window = None

+    config = None

+    xkblayout = None

+

+    def __destroy(*args):

+        window.hide()

+        gtk.main_quit()

+

+    def __test_set_session_xkb(button):

+        xkblayout.set_layout('default')

+        print 'Reset the default keymap'

+        print 'Layout:', xkblayout.get_default_layout()

+        print 'Option:', xkblayout.get_default_option()

+

+    def __test_set_user_xkb(button):

+        layout = 'us'

+        model = 'default'

+        option = 'default'

+        if len(sys.argv) > 1:

+            layout = sys.argv[1]

+        if len(sys.argv) > 2:

+            model = sys.argv[2]

+            if model == 'None':

+                model = None

+        if len(sys.argv) > 3:

+            option = sys.argv[3]

+            if option == 'None':

+                optoin = None

+        xkblayout.set_layout(layout, model, option)

+        print 'Test set_layout:', layout, model, option

+

+    if ibus.get_address() != None:

+        bus = ibus.Bus()

+        config = bus.get_config()

+    else:

+        print 'no ibus'

+    xkblayout = XKBLayout(config)

+    print 'Layout:', xkblayout.get_default_layout()

+    print 'Option:', xkblayout.get_default_option()

+    window = gtk.Window(gtk.WINDOW_TOPLEVEL)

+    window.connect('destroy', __destroy)

+    vb = gtk.VBox()

+    window.add(vb)

+    b = gtk.Button('Test xkb')

+    b.connect('clicked', __test_set_user_xkb)

+    vb.add(b)

+    b = gtk.Button('Reset the default xkb')

+    b.connect('clicked', __test_set_session_xkb)

+    vb.add(b)

+    window.show_all()

+    if config != None:

+        ibus.main()

+    else:

+        gtk.main()

+

+if __name__ == '__main__':

+    test()

diff --git a/ibus/xkbxml.py.in b/ibus/xkbxml.py.in

new file mode 100644

index 0000000..9407c13

--- /dev/null

+++ b/ibus/xkbxml.py.in

@@ -0,0 +1,419 @@

+# vim:set et sts=4 sw=4:

+#

+# ibus - The Input Bus

+#

+# Copyright (c) 2011 Takao Fujiwara <takao.fujiwara1@gmail.com>

+# Copyright (c) 2011 Peng Huang <shawn.p.huang@gmail.com>

+# Copyright (c) 2011 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

+# version 2 of the License, or (at your option) any later version.

+#

+# This library is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU Lesser General Public License for more details.

+#

+# You should have received a copy of the GNU Lesser General Public

+# License along with this program; if not, write to the

+# Free Software Foundation, Inc., 59 Temple Place, Suite 330,

+# Boston, MA  02111-1307  USA

+

+__all__ = (

+        'XKBConfigRegistry',