Merge the devel branch

bus/test-client.c

 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* bus - The Input Bus
  * Copyright (C) 2010 Google 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.
  *
@@ skipping 94 matching lines @@
     ibus_input_context_set_capabilities (client->ibuscontext, client->caps);
 
     active_engine_name = _get_active_engine_name ();
 
     g_return_if_fail (active_engine_name != NULL);
     IDEBUG ("engine:%s", active_engine_name);
     ibus_input_context_focus_in (client->ibuscontext);
     ibus_input_context_set_engine (client->ibuscontext, active_engine_name);
     g_free (active_engine_name);
 
-    ibus_input_context_enable (client->ibuscontext);
     client->enabled = TRUE;
 }
 
 static void
 bus_test_client_destroy (IBusObject *object)
 {
     IDEBUG ("%s", __FUNCTION__);
     BusTestClient *client = BUS_TEST_CLIENT (object);
 
     g_object_unref (client->ibuscontext);
@@ skipping 47 matching lines @@
                                               keysym,
                                               keycode,
                                               state);
         _store_modifier_state (client, keysym);
     } else {
         IDEBUG ("key: %d is not modifier.", keysym);
         gboolean is_upper = !gdk_keyval_is_lower (keysym);
         gboolean is_shift_set = _is_shift_set (client);
 
         if (is_upper && !is_shift_set) {
-            _store_modifier_state (client, IBUS_Shift_L);
+            _store_modifier_state (client, IBUS_KEY_Shift_L);
         }
         keycode = _get_keysym_to_keycode (keysym);
         state = _get_modifiers_to_mask (client);
         ibus_input_context_process_key_event (client->ibuscontext,
                                               keysym,
                                               keycode,
                                               state);
         state |= IBUS_RELEASE_MASK;
         ibus_input_context_process_key_event (client->ibuscontext,
                                               keysym,
                                               keycode,
                                               state);
         if (is_upper && !is_shift_set) {
-            _store_modifier_state (client, IBUS_Shift_L);
+            _store_modifier_state (client, IBUS_KEY_Shift_L);
         }
     }
     return TRUE;
 }
 
 void bus_test_client_clear_modifier (BusTestClient *client)
 {
     int i;
     for (i = 0; i < MODIFIER_KEY_NUM; i++) {
         (client->modifier)[i] = FALSE;
     }
 }
 
 static gchar *
 _get_active_engine_name (void)
 {
     GList *engines;
     gchar *result;
 
     engines = ibus_bus_list_active_engines (_bus);
     if (engines == NULL) {
         return NULL;
     }
 
     IBusEngineDesc *engine_desc = IBUS_ENGINE_DESC (engines->data);
     if (engine_desc != NULL) {
-        result = g_strdup (engine_desc->name);
+        result = g_strdup (ibus_engine_desc_get_name(engine_desc));
     } else {
         result = NULL;
     }
 
     for (; engines != NULL; engines = g_list_next (engines)) {
         g_object_unref (IBUS_ENGINE_DESC (engines->data));
     }
     g_list_free (engines);
 
     return result;
 }
 
 static void
 _store_modifier_state (BusTestClient    *client,
                        guint         modifier)
 {
     switch(modifier) {
-    case IBUS_Shift_L:
-    case IBUS_Shift_R:
+    case IBUS_KEY_Shift_L:
+    case IBUS_KEY_Shift_R:
         /* ShiftMask */
         client->modifier[0] = !client->modifier[0];
         break;
-    case IBUS_Shift_Lock:
-    case IBUS_Caps_Lock:
+    case IBUS_KEY_Shift_Lock:
+    case IBUS_KEY_Caps_Lock:
         /* LockMask */
         client->modifier[1] = !client->modifier[1];
         break;
-    case IBUS_Control_L:
-    case IBUS_Control_R:
+    case IBUS_KEY_Control_L:
+    case IBUS_KEY_Control_R:
         /* ControlMask */
         client->modifier[2] = !client->modifier[2];
         break;
-    case IBUS_Alt_L:
-    case IBUS_Alt_R:
-    case IBUS_Meta_L:
+    case IBUS_KEY_Alt_L:
+    case IBUS_KEY_Alt_R:
+    case IBUS_KEY_Meta_L:
         /* Mod1Mask */
         client->modifier[3] = !client->modifier[3];
         break;
-    case IBUS_Num_Lock:
+    case IBUS_KEY_Num_Lock:
         /* Mod2Mask */
         client->modifier[4] = !client->modifier[4];
         break;
-    case IBUS_Super_L:
-    case IBUS_Hyper_L:
+    case IBUS_KEY_Super_L:
+    case IBUS_KEY_Hyper_L:
         /* Mod4Mask */
         client->modifier[5] = !client->modifier[5];
         break;
-    case IBUS_ISO_Level3_Shift:
-    case IBUS_Mode_switch:
+    case IBUS_KEY_ISO_Level3_Shift:
+    case IBUS_KEY_Mode_switch:
         /* Mod5Mask */
         client->modifier[6] = !client->modifier[6];
         break;
     default:
         break;
     }
 }
 
 static gint16
 _get_keysym_to_keycode (guint keysym)
 {
     return XKeysymToKeycode (_xdisplay, keysym);
 }
 
 static gboolean
 _is_shift_set (BusTestClient *client)
 {
     return client->modifier[0];
 }
 
 static gboolean
 _is_modifier_set (BusTestClient *client,
                   guint      modifier)
 {
     switch(modifier) {
-    case IBUS_Shift_L:
-    case IBUS_Shift_R:
+    case IBUS_KEY_Shift_L:
+    case IBUS_KEY_Shift_R:
         /* ShiftMask */
         return client->modifier[0];
-    case IBUS_Shift_Lock:
-    case IBUS_Caps_Lock:
+    case IBUS_KEY_Shift_Lock:
+    case IBUS_KEY_Caps_Lock:
         /* LockMask */
         return client->modifier[1];
-    case IBUS_Control_L:
-    case IBUS_Control_R:
+    case IBUS_KEY_Control_L:
+    case IBUS_KEY_Control_R:
         /* ControlMask */
         return client->modifier[2];
-    case IBUS_Alt_L:
-    case IBUS_Alt_R:
-    case IBUS_Meta_L:
+    case IBUS_KEY_Alt_L:
+    case IBUS_KEY_Alt_R:
+    case IBUS_KEY_Meta_L:
         /* Mod1Mask */
         return client->modifier[3];
-    case IBUS_Num_Lock:
+    case IBUS_KEY_Num_Lock:
         /* Mod2Mask */
         return client->modifier[4];
-    case IBUS_Super_L:
-    case IBUS_Hyper_L:
+    case IBUS_KEY_Super_L:
+    case IBUS_KEY_Hyper_L:
         /* Mod4Mask */
         return client->modifier[5];
-    case IBUS_ISO_Level3_Shift:
-    case IBUS_Mode_switch:
+    case IBUS_KEY_ISO_Level3_Shift:
+    case IBUS_KEY_Mode_switch:
         /* Mod5Mask */
         return client->modifier[6];
     default:
         return FALSE;
     }
 }
 
 static gboolean
 _is_modifier_key (guint modifier)
 {
     switch(modifier) {
-    case IBUS_Shift_L:
-    case IBUS_Shift_R:
-    case IBUS_Shift_Lock:
-    case IBUS_Caps_Lock:
-    case IBUS_Control_L:
-    case IBUS_Control_R:
-    case IBUS_Alt_L:
-    case IBUS_Alt_R:
-    case IBUS_Meta_L:
-    case IBUS_Num_Lock:
-    case IBUS_Super_L:
-    case IBUS_Hyper_L:
-    case IBUS_ISO_Level3_Shift:
-    case IBUS_Mode_switch:
+    case IBUS_KEY_Shift_L:
+    case IBUS_KEY_Shift_R:
+    case IBUS_KEY_Shift_Lock:
+    case IBUS_KEY_Caps_Lock:
+    case IBUS_KEY_Control_L:
+    case IBUS_KEY_Control_R:
+    case IBUS_KEY_Alt_L:
+    case IBUS_KEY_Alt_R:
+    case IBUS_KEY_Meta_L:
+    case IBUS_KEY_Num_Lock:
+    case IBUS_KEY_Super_L:
+    case IBUS_KEY_Hyper_L:
+    case IBUS_KEY_ISO_Level3_Shift:
+    case IBUS_KEY_Mode_switch:
         return TRUE;
     default:
         return FALSE;
     }
 }
 
 static guint
 _get_modifiers_to_mask (BusTestClient *client)
 {
     guint retval = 0;
@@ skipping 29 matching lines @@
 _bus_disabled_cb (IBusInputContext  *ibuscontext,
                   BusTestClient         *client)
 {
     g_assert (IBUS_IS_INPUT_CONTEXT (ibuscontext));
     g_assert (BUS_IS_TEST_CLIENT (client));
     IDEBUG ("%s", __FUNCTION__);
     client->enabled = FALSE;
     IDEBUG ("Disabled ibus engine");
 }