summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorfujiwarat <takao.fujiwara1@gmail.com>2015-09-18 17:23:14 +0900
committerfujiwarat <takao.fujiwara1@gmail.com>2015-09-18 17:23:14 +0900
commit0fc8cc7eff39a8fe7f1689affa47fdc779570df5 (patch)
treeabfa517c18a8e3da2eb75afd937b7669d6ffbf86 /engine
parent7e4a3c960daedab1f1ed8daa8ec9ef85ca86f87d (diff)
downloadibus-anthy-0fc8cc7eff39a8fe7f1689affa47fdc779570df5.tar.gz
Implement "Automatically commit" with periods.
Diffstat (limited to 'engine')
-rw-r--r--engine/python2/engine.py23
-rw-r--r--engine/python3/engine.py22
2 files changed, 33 insertions, 12 deletions
diff --git a/engine/python2/engine.py b/engine/python2/engine.py
index 032e386..fd1dc00 100644
--- a/engine/python2/engine.py
+++ b/engine/python2/engine.py
@@ -1753,9 +1753,14 @@ class Engine(IBus.EngineSimple):
try:
self._MM = self._SS = 0
ret = self.__on_key_common(ord(keyval))
- if (keyval in u',.、。' and
- self.__prefs.get_value('common', 'behavior_on_period')):
- return self.__cmd_convert(keyval, state)
+ if (keyval in
+ UN(self.__prefs.get_value('common', 'trigger_periods'))):
+ behavior = self.__prefs.get_value('common',
+ 'behavior_on_period')
+ if behavior == 1:
+ return self.__cmd_convert(keyval, state)
+ elif behavior == 2:
+ return self.__cmd_commit(keyval, state)
return ret
except:
pass
@@ -1919,9 +1924,15 @@ class Engine(IBus.EngineSimple):
keyval = IBus.KEY_yen
ret = self.__on_key_common(keyval, state)
if (Engine.__input_mode != INPUT_MODE_LATIN and
- unichr(keyval) in u',.' and
- self.__prefs.get_value('common', 'behavior_on_period')):
- return self.__cmd_convert(keyval, state)
+ unichr(keyval) in
+ UN(self.__prefs.get_value('common', 'trigger_periods'))):
+ behavior = self.__prefs.get_value('common',
+ 'behavior_on_period')
+ if behavior == 1:
+ return self.__cmd_convert(keyval, state)
+ elif behavior == 2:
+ return self.__cmd_commit(keyval, state)
+
return ret
else:
if not self.__preedit_ja_string.is_empty():
diff --git a/engine/python3/engine.py b/engine/python3/engine.py
index 3c0072a..523e246 100644
--- a/engine/python3/engine.py
+++ b/engine/python3/engine.py
@@ -1747,9 +1747,14 @@ class Engine(IBus.EngineSimple):
try:
self._MM = self._SS = 0
ret = self.__on_key_common(ord(keyval))
- if (keyval in ',.、。' and
- self.__prefs.get_value('common', 'behavior_on_period')):
- return self.__cmd_convert(keyval, state)
+ if (keyval in
+ self.__prefs.get_value('common', 'trigger_periods')):
+ behavior = self.__prefs.get_value('common',
+ 'behavior_on_period')
+ if behavior == 1:
+ return self.__cmd_convert(keyval, state)
+ elif behavior == 2:
+ return self.__cmd_commit(keyval, state)
return ret
except:
pass
@@ -1913,9 +1918,14 @@ class Engine(IBus.EngineSimple):
keyval = IBus.KEY_yen
ret = self.__on_key_common(keyval, state)
if (Engine.__input_mode != INPUT_MODE_LATIN and
- chr(keyval) in ',.' and
- self.__prefs.get_value('common', 'behavior_on_period')):
- return self.__cmd_convert(keyval, state)
+ chr(keyval) in
+ self.__prefs.get_value('common', 'trigger_periods')):
+ behavior = self.__prefs.get_value('common',
+ 'behavior_on_period')
+ if behavior == 1:
+ return self.__cmd_convert(keyval, state)
+ elif behavior == 2:
+ return self.__cmd_commit(keyval, state)
return ret
else:
if not self.__preedit_ja_string.is_empty():