Fixed some bugs.

Fixed Thumb Shift mode. timeout_and_full is no longer available in pygobject3.
Fixed __cmd_circle_dict_method
Used setxkbmap in Thumb Shift mode. until Gdk.property_get is fixed.
Removed Hiragana_Katanaka in circle_kana_mode for latin_with_shift

3 files changed, 53 insertions, 16 deletions

diff --git a/engine/engine.py b/engine/engine.py
index 53b5beb..c947878 100644
--- a/engine/engine.py
+++ b/engine/engine.py
@@ -1885,9 +1885,7 @@ class Engine(IBus.EngineSimple):
             self._H = None
 
         def start(t):
-            self._H = GLib.timeout_add_full(GLib.PRIORITY_DEFAULT,
-                                            t, on_timeout, keyval,
-                                            None)
+            self._H = GLib.timeout_add(t, on_timeout, keyval)
 
         def stop():
             if self._H:
@@ -2195,6 +2193,12 @@ class Engine(IBus.EngineSimple):
         if not self._chk_mode('0'):
             return False
 
+        # ibus 1.5 or later needs to send UNCHECKED
+        prop_name = self.__dict_mode_get_prop_name(Engine.__dict_mode)
+        if prop_name != None:
+            self.__dict_mode_activate(prop_name,
+                                      IBus.PropState.UNCHECKED)
+
         single_files = self.__get_single_dict_files()
         new_mode = Engine.__dict_mode + 1
         if new_mode > len(single_files):
diff --git a/engine/thumb.py b/engine/thumb.py
index 5c569d5..24f6d7d 100644
--- a/engine/thumb.py
+++ b/engine/thumb.py
@@ -27,6 +27,7 @@ __all__ = (
         'ThumbShiftSegment',
     )
 
+from gi.repository import GLib
 from gi.repository import IBus
 
 try:
@@ -388,6 +389,8 @@ class ThumbShiftKeyboard:
         return (keyval, state)
 
     def __get_xkb_layout(self):
+        # Until Gdk.property_get is fixed
+        '''
         root_window = get_default_root_window()
         if not root_window:
             return 0
@@ -416,6 +419,45 @@ class ThumbShiftKeyboard:
             elif data.find('japan:') >= 0:
                 layout = 0
         return layout
+        '''
+
+        layout = 0
+        argv = ['setxkbmap', '-query']
+        (ret, std_out, std_error, exit_status) = \
+                GLib.spawn_sync(None, argv, None,
+                                GLib.SpawnFlags.SEARCH_PATH_FROM_ENVP,
+                                None, None)
+        if not ret:
+            print >> sys.stderr, std_error
+            return layout
+        for line in std_out.split('\n'):
+            if line.startswith('layout:'):
+                data = line.split()[1]
+                if data == 'jp':
+                    layout = 0
+                elif data == 'us':
+                    layout = 1
+            elif line.startswith('options:'):
+                data = line.split()[1]
+                if data.find('japan:nicola_f_bs') >= 0:
+                    layout = 2
+                elif data.find('japan:') >= 0:
+                    layout = 0
+        return 0
+
+    def __reset_layout_and_handakuten(self):
+        mode = self.__prefs.get_value('thumb', 'keyboard_layout_mode')
+        layout = 0
+        if mode == 1:
+            layout = self.__get_xkb_layout()
+        else:
+            layout = self.__prefs.get_value('thumb', 'keyboard_layout')
+        self.set_layout(layout)
+
+        fmv_extension = self.__prefs.get_value('thumb', 'fmv_extension')
+        self.set_fmv_extension(fmv_extension)
+        handakuten = self.__prefs.get_value('thumb', 'handakuten')
+        self.set_handakuten(handakuten)
 
     def reset(self):
         s = self.__prefs.get_value('thumb', 'ls')
@@ -435,18 +477,8 @@ class ThumbShiftKeyboard:
         self.set_t1(t1)
         self.set_t2(t2)
 
-        mode = self.__prefs.get_value('thumb', 'keyboard_layout_mode')
-        layout = 0
-        if mode == 1:
-            layout = self.__get_xkb_layout()
-        else:
-            layout = self.__prefs.get_value('thumb', 'keyboard_layout')
-        self.set_layout(layout)
-
-        fmv_extension = self.__prefs.get_value('thumb', 'fmv_extension')
-        self.set_fmv_extension(fmv_extension)
-        handakuten = self.__prefs.get_value('thumb', 'handakuten')
-        self.set_handakuten(handakuten)
+        GLib.idle_add(self.__reset_layout_and_handakuten,
+                      priority = GLib.PRIORITY_LOW)
 
     def get_ls(self):
         return self.__ls
diff --git a/setup/anthyprefs.py.in b/setup/anthyprefs.py.in
index d4a1f81..3bd72cc 100644
--- a/setup/anthyprefs.py.in
+++ b/setup/anthyprefs.py.in
@@ -1138,7 +1138,8 @@ _config = {
 _shortcut_default = {
     'on_off': [@ON_OFF_KEYS@],
     'circle_input_mode': ['Ctrl+comma', 'Ctrl+less'],
-    'circle_kana_mode': ['Ctrl+period', 'Ctrl+greater', 'Hiragana_Katakana'],
+    # Removed Hiragana_Katakana key in circle_kana_mode for latin_with_shift.
+    'circle_kana_mode': ['Ctrl+period', 'Ctrl+greater'],
 #    'cancel_pseudo_ascii_mode_key': ['Escape'],
     'circle_typing_method': ['Alt+Romaji', 'Ctrl+slash'],
     'circle_dict_method': ['Alt+Henkan'],