Merge lp:~attente/unity-settings-daemon/fcitx-transition into lp:unity-settings-daemon

[William Hua]

Basic Fcitx support.

Basic Fcitx support.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4048
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/34/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-armhf-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-i386-ci/8

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/34/rebuild

review: Approve (continuous-integration)

[lp:~attente/unity-settings-daemon/fcitx-transition]

4049. By William Hua on 2014-08-14

Revert.

4050. By William Hua on 2014-08-14

Use fcitx-gclient API instead.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4050
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/35/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-armhf-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-i386-ci/9

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/35/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks, looks mostly fine, some comments:

- we shouldn't recommend both ibus and fcitx from the settings daemon, we should rather seed fcitx if we want it installed by default

- we need to have the fcitx MIR approved because we can land the changes, since it adds a build-depends on packages which are currently in universe

- looks fine to land otherwise

setting needs fixing for the recommend, then it's good to go, once the fcitx MIR is ready

review: Needs Fixing

[lp:~attente/unity-settings-daemon/fcitx-transition]

4051. By William Hua on 2014-08-15

Remove fcitx from recommends.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4051
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/36/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-armhf-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-i386-ci/10

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/36/rebuild

review: Approve (continuous-integration)

[lp:~attente/unity-settings-daemon/fcitx-transition]

4052. By William Hua on 2014-08-18

Sync Fcitx engine list to input sources.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4052
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/37/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-armhf-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-i386-ci/11

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/37/rebuild

review: Approve (continuous-integration)

[lp:~attente/unity-settings-daemon/fcitx-transition]

4053. By William Hua on 2014-08-18

Activate Fcitx when disabled.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4053
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/38/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-armhf-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-i386-ci/12

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/38/rebuild

review: Approve (continuous-integration)

[lp:~attente/unity-settings-daemon/fcitx-transition]

4054. By William Hua on 2014-08-27

Translate keyboard layout names properly to Fcitx.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4054
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/39/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-armhf-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-i386-ci/13

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/39/rebuild

review: Approve (continuous-integration)

[lp:~attente/unity-settings-daemon/fcitx-transition]

4055. By William Hua on 2014-08-28

Update current index when Fcitx engine changes.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4055
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/40/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-armhf-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-i386-ci/14

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/40/rebuild

review: Approve (continuous-integration)

[lp:~attente/unity-settings-daemon/fcitx-transition]

4056. By William Hua on 2014-09-02

Sync fcitx engines to dconf.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4056
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/45/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-armhf-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-i386-ci/19

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/45/rebuild

review: Approve (continuous-integration)

[lp:~attente/unity-settings-daemon/fcitx-transition]

4057. By William Hua on 2014-09-03

Fix migration; WIP: finish get_fcitx_engine_for_ibus_engine ().

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4057
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/46/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-armhf-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-i386-ci/20

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/46/rebuild

review: Approve (continuous-integration)

[lp:~attente/unity-settings-daemon/fcitx-transition]

4058. By William Hua on 2014-09-04

Finish get_fcitx_engine_for_ibus_engine ().

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4058
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/47/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-amd64-ci/21/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-armhf-ci/21/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-i386-ci/21/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/47/rebuild

review: Needs Fixing (continuous-integration)

[lp:~attente/unity-settings-daemon/fcitx-transition]

4059. By William Hua on 2014-09-04

Add gperf as build dependency.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4059
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/48/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-armhf-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-i386-ci/22

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/48/rebuild

review: Approve (continuous-integration)

[lp:~attente/unity-settings-daemon/fcitx-transition]

4060. By William Hua on 2014-09-09

Set initial IM when Fcitx appears.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4060
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/49/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-armhf-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-i386-ci/23

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/49/rebuild

review: Approve (continuous-integration)

[lp:~attente/unity-settings-daemon/fcitx-transition]

4061. By William Hua on 2014-09-11

Use Fcitx current IM instead of current source when available.

4062. By William Hua on 2014-09-17

Migrate per-window setting to Fcitx.

4063. By William Hua on 2014-09-18

Remember to zero struct.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4063
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/50/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-armhf-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-i386-ci/24

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/50/rebuild

review: Approve (continuous-integration)

[lp:~attente/unity-settings-daemon/fcitx-transition]

4064. By William Hua on 2015-02-12

Merge trunk.

[William Hua (attente)]

Hi, could we please reconsider this for approval now that Fcitx is approved for main? I don't remember why I added fcitx-data as a Recommends, but if it's wrong, I'll remove it.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4064
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/57/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-vivid-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-vivid-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-vivid-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/57/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks, seems like we don't have anyone available to do a detailed review, so based on a read of the changes and testing in a ppa let's approve that, if there are issues we can sort them out with another landing

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2013-12-04 23:55:26 +0000
+++ .bzrignore	2015-02-12 15:57:03 +0000
@@ -48,6 +48,7 @@
 plugins/datetime/gsd-datetime-mechanism-glue.h
 plugins/datetime/org.gnome.SettingsDaemon.DateTimeMechanism.service
 plugins/datetime/org.gnome.settingsdaemon.datetimemechanism.policy
+plugins/keyboard/input-method-engines.c
 plugins/media-keys/gsd-marshal.c
 plugins/media-keys/gsd-marshal.h
 plugins/media-keys/gsd-media-keys-manager-glue.h

=== modified file 'configure.ac'
--- configure.ac	2014-10-07 23:50:00 +0000
+++ configure.ac	2015-02-12 15:57:03 +0000
@@ -204,7 +204,26 @@
 fi
 AM_CONDITIONAL(HAVE_IBUS, test "x$enable_ibus" == "xyes")
 
-PKG_CHECK_MODULES(KEYBOARD, accountsservice xkbfile xkeyboard-config  $IBUS_MODULE gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
+AC_ARG_ENABLE(fcitx,
+        AS_HELP_STRING([--disable-fcitx],
+                       [Disable Fcitx support]),
+        enable_fcitx=$enableval,
+        enable_fcitx=yes)
+
+if test "x$enable_fcitx" = "xyes" ; then
+        FCITX_MODULE="fcitx-config fcitx-gclient"
+        AC_DEFINE(HAVE_FCITX, 1, [Defined if Fcitx support is enabled])
+
+        AC_CHECK_PROG(HAVE_GPERF, gperf, yes)
+        if test "x$HAVE_GPERF" != "xyes" ; then
+                AC_MSG_ERROR([gperf needed for Fcitx support])
+        fi
+else
+        FCITX_MODULE=
+fi
+AM_CONDITIONAL(HAVE_FCITX, test "x$enable_fcitx" == "xyes")
+
+PKG_CHECK_MODULES(KEYBOARD, accountsservice xkbfile xkeyboard-config $IBUS_MODULE $FCITX_MODULE gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
 
 XKB_BASE=$($PKG_CONFIG --variable xkb_base xkeyboard-config)
 AC_SUBST(XKB_BASE)
@@ -218,7 +237,7 @@
 dnl - media-keys plugin stuff
 dnl ---------------------------------------------------------------------------
 
-PKG_CHECK_MODULES(MEDIA_KEYS, [gio-unix-2.0 libpulse >= $PA_REQUIRED_VERSION $GUDEV_PKG libpulse-mainloop-glib >= $PA_REQUIRED_VERSION libcanberra-gtk3 libnotify alsa])
+PKG_CHECK_MODULES(MEDIA_KEYS, [gio-unix-2.0 libpulse >= $PA_REQUIRED_VERSION $GUDEV_PKG libpulse-mainloop-glib >= $PA_REQUIRED_VERSION libcanberra-gtk3 libnotify alsa $FCITX_MODULE])
 PKG_CHECK_MODULES(GVC, [gobject-2.0 libpulse >= $PA_REQUIRED_VERSION libpulse-mainloop-glib >= $PA_REQUIRED_VERSION])
 AM_CONDITIONAL(HAVE_INTROSPECTION, false)
 
@@ -564,6 +583,7 @@
         Session tracking:         ${SESSION_TRACKING}
         LCMS DICT support:        ${have_new_lcms}
         IBus support:             ${enable_ibus}
+        Fcitx support:            ${enable_fcitx}
         Libnotify support:        ${have_libnotify}
         PackageKit support:       ${have_packagekit}
         Smartcard support:        ${have_smartcard_support}

=== modified file 'debian/control'
--- debian/control	2014-11-27 10:32:03 +0000
+++ debian/control	2015-02-12 15:57:03 +0000
@@ -41,6 +41,8 @@
                libxklavier-dev,
                libsystemd-login-dev (>= 183),
                libibus-1.0-dev (>= 1.5.0),
+               fcitx-libs-dev,
+               gperf,
                libgl1-mesa-dev,
                libxkbfile-dev,
                xkb-data,
@@ -56,7 +58,8 @@
          nautilus-data (>= 2.91.3-1),
          gnome-settings-daemon-schemas (>= 3.8), 
          gsettings-ubuntu-schemas (>= 0.0.1+14.04.20140224),
-Recommends: ibus (>= 1.5.0),
+Recommends: fcitx-data,
+            ibus (>= 1.5.0),
             pulseaudio,
             systemd-services
 Pre-Depends: ${misc:Pre-Depends}

=== modified file 'debian/rules'
--- debian/rules	2014-10-07 23:50:00 +0000
+++ debian/rules	2015-02-12 15:57:03 +0000
@@ -8,7 +8,7 @@
 
 DEB_DH_MAKESHLIBS_ARGS_ALL += -X/usr/lib/unity-settings-daemon-1.0
 DEB_CONFIGURE_SCRIPT := ./autogen.sh
-DEB_CONFIGURE_EXTRA_FLAGS = --enable-systemd --disable-packagekit --enable-ibus
+DEB_CONFIGURE_EXTRA_FLAGS = --enable-systemd --disable-packagekit --enable-ibus --enable-fcitx
 
 build/unity-settings-daemon::
 	gcc -o gnome-settings-daemon/gnome-update-wallpaper-cache debian/gnome-update-wallpaper-cache.c `pkg-config --cflags --libs glib-2.0 gdk-3.0 gdk-x11-3.0 gio-2.0 gnome-desktop-3.0`

=== modified file 'plugins/keyboard/Makefile.am'
--- plugins/keyboard/Makefile.am	2014-09-29 11:08:12 +0000
+++ plugins/keyboard/Makefile.am	2015-02-12 15:57:03 +0000
@@ -15,6 +15,13 @@
 	  kbd-capslock-off.png kbd-numlock-off.png kbd-scrolllock-off.png \
 	  kbd-capslock-on.png kbd-numlock-on.png kbd-scrolllock-on.png
 
+if HAVE_FCITX
+BUILT_SOURCES = input-method-engines.c
+endif
+
+input-method-engines.c: $(srcdir)/input-method-engines.gperf
+	$(AM_V_GEN) gperf --output-file=input-method-engines.c $<
+
 libkeyboard_la_SOURCES = 	\
 	gsd-keyboard-plugin.c	\
 	gsd-keyboard-manager.h	\

=== modified file 'plugins/keyboard/gsd-keyboard-manager.c'
--- plugins/keyboard/gsd-keyboard-manager.c	2014-09-29 11:08:12 +0000
+++ plugins/keyboard/gsd-keyboard-manager.c	2015-02-12 15:57:03 +0000
@@ -48,6 +48,11 @@
 #include <ibus.h>
 #endif
 
+#ifdef HAVE_FCITX
+#include <fcitx-config/fcitx-config.h>
+#include <fcitx-gclient/fcitxinputmethod.h>
+#endif
+
 #include <act/act.h>
 
 #include "gnome-settings-session.h"
@@ -57,6 +62,10 @@
 #include "gsd-enums.h"
 #include "gsd-xkb-utils.h"
 
+#ifdef HAVE_FCITX
+#include "input-method-engines.c"
+#endif
+
 #define GSD_KEYBOARD_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_KEYBOARD_MANAGER, GsdKeyboardManagerPrivate))
 
 #define GSD_KEYBOARD_DIR "org.gnome.settings-daemon.peripherals.keyboard"
@@ -76,9 +85,11 @@
 
 #define GNOME_DESKTOP_INTERFACE_DIR "org.gnome.desktop.interface"
 
+#define ENV_GTK_IM_MODULE    "GTK_IM_MODULE"
 #define KEY_GTK_IM_MODULE    "gtk-im-module"
 #define GTK_IM_MODULE_SIMPLE "gtk-im-context-simple"
 #define GTK_IM_MODULE_IBUS   "ibus"
+#define GTK_IM_MODULE_FCITX  "fcitx"
 
 #define GNOME_DESKTOP_INPUT_SOURCES_DIR "org.gnome.desktop.input-sources"
 
@@ -86,8 +97,11 @@
 #define KEY_INPUT_SOURCES        "sources"
 #define KEY_KEYBOARD_OPTIONS     "xkb-options"
 
-#define INPUT_SOURCE_TYPE_XKB  "xkb"
-#define INPUT_SOURCE_TYPE_IBUS "ibus"
+#define INPUT_SOURCE_TYPE_XKB   "xkb"
+#define INPUT_SOURCE_TYPE_IBUS  "ibus"
+#define INPUT_SOURCE_TYPE_FCITX "fcitx"
+
+#define FCITX_XKB_PREFIX "fcitx-keyboard-"
 
 #define DEFAULT_LANGUAGE "en_US"
 #define DEFAULT_LAYOUT "us"
@@ -108,6 +122,13 @@
         IBusBus   *ibus;
         GHashTable *ibus_engines;
         GCancellable *ibus_cancellable;
+        gboolean is_ibus_active;
+#endif
+#ifdef HAVE_FCITX
+        FcitxInputMethod *fcitx;
+        GCancellable *fcitx_cancellable;
+        gulong fcitx_signal_id;
+        gboolean is_fcitx_active;
 #endif
         gint       xkb_event_base;
         GsdNumLockState old_state;
@@ -1079,6 +1100,186 @@
         }
 }
 
+#ifdef HAVE_FCITX
+static gchar *
+get_xkb_name (const gchar *name)
+{
+        gchar *xkb_name;
+        gchar *separator;
+
+        if (g_str_has_prefix (name, FCITX_XKB_PREFIX))
+                name += strlen (FCITX_XKB_PREFIX);
+
+        xkb_name = g_strdup (name);
+        separator = strchr (xkb_name, '-');
+
+        if (separator)
+                *separator = '+';
+
+        return xkb_name;
+}
+
+static gchar *
+get_fcitx_name (const gchar *name)
+{
+        gchar *fcitx_name = g_strdup (name);
+        gchar *separator = strchr (fcitx_name, '+');
+
+        if (separator)
+                *separator = '-';
+
+        return fcitx_name;
+}
+
+static gboolean
+input_source_is_fcitx_engine (const gchar *type,
+                              const gchar *name,
+                              const gchar *engine)
+{
+        if (g_str_equal (type, INPUT_SOURCE_TYPE_XKB)) {
+                if (g_str_has_prefix (engine, FCITX_XKB_PREFIX)) {
+                        gboolean equal;
+                        gchar *fcitx_name = get_fcitx_name (name);
+                        equal = g_str_equal (fcitx_name, engine + strlen (FCITX_XKB_PREFIX));
+                        g_free (fcitx_name);
+                        return equal;
+                }
+        } else if (g_str_equal (type, INPUT_SOURCE_TYPE_FCITX)) {
+                return g_str_equal (name, engine);
+        }
+
+        return FALSE;
+}
+
+static void
+fcitx_engine_changed (GsdKeyboardManager *manager,
+                      GParamSpec         *pspec,
+                      FcitxInputMethod   *fcitx)
+{
+        GSettings *settings = manager->priv->input_sources_settings;
+        gchar *engine = fcitx_input_method_get_current_im (manager->priv->fcitx);
+
+        if (engine) {
+                GVariant *sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
+                guint current = g_settings_get_uint (settings, KEY_CURRENT_INPUT_SOURCE);
+                gboolean update = TRUE;
+
+                if (current >= 0 && current < g_variant_n_children (sources)) {
+                        const gchar *type;
+                        const gchar *name;
+
+                        g_variant_get_child (sources, current, "(&s&s)", &type, &name);
+                        update = !input_source_is_fcitx_engine (type, name, engine);
+                }
+
+                if (update) {
+                        gsize i;
+
+                        for (i = 0; i < g_variant_n_children (sources); i++) {
+                                const gchar *type;
+                                const gchar *name;
+
+                                if (i == current)
+                                        continue;
+
+                                g_variant_get_child (sources, i, "(&s&s)", &type, &name);
+
+                                if (input_source_is_fcitx_engine (type, name, engine)) {
+                                        g_settings_set_uint (settings, KEY_CURRENT_INPUT_SOURCE, i);
+                                        break;
+                                }
+                        }
+                }
+
+                g_variant_unref (sources);
+                g_free (engine);
+        }
+}
+
+static gboolean
+should_update_input_sources (GVariant  *sources,
+                             GPtrArray *engines)
+{
+        GVariantIter iter;
+        const gchar *type;
+        const gchar *name;
+        guint i = 0;
+
+        g_variant_iter_init (&iter, sources);
+        while (g_variant_iter_next (&iter, "(&s&s)", &type, &name)) {
+                if (g_str_equal (type, INPUT_SOURCE_TYPE_XKB) ||
+                    g_str_equal (type, INPUT_SOURCE_TYPE_FCITX)) {
+                        FcitxIMItem *engine;
+
+                        /* get the next enabled fcitx engine */
+                        for (; i < engines->len; i++) {
+                                engine = g_ptr_array_index (engines, i);
+
+                                if (engine->enable)
+                                        break;
+                        }
+
+                        /* there should be an enabled engine and it should match, otherwise we need to update */
+                        if (i++ >= engines->len || !input_source_is_fcitx_engine (type, name, engine->unique_name))
+                                return TRUE;
+                }
+        }
+
+        /* if there are more enabled engines, we need to update */
+        for (; i < engines->len; i++) {
+                FcitxIMItem *engine = g_ptr_array_index (engines, i);
+
+                if (engine->enable)
+                        return TRUE;
+        }
+
+        return FALSE;
+}
+
+static void
+update_input_sources_from_fcitx_engines (GsdKeyboardManager *manager,
+                                         FcitxInputMethod   *fcitx)
+{
+        GPtrArray *engines = fcitx_input_method_get_imlist (manager->priv->fcitx);
+
+        if (engines) {
+                GVariant *sources = g_settings_get_value (manager->priv->input_sources_settings, KEY_INPUT_SOURCES);
+
+                if (should_update_input_sources (sources, engines)) {
+                        GVariantBuilder builder;
+                        gboolean update = FALSE;
+                        guint i;
+
+                        g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(ss)"));
+
+                        for (i = 0; i < engines->len; i++) {
+                                FcitxIMItem *engine = g_ptr_array_index (engines, i);
+
+                                if (engine->enable) {
+                                        if (g_str_has_prefix (engine->unique_name, FCITX_XKB_PREFIX)) {
+                                                gchar *name = get_xkb_name (engine->unique_name);
+                                                g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_XKB, name);
+                                                g_free (name);
+                                        } else {
+                                                g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_FCITX, engine->unique_name);
+                                        }
+
+                                        update = TRUE;
+                                }
+                        }
+
+                        if (update)
+                                g_settings_set_value (manager->priv->input_sources_settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder));
+                        else
+                                g_variant_builder_clear (&builder);
+                }
+
+                g_variant_unref (sources);
+                g_ptr_array_unref (engines);
+        }
+}
+#endif
+
 static gboolean
 apply_input_source (GsdKeyboardManager *manager,
                     guint               current)
@@ -1103,7 +1304,9 @@
         priv->active_input_source = current;
 
 #ifdef HAVE_IBUS
-        maybe_start_ibus (manager);
+        if (priv->is_ibus_active) {
+                maybe_start_ibus (manager);
+        }
 #endif
 
         g_variant_get_child (sources, current, "(&s&s)", &type, &id);
@@ -1119,44 +1322,86 @@
                         g_warning ("Couldn't find XKB input source '%s'", id);
                         goto exit;
                 }
+
+#ifdef HAVE_FCITX
+                if (priv->is_fcitx_active && priv->fcitx) {
+                        gchar *name = g_strdup_printf (FCITX_XKB_PREFIX "%s", id);
+                        gchar *fcitx_name = get_fcitx_name (name);
+                        fcitx_input_method_activate (priv->fcitx);
+                        fcitx_input_method_set_current_im (priv->fcitx, fcitx_name);
+                        g_free (fcitx_name);
+                        g_free (name);
+                }
+#endif
+
 #ifdef HAVE_IBUS
-                set_gtk_im_module (manager, sources);
-                set_ibus_xkb_engine (manager);
+                if (priv->is_ibus_active) {
+                        set_gtk_im_module (manager, sources);
+                        set_ibus_xkb_engine (manager);
+                }
 #endif
         } else if (g_str_equal (type, INPUT_SOURCE_TYPE_IBUS)) {
 #ifdef HAVE_IBUS
-                IBusEngineDesc *engine_desc = NULL;
-
-                if (priv->ibus_engines)
-                        engine_desc = g_hash_table_lookup (priv->ibus_engines, id);
-                else
-                        goto exit; /* we'll be called again when ibus is up and running */
-
-                if (engine_desc) {
-                        const gchar *ibus_layout;
-                        ibus_layout = ibus_engine_desc_get_layout (engine_desc);
-
-                        if (ibus_layout) {
-                                layout = layout_from_ibus_layout (ibus_layout);
-                                variant = variant_from_ibus_layout (ibus_layout);
-                                options = options_from_ibus_layout (ibus_layout);
+                if (priv->is_ibus_active) {
+                        IBusEngineDesc *engine_desc = NULL;
+
+                        if (priv->ibus_engines)
+                                engine_desc = g_hash_table_lookup (priv->ibus_engines, id);
+                        else
+                                goto exit; /* we'll be called again when ibus is up and running */
+
+                        if (engine_desc) {
+                                const gchar *ibus_layout;
+                                ibus_layout = ibus_engine_desc_get_layout (engine_desc);
+
+                                if (ibus_layout) {
+                                        layout = layout_from_ibus_layout (ibus_layout);
+                                        variant = variant_from_ibus_layout (ibus_layout);
+                                        options = options_from_ibus_layout (ibus_layout);
+                                }
+                        } else {
+                                g_warning ("Couldn't find IBus input source '%s'", id);
+                                goto exit;
                         }
+
+                        /* NULL here is a shortcut for "I already know I
+                           need the IBus module". */
+                        set_gtk_im_module (manager, NULL);
+                        set_ibus_engine (manager, id);
                 } else {
-                        g_warning ("Couldn't find IBus input source '%s'", id);
-                        goto exit;
+                        g_warning ("IBus input source type specified but IBus is not active");
                 }
-
-                /* NULL here is a shortcut for "I already know I
-                   need the IBus module". */
-                set_gtk_im_module (manager, NULL);
-                set_ibus_engine (manager, id);
 #else
                 g_warning ("IBus input source type specified but IBus support was not compiled");
 #endif
+        } else if (g_str_equal (type, INPUT_SOURCE_TYPE_FCITX)) {
+#ifdef HAVE_FCITX
+                if (priv->is_fcitx_active) {
+                        if (priv->fcitx) {
+                                gchar *name = g_strdup (id);
+                                fcitx_input_method_activate (priv->fcitx);
+                                fcitx_input_method_set_current_im (priv->fcitx, name);
+                                g_free (name);
+                        } else {
+                                g_warning ("Fcitx input method framework unavailable");
+                        }
+                } else {
+                        g_warning ("Fcitx input source type specified but Fcitx is not active");
+                }
+#else
+                g_warning ("Fcitx input source type specified but Fcitx support was not compiled");
+#endif
         } else {
                 g_warning ("Unknown input source type '%s'", type);
         }
 
+#ifdef HAVE_FCITX
+        if (priv->is_fcitx_active && priv->fcitx && !priv->fcitx_signal_id) {
+                priv->fcitx_signal_id = g_signal_connect_swapped (manager->priv->fcitx, "notify::current-im", G_CALLBACK (fcitx_engine_changed), manager);
+                g_signal_connect_swapped (manager->priv->fcitx, "imlist-changed", G_CALLBACK (update_input_sources_from_fcitx_engines), manager);
+        }
+#endif
+
  exit:
         apply_xkb_settings (manager, layout, variant,
                             prepare_xkb_options (manager, n_sources, options));
@@ -1168,6 +1413,229 @@
         return TRUE;
 }
 
+#ifdef HAVE_FCITX
+static const gchar *
+get_fcitx_engine_for_ibus_engine (const gchar *ibus_engine)
+{
+        const struct Engine *engine;
+
+        if (!ibus_engine)
+                return NULL;
+
+        engine = get_engine_for_ibus_engine (ibus_engine, strlen (ibus_engine));
+
+        return engine ? engine->fcitx_engine : NULL;
+}
+
+static void
+enable_fcitx_engines (GsdKeyboardManager *manager,
+                      gboolean            migrate)
+{
+        GsdKeyboardManagerPrivate *priv = manager->priv;
+        GPtrArray *engines;
+        GVariant *sources;
+        GVariantIter iter;
+        const gchar *type;
+        const gchar *name;
+        gboolean changed;
+        guint i;
+        guint j;
+
+        engines = fcitx_input_method_get_imlist (priv->fcitx);
+
+        if (!engines) {
+                g_warning ("Cannot update Fcitx engine list");
+                return;
+        }
+
+        sources = g_settings_get_value (priv->input_sources_settings, KEY_INPUT_SOURCES);
+        changed = FALSE;
+        i = 0;
+
+        g_variant_iter_init (&iter, sources);
+        while (g_variant_iter_next (&iter, "(&s&s)", &type, &name)) {
+                if (g_str_equal (type, INPUT_SOURCE_TYPE_XKB)) {
+                        gchar *fcitx_name = get_fcitx_name (name);
+
+                        for (j = i; j < engines->len; j++) {
+                                FcitxIMItem *engine = g_ptr_array_index (engines, j);
+
+                                if (g_str_has_prefix (engine->unique_name, FCITX_XKB_PREFIX) &&
+                                    g_str_equal (engine->unique_name + strlen (FCITX_XKB_PREFIX), fcitx_name)) {
+                                        if (!engine->enable) {
+                                                engine->enable = TRUE;
+                                                changed = TRUE;
+                                        }
+
+                                        break;
+                                }
+                        }
+
+                        g_free (fcitx_name);
+
+                        /* j is either the index of the engine "fcitx-keyboard-<name>"
+                         * or engines->len, meaning it wasn't found. */
+                } else if (migrate && g_str_equal (type, INPUT_SOURCE_TYPE_IBUS)) {
+                        const gchar *fcitx_name = get_fcitx_engine_for_ibus_engine (name);
+
+                        if (!fcitx_name)
+                                continue;
+
+                        for (j = i; j < engines->len; j++) {
+                                FcitxIMItem *engine = g_ptr_array_index (engines, j);
+
+                                if (g_str_equal (engine->unique_name, fcitx_name)) {
+                                        if (!engine->enable) {
+                                                engine->enable = TRUE;
+                                                changed = TRUE;
+                                        }
+
+                                        break;
+                                }
+                        }
+
+                        /* j is either the index of the engine "<name>"
+                         * or engines->len, meaning it wasn't found. */
+                } else if (g_str_equal (type, INPUT_SOURCE_TYPE_FCITX)) {
+                        for (j = i; j < engines->len; j++) {
+                                FcitxIMItem *engine = g_ptr_array_index (engines, j);
+
+                                if (g_str_equal (engine->unique_name, name)) {
+                                        if (!engine->enable) {
+                                                engine->enable = TRUE;
+                                                changed = TRUE;
+                                        }
+
+                                        break;
+                                }
+                        }
+
+                        /* j is either the index of the engine "<name>"
+                         * or engines->len, meaning it wasn't found. */
+                } else {
+                        continue;
+                }
+
+                if (j < engines->len) {
+                        if (j != i) {
+                                gpointer ptr = engines->pdata[i];
+                                engines->pdata[i] = engines->pdata[j];
+                                engines->pdata[j] = ptr;
+                                changed = TRUE;
+                        }
+
+                        i++;
+                } else {
+                        g_warning ("Fcitx engine not found for %s", name);
+                }
+        }
+
+        /* we should have i enabled fcitx engines: disable everything else. */
+
+        for (; i < engines->len; i++) {
+                FcitxIMItem *engine = g_ptr_array_index (engines, i);
+
+                if (engine->enable) {
+                        engine->enable = FALSE;
+                        changed = TRUE;
+                }
+        }
+
+        if (changed) {
+                fcitx_input_method_set_imlist (priv->fcitx, engines);
+        }
+
+        g_variant_unref (sources);
+        g_ptr_array_unref (engines);
+}
+
+struct _FcitxShareStateConfig
+{
+        FcitxGenericConfig config;
+        gint share_state;
+};
+
+typedef struct _FcitxShareStateConfig FcitxShareStateConfig;
+
+static CONFIG_BINDING_BEGIN (FcitxShareStateConfig)
+CONFIG_BINDING_REGISTER ("Program", "ShareStateAmongWindow", share_state)
+CONFIG_BINDING_END ()
+
+static CONFIG_DESC_DEFINE (get_fcitx_config_desc, "config.desc")
+
+static void
+update_share_state_from_per_window (GsdKeyboardManager *manager)
+{
+        /* Set Fcitx' share state setting based on the GSettings per-window option. */
+        GSettings *settings = g_settings_new ("org.gnome.libgnomekbd.desktop");
+        gboolean per_window = g_settings_get_boolean (settings, "group-per-window");
+
+        FcitxShareStateConfig config = { { NULL } };
+
+        /* Load the user's Fcitx configuration. */
+        FILE *file = FcitxXDGGetFileUserWithPrefix (NULL, "config", "r", NULL);
+        FcitxConfigFile *config_file = FcitxConfigParseConfigFileFp (file, get_fcitx_config_desc ());
+        FcitxShareStateConfigConfigBind (&config, config_file, get_fcitx_config_desc ());
+
+        if (file)
+                fclose (file);
+
+        config.share_state = per_window ? 0 : 1;
+
+        /* Save the user's Fcitx configuration. */
+        file = FcitxXDGGetFileUserWithPrefix (NULL, "config", "w", NULL);
+        FcitxConfigSaveConfigFileFp (file, &config.config, get_fcitx_config_desc ());
+
+        if (file)
+                fclose (file);
+
+        fcitx_input_method_reload_config (manager->priv->fcitx);
+
+        g_object_unref (settings);
+}
+
+static void
+migrate_fcitx_engines (GsdKeyboardManager *manager)
+{
+        GPtrArray *engines = fcitx_input_method_get_imlist (manager->priv->fcitx);
+
+        if (engines) {
+                gboolean migrate = FALSE;
+                gboolean second = FALSE;
+                guint i;
+
+                /* Migrate if there are at least two enabled fcitx engines or
+                 * there is one fcitx engine which is not a keyboard layout.
+                 * These are our criteria for determining which direction to
+                 * sync fcitx engines with input sources. */
+
+                for (i = 0; i < engines->len; i++) {
+                        FcitxIMItem *engine = g_ptr_array_index (engines, i);
+
+                        if (engine->enable) {
+                                if (second || !g_str_has_prefix (engine->unique_name, FCITX_XKB_PREFIX)) {
+                                        migrate = TRUE;
+                                        break;
+                                }
+
+                                second = TRUE;
+                        }
+                }
+
+                if (migrate) {
+                        /* Migrate Fcitx to GSettings. */
+                        update_input_sources_from_fcitx_engines (manager, manager->priv->fcitx);
+                } else {
+                        /* Migrate GSettings to Fcitx. */
+                        enable_fcitx_engines (manager, TRUE);
+                        update_share_state_from_per_window (manager);
+                }
+
+                g_ptr_array_unref (engines);
+        }
+}
+#endif
+
 static gboolean
 apply_input_sources_settings (GSettings          *settings,
                               gpointer            keys,
@@ -1181,6 +1649,30 @@
         ActUserManager *user_manager;
         gboolean user_manager_loaded;
 
+#ifdef HAVE_FCITX
+        if (priv->is_fcitx_active) {
+                gboolean sources_changed = FALSE;
+
+                if (keys) {
+                        GQuark *quarks = keys;
+                        gint i;
+
+                        for (i = 0; i < n_keys; i++) {
+                                if (quarks[i] == g_quark_try_string (KEY_INPUT_SOURCES)) {
+                                        sources_changed = TRUE;
+                                        break;
+                                }
+                        }
+                } else {
+                        sources_changed = TRUE;
+                }
+
+                if (sources_changed) {
+                        enable_fcitx_engines (manager, FALSE);
+                }
+        }
+#endif
+
         sources = g_settings_get_value (priv->input_sources_settings, KEY_INPUT_SOURCES);
         n_sources = g_variant_n_children (sources);
 
@@ -1546,11 +2038,10 @@
         g_object_unref (libgnomekbd_settings);
 }
 
-static void
-maybe_convert_old_settings (GSettings *settings)
+static gboolean
+should_migrate (const gchar *id)
 {
-        GVariant *sources;
-        gchar **options;
+        gboolean migrate = FALSE;
         gchar *stamp_dir_path = NULL;
         gchar *stamp_file_path = NULL;
         GError *error = NULL;
@@ -1561,23 +2052,11 @@
                 goto out;
         }
 
-        stamp_file_path = g_build_filename (stamp_dir_path, "input-sources-converted", NULL);
+        stamp_file_path = g_build_filename (stamp_dir_path, id, NULL);
         if (g_file_test (stamp_file_path, G_FILE_TEST_EXISTS))
                 goto out;
 
-        sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
-        if (g_variant_n_children (sources) < 1) {
-                convert_libgnomekbd_layouts (settings);
-#ifdef HAVE_IBUS
-                convert_ibus (settings);
-#endif
-        }
-        g_variant_unref (sources);
-
-        options = g_settings_get_strv (settings, KEY_KEYBOARD_OPTIONS);
-        if (g_strv_length (options) < 1)
-                convert_libgnomekbd_options (settings);
-        g_strfreev (options);
+        migrate = TRUE;
 
         if (!g_file_set_contents (stamp_file_path, "", 0, &error)) {
                 g_warning ("%s", error->message);
@@ -1586,6 +2065,30 @@
 out:
         g_free (stamp_file_path);
         g_free (stamp_dir_path);
+        return migrate;
+}
+
+static void
+maybe_convert_old_settings (GSettings *settings)
+{
+        if (should_migrate ("input-sources-converted")) {
+                GVariant *sources;
+                gchar **options;
+
+                sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
+                if (g_variant_n_children (sources) < 1) {
+                        convert_libgnomekbd_layouts (settings);
+#ifdef HAVE_IBUS
+                        convert_ibus (settings);
+#endif
+                }
+                g_variant_unref (sources);
+
+                options = g_settings_get_strv (settings, KEY_KEYBOARD_OPTIONS);
+                if (g_strv_length (options) < 1)
+                        convert_libgnomekbd_options (settings);
+                g_strfreev (options);
+        }
 }
 
 static void
@@ -1708,10 +2211,12 @@
         if (is_set_input_source || is_activate_input_source) {
                 if (priv->invocation) {
 #ifdef HAVE_IBUS
-                        /* This can only happen if there's an
-                         * ibus_bus_set_global_engine_async() call
-                         * going on. */
-                        g_cancellable_cancel (priv->ibus_cancellable);
+                        if (priv->is_ibus_active) {
+                                /* This can only happen if there's an
+                                 * ibus_bus_set_global_engine_async() call
+                                 * going on. */
+                                g_cancellable_cancel (priv->ibus_cancellable);
+                        }
 #endif
                         g_clear_pointer (&priv->invocation, set_input_source_return);
                         priv->pending_ops = 0;
@@ -1840,13 +2345,46 @@
         register_manager_dbus (manager);
 }
 
+#ifdef HAVE_FCITX
+static void
+fcitx_appeared (GDBusConnection *connection,
+                const gchar     *name,
+                const gchar     *name_owner,
+                gpointer         user_data)
+{
+        GsdKeyboardManager *manager = user_data;
+        apply_input_sources_settings (manager->priv->input_sources_settings, NULL, 0, manager);
+}
+
+static void
+fcitx_vanished (GDBusConnection *connection,
+                const gchar     *name,
+                gpointer         user_data)
+{
+        GsdKeyboardManager *manager = user_data;
+        g_signal_handlers_disconnect_by_data (manager->priv->fcitx, manager);
+        manager->priv->fcitx_signal_id = 0;
+}
+#endif
+
 static gboolean
 start_keyboard_idle_cb (GsdKeyboardManager *manager)
 {
+        const gchar *module;
+        GError *error = NULL;
+
         gnome_settings_profile_start (NULL);
 
         g_debug ("Starting keyboard manager");
 
+        module = g_getenv (ENV_GTK_IM_MODULE);
+#ifdef HAVE_IBUS
+        manager->priv->is_ibus_active = g_strcmp0 (module, GTK_IM_MODULE_IBUS) == 0;
+#endif
+#ifdef HAVE_FCITX
+        manager->priv->is_fcitx_active = g_strcmp0 (module, GTK_IM_MODULE_FCITX) == 0;
+#endif
+
         manager->priv->settings = g_settings_new (GSD_KEYBOARD_DIR);
 
 	xkb_init (manager);
@@ -1857,6 +2395,38 @@
         manager->priv->interface_settings = g_settings_new (GNOME_DESKTOP_INTERFACE_DIR);
         manager->priv->xkb_info = gnome_xkb_info_new ();
 
+#ifdef HAVE_FCITX
+        if (manager->priv->is_fcitx_active) {
+                manager->priv->fcitx_cancellable = g_cancellable_new ();
+                manager->priv->fcitx = fcitx_input_method_new (G_BUS_TYPE_SESSION,
+                                                               G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES,
+                                                               0,
+                                                               manager->priv->fcitx_cancellable,
+                                                               &error);
+                g_clear_object (&manager->priv->fcitx_cancellable);
+
+                if (manager->priv->fcitx) {
+                        manager->priv->fcitx_signal_id = 0;
+
+                        g_bus_watch_name (G_BUS_TYPE_SESSION,
+                                          "org.fcitx.Fcitx",
+                                          G_BUS_NAME_WATCHER_FLAGS_NONE,
+                                          fcitx_appeared,
+                                          fcitx_vanished,
+                                          manager,
+                                          NULL);
+
+                        if (should_migrate ("fcitx-engines-migrated"))
+                                migrate_fcitx_engines (manager);
+                        else
+                                enable_fcitx_engines (manager, FALSE);
+                } else {
+                        g_warning ("Fcitx input method framework unavailable: %s", error->message);
+                        g_error_free (error);
+                }
+        }
+#endif
+
         manager->priv->cancellable = g_cancellable_new ();
 
         g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
@@ -1933,8 +2503,21 @@
         g_clear_object (&p->xkb_info);
         g_clear_object (&p->localed);
 
+#ifdef HAVE_FCITX
+        if (p->is_fcitx_active) {
+                if (p->fcitx_cancellable) {
+                        g_cancellable_cancel (p->fcitx_cancellable);
+                }
+
+                g_clear_object (&p->fcitx_cancellable);
+                g_clear_object (&p->fcitx);
+        }
+#endif
+
 #ifdef HAVE_IBUS
-        clear_ibus (manager);
+        if (p->is_ibus_active) {
+                clear_ibus (manager);
+        }
 #endif
 
         if (p->device_manager != NULL) {

=== added file 'plugins/keyboard/input-method-engines.gperf'
--- plugins/keyboard/input-method-engines.gperf	1970-01-01 00:00:00 +0000
+++ plugins/keyboard/input-method-engines.gperf	2015-02-12 15:57:03 +0000
@@ -0,0 +1,203 @@
+%pic
+%struct-type
+%readonly-tables
+%define slot-name ibus_engine
+%define hash-function-name ibus_engine_hash
+%define lookup-function-name get_engine_for_ibus_engine
+struct Engine { int ibus_engine; const char *fcitx_engine; };
+%%
+Unikey, "unikey"
+anthy, "anthy"
+array, "array30"
+array30, "array30"
+array30-big, "array30-big"
+bopomofo, "zhuyin-libpinyin"
+cangjie, "cangjie3"
+cangjie-big, "cangjie-big"
+cangjie3, "cangjie3"
+cangjie5, "cangjie5"
+cantonese, "cantonese"
+cantonhk, "cantonhk"
+chewing, "chewing"
+cns11643, "cns11643"
+compose, "compose"
+easy-big, "easy-big"
+emoji-table, "emoji"
+erbi, "erbi"
+erbi-qs, "erbi"
+googlepinyin, "googlepinyin"
+hangul, "hangul"
+# input-pad, NULL
+ipa-x-sampa, "ipa-x-sampa"
+jyutping, "jyutping"
+latex, "latex"
+libbopomofo, "zhuyin-libpinyin"
+libpinyin, "pinyin-libpinyin"
+libthai, "thai"
+m17n:am:sera, "m17n_am_sera"
+m17n:ar:kbd, "arabic"
+m17n:as:inscript, "m17n_as_inscript"
+m17n:as:itrans, "m17n_as_itrans"
+m17n:as:phonetic, "m17n_as_phonetic"
+m17n:ath:phonetic, "m17n_ath_phonetic"
+m17n:be:kbd, "fcitx-keyboard-by"
+m17n:bla:phonetic, "m17n_bla_phonetic"
+m17n:bn:disha, "m17n_bn_disha"
+m17n:bn:inscript, "m17n_bn_inscript"
+m17n:bn:itrans, "m17n_bn_itrans"
+m17n:bn:probhat, "m17n_bn_probhat"
+m17n:bn:unijoy, "m17n_bn_unijoy"
+m17n:bo:ewts, "m17n_bo_ewts"
+m17n:bo:tcrc, "m17n_bo_tcrc"
+m17n:bo:wylie, "m17n_bo_wylie"
+# m17n:cmc:kbd, NULL
+m17n:cr:western, "m17n_cr_western"
+m17n:cs:kbd, "fcitx-keyboard-cz-qwerty_bksl"
+m17n:da:post, "m17n_da_post"
+m17n:dv:phonetic, "m17n_dv_phonetic"
+m17n:el:kbd, "fcitx-keyboard-gr-simple"
+m17n:eo:h-fundamente, "m17n_eo_h-fundamente"
+m17n:eo:h-sistemo, "m17n_eo_h-sistemo"
+m17n:eo:plena, "m17n_eo_plena"
+m17n:eo:q-sistemo, "m17n_eo_q-sistemo"
+m17n:eo:vi-sistemo, "m17n_eo_vi-sistemo"
+m17n:eo:x-sistemo, "m17n_eo_x-sistemo"
+m17n:fa:isiri, "m17n_fa_isiri"
+m17n:fr:azerty, "m17n_fr_azerty"
+m17n:grc:mizuochi, "m17n_grc_mizuochi"
+m17n:gu:inscript, "m17n_gu_inscript"
+m17n:gu:itrans, "m17n_gu_itrans"
+m17n:gu:phonetic, "m17n_gu_phonetic"
+m17n:he:kbd, "fcitx-keyboard-il"
+m17n:hi:inscript, "m17n_hi_inscript"
+m17n:hi:itrans, "m17n_hi_itrans"
+m17n:hi:phonetic, "m17n_hi_phonetic"
+m17n:hi:remington, "m17n_hi_remington"
+m17n:hi:typewriter, "m17n_hi_typewriter"
+m17n:hi:vedmata, "m17n_hi_vedmata"
+m17n:hr:kbd, "fcitx-keyboard-hr"
+m17n:hy:kbd, "fcitx-keyboard-am-eastern-alt"
+m17n:ii:phonetic, "m17n_ii_phonetic"
+m17n:iu:phonetic, "m17n_iu_phonetic"
+m17n:ja:tcode, "m17n_ja_tcode"
+m17n:ja:trycode, "m17n_ja_trycode"
+m17n:ka:kbd, "fcitx-keyboard-ge"
+m17n:kk:arabic, "m17n_kk_arabic"
+m17n:kk:kbd, "fcitx-keyboard-kz"
+m17n:km:yannis, "m17n_km_yannis"
+m17n:kn:inscript, "m17n_kn_inscript"
+m17n:kn:itrans, "m17n_kn_itrans"
+m17n:kn:kgp, "m17n_kn_kgp"
+m17n:kn:typewriter, "m17n_kn_typewriter"
+# m17n:ko:han2, NULL
+# m17n:ko:romaja, NULL
+m17n:ks:inscript, "m17n_ks_inscript"
+m17n:ks:kbd, "m17n_ks_kbd"
+m17n:lo:kbd, "fcitx-keyboard-la-stea"
+m17n:lo:lrt, "m17n_lo_lrt"
+m17n:mai:inscript, "m17n_mai_inscript"
+m17n:ml:inscript, "m17n_ml_inscript"
+m17n:ml:itrans, "m17n_ml_itrans"
+m17n:ml:mozhi, "m17n_ml_mozhi"
+m17n:ml:remington, "m17n_ml_remington"
+m17n:ml:swanalekha, "m17n_ml_swanalekha"
+m17n:mr:inscript, "m17n_mr_inscript"
+m17n:mr:itrans, "m17n_mr_itrans"
+m17n:mr:phonetic, "m17n_mr_phonetic"
+m17n:my:kbd, "fcitx-keyboard-mm"
+m17n:ne:rom, "m17n_ne_rom"
+m17n:ne:trad, "m17n_ne_trad"
+m17n:nsk:phonetic, "m17n_nsk_phonetic"
+m17n:oj:phonetic, "m17n_oj_phonetic"
+m17n:or:inscript, "m17n_or_inscript"
+m17n:or:itrans, "m17n_or_itrans"
+m17n:or:phonetic, "m17n_or_phonetic"
+m17n:pa:anmollipi, "m17n_pa_anmollipi"
+m17n:pa:inscript, "m17n_pa_inscript"
+m17n:pa:itrans, "m17n_pa_itrans"
+m17n:pa:jhelum, "m17n_pa_jhelum"
+m17n:pa:phonetic, "m17n_pa_phonetic"
+m17n:ps:phonetic, "m17n_ps_phonetic"
+m17n:ru:kbd, "fcitx-keyboard-ru"
+m17n:ru:phonetic, "m17n_ru_phonetic"
+m17n:ru:translit, "m17n_ru_translit"
+m17n:ru:yawerty, "m17n_ru_yawerty"
+m17n:sa:IAST, "m17n_sa_IAST"
+m17n:sa:harvard-kyoto, "m17n_sa_harvard-kyoto"
+m17n:sa:itrans, "m17n_sa_itrans"
+m17n:sd:inscript, "m17n_sd_inscript"
+m17n:si:phonetic-dynamic, "m17n_si_phonetic-dynamic"
+m17n:si:samanala, "m17n_si_samanala"
+m17n:si:singlish, "m17n_si_singlish"
+m17n:si:sumihiri, "m17n_si_sumihiri"
+m17n:si:transliteration, "m17n_si_transliteration"
+m17n:si:wijesekera, "m17n_si_wijesekera"
+m17n:sk:kbd, "fcitx-keyboard-sk"
+m17n:sr:kbd, "fcitx-keyboard-rs"
+m17n:sv:post, "m17n_sv_post"
+m17n:t:latn-post, "m17n_t_latn-post"
+m17n:t:latn-pre, "m17n_t_latn-pre"
+m17n:t:math-latex, "m17n_t_math-latex"
+m17n:t:rfc1345, "m17n_t_rfc1345"
+m17n:t:syrc-phonetic, "m17n_t_syrc-phonetic"
+m17n:t:unicode, "m17n_t_unicode"
+m17n:ta:inscript, "m17n_ta_inscript"
+m17n:ta:itrans, "m17n_ta_itrans"
+m17n:ta:lk-renganathan, "m17n_ta_lk-renganathan"
+m17n:ta:phonetic, "m17n_ta_phonetic"
+m17n:ta:tamil99, "m17n_ta_tamil99"
+m17n:ta:typewriter, "m17n_ta_typewriter"
+m17n:ta:vutam, "m17n_ta_vutam"
+m17n:tai:sonla-kbd, "m17n_tai_sonla-kbd"
+m17n:te:apple, "m17n_te_apple"
+m17n:te:inscript, "m17n_te_inscript"
+m17n:te:itrans, "m17n_te_itrans"
+m17n:te:pothana, "m17n_te_pothana"
+m17n:te:rts, "m17n_te_rts"
+m17n:te:sarala, "m17n_te_sarala"
+m17n:th:kesmanee, "m17n_th_kesmanee"
+m17n:th:pattachote, "m17n_th_pattachote"
+m17n:th:tis820, "m17n_th_tis820"
+m17n:ua:kbd, "fcitx-keyboard-ua"
+m17n:ug:kbd, "fcitx-keyboard-cn-ug"
+m17n:ur:phonetic, "m17n_ur_phonetic"
+m17n:uz:kbd, "fcitx-keyboard-uz"
+m17n:vi:han, "m17n_vi_han"
+m17n:vi:nomtelex, "m17n_vi_nomtelex"
+m17n:vi:nomvni, "m17n_vi_nomvni"
+m17n:vi:tcvn, "m17n_vi_tcvn"
+m17n:vi:telex, "m17n_vi_telex"
+m17n:vi:viqr, "m17n_vi_viqr"
+m17n:vi:vni, "m17n_vi_vni"
+m17n:yi:yivo, "m17n_yi_yivo"
+m17n:zh:bopomofo, "m17n_zh_bopomofo"
+m17n:zh:cangjie, "cangjie3"
+m17n:zh:pinyin, "m17n_zh_pinyin"
+m17n:zh:pinyin-vi, "m17n_zh_pinyin-vi"
+# m17n:zh:py, NULL
+m17n:zh:quick, "quick3"
+# m17n:zh:tonepy, NULL
+mozc-jp, "mozc"
+pinyin, "pinyin"
+quick, "quick3"
+quick-classic, "quick-classic"
+quick3, "quick3"
+quick5, "quick5"
+rime, "rime"
+rustrad, "rustrad"
+scj6, "scj6"
+skk, "skk"
+stroke5, "stroke5"
+sunpinyin, "sunpinyin"
+# tegaki, NULL
+thai, "thai"
+translit, "translit"
+translit-ua, "translit-ua"
+viqr, "viqr"
+wu, "wu"
+wubi-haifeng86, "wubi"
+wubi-jidian86, "wubi"
+# xkbc, NULL
+yawerty, "yawerty"
+# yong, NULL
+%%

=== modified file 'plugins/media-keys/gsd-media-keys-manager.c'
--- plugins/media-keys/gsd-media-keys-manager.c	2014-12-03 02:42:39 +0000
+++ plugins/media-keys/gsd-media-keys-manager.c	2015-02-12 15:57:03 +0000
@@ -67,6 +67,10 @@
 
 #include <libnotify/notify.h>
 
+#ifdef HAVE_FCITX
+#include <fcitx-gclient/fcitxinputmethod.h>
+#endif
+
 #define GSD_MEDIA_KEYS_DBUS_PATH GSD_DBUS_PATH "/MediaKeys"
 #define GSD_MEDIA_KEYS_DBUS_NAME GSD_DBUS_NAME ".MediaKeys"
 
@@ -116,10 +120,20 @@
 
 #define VOLUME_STEP 6           /* percents for one volume button press */
 
+#define ENV_GTK_IM_MODULE   "GTK_IM_MODULE"
+#define GTK_IM_MODULE_IBUS  "ibus"
+#define GTK_IM_MODULE_FCITX "fcitx"
+
 #define GNOME_DESKTOP_INPUT_SOURCES_DIR "org.gnome.desktop.input-sources"
 #define KEY_CURRENT_INPUT_SOURCE "current"
 #define KEY_INPUT_SOURCES        "sources"
 
+#define INPUT_SOURCE_TYPE_XKB   "xkb"
+#define INPUT_SOURCE_TYPE_IBUS  "ibus"
+#define INPUT_SOURCE_TYPE_FCITX "fcitx"
+
+#define FCITX_XKB_PREFIX "fcitx-keyboard-"
+
 #define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
 #define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
 #define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
@@ -218,6 +232,13 @@
         guint           panel_name_owner_id;
         guint           have_legacy_keygrabber;
 
+#ifdef HAVE_FCITX
+        FcitxInputMethod *fcitx;
+#endif
+
+        gboolean         is_ibus_active;
+        gboolean         is_fcitx_active;
+
         /* What did you plug in dialog */
         pa_backend      *wdypi_pa_backend;
 };
@@ -2131,16 +2152,53 @@
 
 }
 
+#ifdef HAVE_FCITX
+static gchar *
+get_fcitx_name (const gchar *name)
+{
+        gchar *fcitx_name = g_strdup (name);
+        gchar *separator = strchr (fcitx_name, '+');
+
+        if (separator)
+                *separator = '-';
+
+        return fcitx_name;
+}
+
+static gboolean
+input_source_is_fcitx_engine (const gchar *type,
+                              const gchar *name,
+                              const gchar *engine)
+{
+        if (g_str_equal (type, INPUT_SOURCE_TYPE_XKB)) {
+                if (g_str_has_prefix (engine, FCITX_XKB_PREFIX)) {
+                        gboolean equal;
+                        gchar *fcitx_name = get_fcitx_name (name);
+                        equal = g_str_equal (fcitx_name, engine + strlen (FCITX_XKB_PREFIX));
+                        g_free (fcitx_name);
+                        return equal;
+                }
+        } else if (g_str_equal (type, INPUT_SOURCE_TYPE_FCITX)) {
+                return g_str_equal (name, engine);
+        }
+
+        return FALSE;
+}
+#endif
+
 static void
 do_switch_input_source_action (GsdMediaKeysManager *manager,
                                MediaKeyType         type)
 {
+        GsdMediaKeysManagerPrivate *priv = manager->priv;
         GSettings *settings;
         GVariant *sources;
+        const gchar *source_type;
+        guint first;
         gint i, n;
 
         if (g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "ubuntu") != 0)
-                if (!manager->priv->have_legacy_keygrabber)
+                if (!priv->have_legacy_keygrabber)
                         return;
 
         settings = g_settings_new (GNOME_DESKTOP_INPUT_SOURCES_DIR);
@@ -2150,19 +2208,52 @@
         if (n < 2)
                 goto out;
 
-        i = g_settings_get_uint (settings, KEY_CURRENT_INPUT_SOURCE);
-
-        if (type == SWITCH_INPUT_SOURCE_KEY)
-                i += 1;
-        else
-                i -= 1;
+        i = -1;
+
+#ifdef HAVE_FCITX
+        if (priv->is_fcitx_active && priv->fcitx) {
+                gchar *engine = fcitx_input_method_get_current_im (priv->fcitx);
+
+                if (engine) {
+                        GVariantIter iter;
+                        const gchar *source_name;
+
+                        g_variant_iter_init (&iter, sources);
+                        for (i = 0; g_variant_iter_next (&iter, "(&s&s)", &source_type, &source_name); i++) {
+                                if (input_source_is_fcitx_engine (source_type, source_name, engine)) {
+                                        break;
+                                }
+                        }
+
+                        if (i >= g_variant_n_children (sources))
+                                i = -1;
+
+                        g_free (engine);
+                }
+        }
+#endif
 
         if (i < 0)
-                i = n - 1;
-        else if (i >= n)
-                i = 0;
-
-        g_settings_set_uint (settings, KEY_CURRENT_INPUT_SOURCE, i);
+                i = g_settings_get_uint (settings, KEY_CURRENT_INPUT_SOURCE);
+
+        first = i;
+
+        if (type == SWITCH_INPUT_SOURCE_KEY) {
+                do {
+                        i = (i + 1) % n;
+                        g_variant_get_child (sources, i, "(&s&s)", &source_type, NULL);
+                } while (i != first && ((g_str_equal (source_type, INPUT_SOURCE_TYPE_IBUS) && !priv->is_ibus_active) ||
+                                        (g_str_equal (source_type, INPUT_SOURCE_TYPE_FCITX) && !priv->is_fcitx_active)));
+        } else {
+                do {
+                        i = (i + n - 1) % n;
+                        g_variant_get_child (sources, i, "(&s&s)", &source_type, NULL);
+                } while (i != first && ((g_str_equal (source_type, INPUT_SOURCE_TYPE_IBUS) && !priv->is_ibus_active) ||
+                                        (g_str_equal (source_type, INPUT_SOURCE_TYPE_FCITX) && !priv->is_fcitx_active)));
+        }
+
+        if (i != first)
+                g_settings_set_uint (settings, KEY_CURRENT_INPUT_SOURCE, i);
 
  out:
         g_variant_unref (sources);
@@ -2931,11 +3022,35 @@
 static gboolean
 start_media_keys_idle_cb (GsdMediaKeysManager *manager)
 {
+        const gchar *module;
         char *theme_name;
 
         g_debug ("Starting media_keys manager");
         gnome_settings_profile_start (NULL);
 
+        module = g_getenv (ENV_GTK_IM_MODULE);
+#ifdef HAVE_IBUS
+        manager->priv->is_ibus_active = g_strcmp0 (module, GTK_IM_MODULE_IBUS) == 0;
+#endif
+#ifdef HAVE_FCITX
+        manager->priv->is_fcitx_active = g_strcmp0 (module, GTK_IM_MODULE_FCITX) == 0;
+
+        if (manager->priv->is_fcitx_active) {
+                GError *error = NULL;
+
+                manager->priv->fcitx = fcitx_input_method_new (G_BUS_TYPE_SESSION,
+                                                               G_DBUS_PROXY_FLAGS_NONE,
+                                                               0,
+                                                               NULL,
+                                                               &error);
+
+                if (!manager->priv->fcitx) {
+                        g_warning ("Fcitx connection unavailable: %s", error->message);
+                        g_error_free (error);
+                }
+        }
+#endif
+
         manager->priv->keys = g_ptr_array_new_with_free_func ((GDestroyNotify) media_key_free);
 
         initialize_volume_handler (manager);