ibus-typing-booster December 2015

ibus-typing-booster@lists.fedorahosted.org

1 participants
53 discussions

[ibus-typing-booster] release-1.3.0: Improve code to select candidates to commit or to remove (ceb4383)
by mfabian＠fedoraproject.org 16 Dec '15

16 Dec '15

1 0

[ibus-typing-booster] release-1.3.0: Expand the KeyEvent class a bit to make it easier to convert keys to Msymbols (e0934dc)
by mfabian＠fedoraproject.org 16 Dec '15

16 Dec '15

1 0

[ibus-typing-booster] release-1.3.0: Remove code to just pass Control and Alternate through (027203b)
by mfabian＠fedoraproject.org 16 Dec '15

16 Dec '15

1 0

[ibus-typing-booster] release-1.3.0: Use Transliterator from m17n_translit.py (9befbc6)
by mfabian＠fedoraproject.org 16 Dec '15

16 Dec '15

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : release-1.3.0 >--------------------------------------------------------------- commit 9befbc680793016cc2b1ca57108c9bafc0e5b8d8 Author: Mike FABIAN <mfabian(a)redhat.com> Date: Tue Dec 8 14:32:55 2015 +0100 Use Transliterator from m17n_translit.py >--------------------------------------------------------------- ibus-typing-booster/engine/hunspell_table.py | 62 ++++++++++--------------- 1 files changed, 25 insertions(+), 37 deletions(-) diff --git a/ibus-typing-booster/engine/hunspell_table.py b/ibus-typing-booster/engine/hunspell_table.py index 6aca2eb..69629d5 100644 --- a/ibus-typing-booster/engine/hunspell_table.py +++ b/ibus-typing-booster/engine/hunspell_table.py @@ -28,17 +28,11 @@ import unicodedata import re from gi.repository import IBus from gi.repository import GLib +from m17n_translit import Transliterator import itb_util debug_level = int(0) -try: - from gi.repository import Translit - Transliterator = Translit.Transliterator -except: - import traceback - traceback.print_exc() - from gettext import dgettext _ = lambda a : dgettext ("ibus-typing-booster", a) N_ = lambda a : a @@ -102,9 +96,9 @@ class editor(object): self._min_char_complete = 1 # minimum if self._min_char_complete > 9: self._min_char_complete = 9 # maximum - self._typed_string = u'' + self._typed_string = [] self._typed_string_cursor = 0 - self._typed_string_when_update_candidates_was_last_called = u'' + self._typed_string_when_update_candidates_was_last_called = [] self._transliterated_string = u'' self._p_phrase = u'' self._pp_phrase = u'' @@ -147,10 +141,11 @@ class editor(object): try: if debug_level > 1: sys.stderr.write( - "calling Transliterator.get(%(m17n)s, %(cur)s)\n" - %{'m17n': self._m17ndb, 'cur': self._current_ime}) - self.trans = Transliterator.get(self._m17ndb, self._current_ime) - except: + "calling Transliterator(%(cur)s)\n" + %{'cur': self._current_ime}) + self.trans = Transliterator(self._current_ime) + except ValueError as e: + sys.stderr.write('Error initializing Transliterator: %s' %e) import traceback traceback.print_exc() @@ -162,15 +157,15 @@ class editor(object): self._lookup_table.clear() self._lookup_table.set_cursor_visible(False) self._candidates = [] - self._typed_string = u'' + self._typed_string = [] self._typed_string_cursor = 0 - self._typed_string_when_update_candidates_was_last_called = u'' + self._typed_string_when_update_candidates_was_last_called = [] self._transliterated_string = u'' def update_transliterated_string(self): if self.trans_m17n_mode: self._transliterated_string = self.trans.transliterate( - self._typed_string)[0] + self._typed_string) if type(self._transliterated_string) != type(u''): self._transliterated_string = ( self._transliterated_string.decode('UTF-8')) @@ -178,22 +173,15 @@ class editor(object): self._transliterated_string = unicodedata.normalize( 'NFKD', self._transliterated_string) else: - self._transliterated_string = self._typed_string + self._transliterated_string = u''.join.self._typed_string if debug_level > 1: sys.stderr.write( "update_transliterated_string() self._typed_string=%s\n" - %self._typed_string.encode('UTF-8')) - sys.stderr.write( - "update_transliterated_string() repr(self._typed_string)=%s\n" - %repr(self._typed_string)) + %self._typed_string) sys.stderr.write( "update_transliterated_string() " + "self._transliterated_string=%s\n" - %self._transliterated_string.encode('UTF-8')) - sys.stderr.write( - "update_transliterated_string() " - + "repr(self._transliterated_string)=%s\n" - %repr(self._transliterated_string)) + %self._transliterated_string) def get_transliterated_string(self): return self._transliterated_string @@ -202,10 +190,10 @@ class editor(object): '''Insert typed string at cursor position''' if debug_level > 1: sys.stderr.write("insert_string_at_cursor() string_to_insert=%s\n" - %string_to_insert.encode('UTF-8')) + %string_to_insert) sys.stderr.write("insert_string_at_cursor() " + "self._typed_string=%s\n" - %self._typed_string.encode('UTF-8')) + %self._typed_string) sys.stderr.write("insert_string_at_cursor() " + "self._typed_string_cursor=%s\n" %self._typed_string_cursor) @@ -258,7 +246,7 @@ class editor(object): position can only be approximated from the cursor position in the typed string. - For example, if the type string is ��gru"n�� and the + For example, if the typed string is ��gru"n�� and the transliteration method used is ��Latin Postfix��, this transliterates to ��gr��n��. Now if the cursor position in the typed string is ��3��, then the cursor is between the ��u�� @@ -293,13 +281,13 @@ class editor(object): ''' if self.trans_m17n_mode: transliterated_string_up_to_cursor = self.trans.transliterate( - self._typed_string[:self._typed_string_cursor])[0] + self._typed_string[:self._typed_string_cursor]) if type(transliterated_string_up_to_cursor) != type(u''): transliterated_string_up_to_cursor = ( transliterated_string_up_to_cursor.decode('UTF-8')) else: transliterated_string_up_to_cursor = ( - self._typed_string[:self._typed_string_cursor]) + u''.join(self._typed_string[:self._typed_string_cursor])) if self._current_ime in ['ko-romaja', 'ko-han2']: transliterated_string_up_to_cursor = unicodedata.normalize( 'NFKD', transliterated_string_up_to_cursor) @@ -366,7 +354,7 @@ class editor(object): '''Update lookuptable''' if debug_level > 1: sys.stderr.write("update_candidates() self._typed_string=%s\n" - %self._typed_string.encode('UTF-8')) + %self._typed_string) if (self._typed_string == self._typed_string_when_update_candidates_was_last_called): # The input did not change since we came here last, do @@ -517,7 +505,7 @@ class editor(object): # the remembered list of transliterated characters to # force update_candidates() to really do something and not # return immediately: - self._typed_string_when_update_candidates_was_last_called = u'' + self._typed_string_when_update_candidates_was_last_called = [] self.update_candidates() return True else: @@ -966,7 +954,7 @@ class tabengine (IBus.Engine): token = match.group('token') self.delete_surrounding_text(-1-len(token), 1+len(token)) self.get_context() - self._editor.insert_string_at_cursor(token) + self._editor.insert_string_at_cursor(list(token)) self._update_ui() return True if (key.val >= 32 @@ -999,7 +987,7 @@ class tabengine (IBus.Engine): # therefore we cannot just pass it through. Just # add it to the input so far and see what comes # next: - self._editor.insert_string_at_cursor(typed_character) + self._editor.insert_string_at_cursor(list(typed_character)) self._update_ui() return True if (typed_character @@ -1014,7 +1002,7 @@ class tabengine (IBus.Engine): # want ��3�� to be converted to ��. So we try # to transliterate and commit the result: transliterated_digit = self._editor.trans.transliterate( - typed_character)[0] + list(typed_character)) if type(transliterated_digit) != type(u''): transliterated_digit = ( transliterated_digit.decode('utf8')) @@ -1216,7 +1204,7 @@ class tabengine (IBus.Engine): sys.stderr.write( "MOD5_MASK=%(bit)s\n" %{'bit': key.state & IBus.ModifierType.MOD5_MASK}) - self._editor.insert_string_at_cursor(typed_character) + self._editor.insert_string_at_cursor(list(typed_character)) if (typed_character and unicodedata.category(typed_character) in itb_util.categories_to_trigger_immediate_commit):

1 0

[ibus-typing-booster] release-1.3.0: Add some comments (7ad1d56)
by mfabian＠fedoraproject.org 16 Dec '15

16 Dec '15

1 0

[ibus-typing-booster] release-1.3.0: Forward key events triggering a commit using ��forward_key_event()�� instead of relying on ��return False�� (46bd8b3)
by mfabian＠fedoraproject.org 16 Dec '15

16 Dec '15

1 0

[ibus-typing-booster] release-1.3.0: Add m17n_translit.py to engine/Makefile.am to install it (fa2d739)
by mfabian＠fedoraproject.org 16 Dec '15

16 Dec '15

1 0

[ibus-typing-booster] release-1.3.0: Add m17n_translit.py module to use libm17n directly (f925d36)
by mfabian＠fedoraproject.org 16 Dec '15

16 Dec '15

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : release-1.3.0 >--------------------------------------------------------------- commit f925d3644253b8a7817563146f3760abc0a578fc Author: Mike FABIAN <mfabian(a)redhat.com> Date: Mon Dec 7 23:57:11 2015 +0100 Add m17n_translit.py module to use libm17n directly Add a m17n_translit.py module to be able to use libm17n directly without going through libtranslit. This is needed to support modifier keys, some input methods like hi-inscript2 use AltGr+<letter> a lot and libtranslit does not support that. >--------------------------------------------------------------- ibus-typing-booster/engine/m17n_translit.py | 272 +++++++++++++++++++++++++++ 1 files changed, 272 insertions(+), 0 deletions(-) diff --git a/ibus-typing-booster/engine/m17n_translit.py b/ibus-typing-booster/engine/m17n_translit.py new file mode 100644 index 0000000..f56855c --- /dev/null +++ b/ibus-typing-booster/engine/m17n_translit.py @@ -0,0 +1,272 @@ +# -*- coding: utf-8 -*- +# vim:et sts=4 sw=4 +# +# ibus-typing-booster - The Tables engine for IBus +# +# Copyright (c) 2015 Mike FABIAN <mfabian(a)redhat.com> +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# This program 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 General Public License for more details. +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/> + +import ctypes + +class libm17n__MSymbolStruct(ctypes.Structure): + pass +libm17n__MSymbol = ctypes.POINTER(libm17n__MSymbolStruct) +class libm17n__MPlist(ctypes.Structure): + pass +class libm17n__MConverter(ctypes.Structure): + pass +class libm17n__MInputMethod(ctypes.Structure): + pass +class libm17n__MInputContext(ctypes.Structure): + pass +class libm17n__MText(ctypes.Structure): + pass +libm17n__MSymbolStruct._fields_ = [ + ('managing_key', ctypes.c_uint), + ('name', ctypes.c_char_p), + ('length', ctypes.c_int), + ('plist', libm17n__MPlist), + ('next', ctypes.POINTER(libm17n__MSymbolStruct))] + +libm17n__lib = None +libm17n__msymbol = None +libm17n__mplist = None +libm17n__mconv_buffer_converter = None +libm17n__mconv_reset_converter = None +libm17n__mconv_rebind_buffer = None +libm17n__mconv_encode = None +libm17n__minput_open_im = None +libm17n__minput_create_ic = None +libm17n__minput_reset_ic = None +libm17n__minput_filter = None +libm17n__minput_lookup = None +libm17n__mtext = None +libm17n__mtext_len = None +libm17n__Mcoding_utf_8 = None + +_utf8_converter = None + +def mtext_to_string(mtext_pointer): + '''Return the text contained in an MText object as a Python string + + :param mtext_pointer: pointer to the MText object to get the text from + :type mtext_pointer: pointer to an libm17n MText object + :rtype: string + ''' + libm17n__mconv_reset_converter(_utf8_converter) + # one Unicode character cannot have more than 6 UTF-8 bytes + # (actually not more than 4 ...) + conversion_buffer = bytes(libm17n__mtext_len(mtext_pointer) * 6) + libm17n__mconv_rebind_buffer( + _utf8_converter, ctypes.c_char_p(conversion_buffer), ctypes.c_int(10)) + libm17n__mconv_encode(_utf8_converter, mtext_pointer) + # maybe not all of the buffer was really used for the conversion, + # cut of the unused part: + conversion_buffer = conversion_buffer[0:conversion_buffer.find(b'\x00')] + return conversion_buffer.decode('utf-8') + +def _init(): + '''Open libm17n and fill global variables for functions and + variables from libm17n + ''' + global libm17n__lib + libm17n__lib = ctypes.CDLL('libm17n.so.0', mode = ctypes.RTLD_GLOBAL) + libm17n__lib.m17n_init() + global libm17n__mplist + libm17n__mplist = libm17n__lib.mplist + libm17n__mplist.argtypes = [] + libm17n__mplist.restype = ctypes.POINTER(libm17n__MPlist) + global libm17n__mconv_buffer_converter + libm17n__mconv_buffer_converter = libm17n__lib.mconv_buffer_converter + libm17n__mconv_buffer_converter.argtypes = [ + libm17n__MSymbol, ctypes.c_char_p, ctypes.c_int] + libm17n__mconv_buffer_converter.restype = ctypes.POINTER( + libm17n__MConverter) + global libm17n__mconv_reset_converter + libm17n__mconv_reset_converter = libm17n__lib.mconv_reset_converter + libm17n__mconv_reset_converter.argtypes = [ + ctypes.POINTER(libm17n__MConverter)] + libm17n__mconv_reset_converter.restype = ctypes.c_int + global libm17n__mconv_rebind_buffer + libm17n__mconv_rebind_buffer = libm17n__lib.mconv_rebind_buffer + libm17n__mconv_rebind_buffer.argtypes = [ + ctypes.POINTER(libm17n__MConverter), ctypes.c_char_p, ctypes.c_int] + libm17n__mconv_rebind_buffer.restype = ctypes.POINTER(libm17n__MConverter) + global libm17n__mconv_encode + libm17n__mconv_encode = libm17n__lib.mconv_encode + libm17n__mconv_encode.argtypes = [ + ctypes.POINTER(libm17n__MConverter), ctypes.POINTER(libm17n__MText)] + libm17n__mconv_encode.restype = ctypes.c_int + global libm17n__msymbol + libm17n__msymbol = libm17n__lib.msymbol + libm17n__msymbol.argtypes = [ctypes.c_char_p] + libm17n__msymbol.restype = libm17n__MSymbol + global libm17n__minput_open_im + libm17n__minput_open_im = libm17n__lib.minput_open_im + libm17n__minput_open_im.argtypes = [ + libm17n__MSymbol, libm17n__MSymbol, ctypes.c_void_p] + libm17n__minput_open_im.restype = ctypes.POINTER(libm17n__MInputMethod) + global libm17n__minput_create_ic + libm17n__minput_create_ic = libm17n__lib.minput_create_ic + libm17n__minput_create_ic.argtypes = [ + ctypes.POINTER(libm17n__MInputMethod), ctypes.c_void_p] + libm17n__minput_create_ic.restype = ctypes.POINTER(libm17n__MInputContext) + global libm17n__minput_reset_ic + libm17n__minput_reset_ic = libm17n__lib.minput_reset_ic + libm17n__minput_reset_ic.argtypes = [ctypes.POINTER(libm17n__MInputContext)] + global libm17n__minput_filter + libm17n__minput_filter = libm17n__lib.minput_filter + libm17n__minput_filter.argtypes = [ + ctypes.POINTER(libm17n__MInputContext), + libm17n__MSymbol, + ctypes.c_void_p] + libm17n__minput_filter.restype = ctypes.c_int + global libm17n__minput_lookup + libm17n__minput_lookup = libm17n__lib.minput_lookup + libm17n__minput_lookup.argtypes = [ + ctypes.POINTER(libm17n__MInputContext), + libm17n__MSymbol, + ctypes.c_void_p, + ctypes.POINTER(libm17n__MText)] + libm17n__minput_lookup.restype = ctypes.c_int + global libm17n__mtext + libm17n__mtext = libm17n__lib.mtext + libm17n__mtext.argtypes = [] + libm17n__mtext.restype = ctypes.POINTER(libm17n__MText) + global libm17n__mtext_len + libm17n__mtext_len = libm17n__lib.mtext_len + libm17n__mtext_len.argtypes = [ctypes.POINTER(libm17n__MText)] + libm17n__mtext_len.restype = ctypes.c_int + global libm17n__Mcoding_utf_8 + libm17n__Mcoding_utf_8 = libm17n__MSymbol.in_dll( + ctypes.pythonapi, 'Mcoding_utf_8') + global _utf8_converter + _utf8_converter = libm17n__mconv_buffer_converter( + libm17n__Mcoding_utf_8, ctypes.c_char_p(None), ctypes.c_int(0)) + +def _del(): + '''Cleanup''' + libm17n__lib.m17n_fini() + +class __ModuleInitializer: + def __init__(self): + _init() + return + + def __del__(self): + return + +__module_init = __ModuleInitializer() + + +class Transliterator: + '''A class for transliterators using libm17n + + Examples: + + Russian transliteration: + + >>> trans = Transliterator('ru-translit') + >>> trans.transliterate(list('y')) + '��' + >>> trans.transliterate(list('yo')) + '��' + >>> trans.transliterate(list('yo y')) + '�� ' + + Marathi transliteration: + + >>> trans = Transliterator('mr-itrans') + >>> trans.transliterate(list('praviN')) + '��' + + Hindi-Inscript2 uses the AltGr key a lot, 'G-4' is + the MSymbol name for AltGr-4 and it transliterates + to something different than just '4': + + >>> trans = Transliterator('hi-inscript2') + >>> trans.transliterate(['4', 'G-4']) + '��' + + >>> trans = Transliterator('t-latn-post') + >>> trans.transliterate(list('gru"n')) + 'gr��n' + + If initializing the transliterator fails, for example + because a non-existing input method was give as the argument, + a ValueError is raised: + + >>> trans = Transliterator('ru-translitx') + Traceback (most recent call last): + File "/usr/lib64/python3.4/doctest.py", line 1318, in __run + compileflags, 1), test.globs) + File "<doctest __main__.Transliterator[8]>", line 1, in <module> + trans = Transliterator('ru-translitx') + File "m17n_translit.py", line 194, in __init__ + raise ValueError('minput_open_im() failed') + ValueError: minput_open_im() failed + ''' + def __init__(self, ime): + '''Initialize the input method to use for the transliteration + + Raises ValueError if something fails. + + :param ime: Full name of the m17n input method, for example + ��hi-inscript2�� or ��t-latn-post�� + :type ime: string + ''' + language = ime.split('-')[0] + name = '-'.join(ime.split('-')[1:]) + self._im = libm17n__minput_open_im( + libm17n__msymbol(ctypes.c_char_p(language.encode('utf-8'))), + libm17n__msymbol(ctypes.c_char_p(name.encode('utf-8'))), + ctypes.c_void_p(None)) + try: + _im_contents = self._im.contents + except ValueError: # NULL pointer access + raise ValueError('minput_open_im() failed') + self._ic = libm17n__minput_create_ic(self._im, ctypes.c_void_p(None)) + try: + _ic_contents = self._ic.contents + except ValueError: # NULL pointer access + raise ValueError('minput_create_ic() failed') + + def transliterate(self, msymbol_list): + '''Transliterate a list of Msymbol names + + :param msymbol_list: A list of python strings which + are interpreted as the names of Msymbols + to transliterate + :rtype: string + ''' + if type(msymbol_list) != type([]): + raise ValueError('Argument of transliterate() must be a list.') + libm17n__minput_reset_ic(self._ic) + output = '' + for symbol in msymbol_list + ['nil']: + _symbol = libm17n__msymbol(symbol.encode('utf-8')) + retval = libm17n__minput_filter( + self._ic, _symbol, ctypes.c_void_p(None)) + if retval == 0: + _mt = libm17n__mtext() + retval = libm17n__minput_lookup( + self._ic, _symbol, ctypes.c_void_p(None), _mt) + if libm17n__mtext_len(_mt) > 0: + output += mtext_to_string(_mt) + if retval and symbol != 'nil': + output += symbol + return output + +if __name__ == "__main__": + import doctest + doctest.testmod()

1 0

[ibus-typing-booster] release-1.3.0: Fix string formatting error in debug code (5b440b2)
by mfabian＠fedoraproject.org 16 Dec '15

16 Dec '15

1 0

[ibus-typing-booster] release-1.3.0: Remove clearing of NumLock/MOD2 flag when processing keys (7aeccb6)
by mfabian＠fedoraproject.org 16 Dec '15

16 Dec '15

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

ibus-typing-booster December 2015