uim

Fork

* scm/generic.scm : Add check for display limit with 0.
* scm/anthy.scm : Ditto.
* scm/skk.scm : Ditto.
* gtk/gtk-im-uim.c : Ditto.
* xim/ximserver.cpp : Ditto.
* uim/slib.c : Add fail safe behavior for Remainder and Quotient.

* This commit adds lightweight version of uim-custom facility named
custom-rt.scm, and Fix a bug related to custom type 'key'

* scm/custom.scm
- (custom-set-value!): Fix broken define-key invocation. The test
for the case is added to test-custom.scm and validated
- (record custom-choice-rec): Move to custom-rt.scm
- (custom-add-hook, define-custom): Mark as API
- (custom-definition-as-literal): Simplify
- (custom-reload-customs): New procedure to support
custom-rt.scm. The test for this procedure is not yet available
- Add custom-reload-customs at end of file
* scm/custom-rt.scm
- New file
- All codes are not yet validated by testing framework
- (record custom-choice-rec): Moved from custom.scm
- (custom-required-custom-files, custom-rt-primary-groups): New
variables
- (custom-load-group-conf, require-custom,
custom-modify-key-predicate-names, custom-rt-add-primary-groups):
New procedure
- (custom-list-primary-groups, custom-add-hook, define-custom-group,
custom-exist?, custom-value, define-custom,
custom-prop-update-custom-handler): New procedure. These
procedures are lightweight or dummy version of same name ones in
custom.scm. They are overridden by full-featured version once the
custom.scm has been loaded
* scm/Makefile.am
- (SCM_FILES): Add custom-rt.scm
* test/test-custom.scm
- (testcase custom custom-group, testcase custom custom-group
methods): Modify loading process of custom.scm to conform to
introduction of custom-rt.scm
- (test define-custom (key)): Add a test for key reference
* uim/uim.c
- (uim_init_scm):
* Replace custom.scm with custom-rt.scm
* Load plugin.scm before custom-rt.scm
* Replace uim_scm_require_file("custom-vars.scm") and
uim_custom_load() with require-custom

* scm/im.scm
- (record im): Add new member 'label-name'. The name is under
discussion and not final
- (register-im): Add label-name arg
* scm/m17nlib.scm
- (m17nlib-register):
* Add label-name arg to register-im
* Replace 'intern' with string->symbol to conform to R5RS
* scm/generic.scm
- (generic-register-im): Add label-name arg
* scm/hangul.scm
- (hangul-register-im):
* Update copyright
* Add label-name arg
- Add label-name arg to hangul-register-im invocations and apply
cosmetic change
* scm/tcode.scm
* scm/tutcode.scm
* scm/ipa.scm
* scm/prime.scm
* scm/spellcheck.scm
* scm/latin.scm
* scm/direct.scm
* scm/canna.scm
* scm/viqr.scm
* scm/anthy.scm
* scm/skk.scm
* scm/pyload.scm
- Update copyright
- Add label-name arg to register-im invocations

* scm/skk.scm : Explicitly denote empty list as '(). Replace some
empty list with #f appropriately. Check empty list with null?
explicitly.
(skk-get-nth-candidate) : Simplify.
(skk-proc-state-okuri) : Fix backspace key behavior.
* scm/skk-editor.scm : Explicitly denote empty list as '().

* helper/pref-gtk.c: Added key preference UI, but it doesn't work yet.

* scm/skk.scm (skk-proc-state-direct) : Simplify the changes in
r274.

* handle encoding of uim-pref-qt

* qt/uim-kdehelper/src/pref/uim-pref-qt.h
- (addCustomTypeOrderedList): new function

* qt/uim-kdehelper/src/pref/uim-pref-qt.cpp
- (main): call bind_textdomain_codeset for ensuring
the encoding of custom variable is UTF-8. But now
PACKAGE is hardcoded as "uim", so once this is
merged into uim, need to include "uim/config.h"
and "uim/gettext.h"
- (addCustomTypeOrderedList): new function
- (_FU8): new macro
- replace qFatal with qWarning
- update Comment

* remove KDE dependency of chardict-qt, switcher-qt,
and toolbar-qt from source code for merging
uim-kdehelper to uim package.

* qt/uim-kdehelper/src/chardict/bushuviewwidget.cpp
- remove #include <klocale.h>
* qt/uim-kdehelper/src/chardict/uim-chardict-qt.cpp
- remove #include <klocale.h>
* qt/uim-kdehelper/src/switcher/im-switcher-qt.cpp
- remove #include <klocale.h>
* qt/uim-kdehelper/src/common/quimhelpertoolbar.cpp
- remove #include <klocale.h>

* qt/uim-kdehelper/src/Makefile.am
- add pref in SUBDIRS

* This commit adds "a group is updated" callback and "group list is
updated" callback feature to uim-custom API. The features are
validated by test-custom.scm in Scheme level. Calling via
uim-custom.h is not yet tested

* uim/uim-custom.h
- (uim_custom_group_cb_add, uim_custom_group_cb_remove,
uim_custom_global_cb_add, uim_custom_global_cb_remove): New
function
* uim/uim-custom.c
- (uim_custom_group_cb_add, uim_custom_group_cb_remove,
uim_custom_global_cb_add, uim_custom_global_cb_remove): New
function
- (uim_custom_global_cb_update_cb_t): New type
- (uim_custom_global_cb_update_cb_gate, uim_bool custom_cb_add,
uim_bool custom_cb_remove): New static function
- (uim_custom_init): Add initialization of custom-global-update-cb-gate
- (uim_custom_cb_add): Simplify with custom_cb_add()
- (uim_custom_cb_remove): Simplify with custom_cb_remove()
* scm/custom.scm
- (custom-group-update-hooks, custom-group-list-update-hooks): New
variable
- (define-custom-group): Add custom-group-list-update-hooks handling
- (define-custom): Add custom-group-update-hooks handling
- (custom-register-update-cb): Remove
- (custom-register-cb): New procedure
* test/test-custom.scm
- (testcase custom hooks): Modify setup proc
- (test custom-register-update-cb, test custom-register-update-cb (2
callbaks)): Remove
- (test custom-register-cb (custom update hook), test
custom-register-cb (custom update hook, 2 callbaks), test
custom-register-cb (custom-group update hook), test
custom-register-cb (custom-group update hook, 2 callbaks), test
custom-register-cb (group-list update hook)): New test

* scm/custom-vars.scm
- (custom candidate-window-position):
* Restore the custom variable removed by misunderstanding
* Change custom type from string to choice
* uim/uim-compat-scm.c
- (uim_symbol_value_str): Allow value as symbol
* scm/util.scm
- (uim-symbol-value-str): New procedure for uim_symbol_value_str()

* po/uim.pot
* po/ja.po
- Update

* scm/skk.scm (skk-proc-state-direct) : Generalization of
skk-plain-space-key? case.

* scm/skk.scm (skk-get-nth-candidate) : Replace #f with () on
numlst if it is empty.
(skk-prepare-commit-string) : Ditto.
(skk-check-candidate-window-begin) : Ditto.

* scm/plugin.scm: Fixed a typo.

* uim/setenv.c: Fixed the warning:ISO C forbids an empty source file
This warning was appeared on the system which already have setenv(3)

* scm/custom.scm
- All changes are validated by test-custom.scm
-(custom-expand-key-references, custom-list-as-literal,
custom-definition-as-literal): Simplify
* test/test-custom.scm
- (test custom-definition-as-literal): Follow the specification
change

* scm/anthy.scm
- (anthy-converting-state-preedit, anthy-get-commit-string):
Simplify

* scm/generic.scm (generic-commit-by-numkey) : Fix typo.
* uim/slib.c (Quotient) : Add comment.
(Remainder) : New function for r5rs. Exported as remainder for
scheme.
* scm/util.scm (quotient) : New for r5rs. This is an alias of '/'
in siod.
* scm/skk.scm : Update copyright.
(skk-commit-candidate-by-label-key?) : New custom
variable. Default is #f.
(skk-context-rec-spec) : Add new member nr-candidates in order to
reduce complexity of calling skk-lib-get-nr-candidates many
times.
(skk-begin-conversion) : Reset skk-context-nr-candidates here.
(skk-check-candidate-window-begin) : Call
skk-lib-get-nr-candidates only at here and store it to
skk-context-nr-candidates.
(skk-commit-by-label-key) : New function. Commit candidate
by key denoted by its heading label. Only numeric key handling
is enabled yet.
(skk-change-candidate-index) : Simplify using
skk-context-nr-candidates.
(skk-heading-label-char?) : New function. Currently only handles
numeric characters.
(skk-proc-state-converting) : Add candidate committing facility
using label keys.
(skk-get-candidate-handler) : Change to use remainder as label.
* scm/custom-vars.scm (skk-commit-candidate-by-label-key?) : New
custom variable for uim-skk.

* This commit adds string-join and other new utility procedures to
util.scm. All changes are validated by test-util.scm

* scm/util.scm
- Update copyright
- (join, string-join, string-append-map, append-map): New procedure
- (iota): Support optional 'start' argument
- (alist-replace): Remove the comment "not yet tested"
* test/test-util.scm
- (test join, test string-join, test string-append-map, test
append-map): New test
- (test iota): Add tests for 'start' argument

* scm/custom.scm
- (custom-definition-as-literal): Fix bogus define-key literal
generation. Thanks No.28 of [Anthy/uim thread 5] for reporting

* This commit suppresses pedantic warnings. No logical changes have
been applied actually

* uim/uim-scm.h
- (uim_func_ptr): New type
- (uim_scm_c_func_ptr, uim_scm_make_func_ptr): New function
* uim/uim-scm.c
- (uim_scm_c_func_ptr, uim_scm_make_func_ptr): New function
- Modify the word expression of header comment to suppress warning
* uim/siod.h
- Add a coumment about static declarations in this file
- (struct obj): Add new member c_func_pointer
- (tc_c_func_pointer, FPOINTERP, NFPOINTERP): New macro
- (C_FUNC): New type
- (get_c_func_pointer, funcptrcons): New static function
* uim/slib.c
- (get_c_func_pointer, funcptrcons, func_pointer_prin1): New static
function
- (init_storage): Add initialization of print hook for tc_c_func_pointer

* uim/uim-compat-scm.c
- (uim_scm_c_list_free): Formal rewriting to suppress warning

* uim/uim-custom.c
- (extract_choice_list): Formal rewriting to suppress warning
- (uim_custom_cb_update_cb_gate): Replace uim_scm_c_ptr() with
uim_scm_c_func_ptr() to suppress warning
- (uim_custom_cb_add): Replace uim_scm_make_ptr() with
uim_scm_make_func_ptr() to suppress warning

* uim/plugin.c
- (plugin_load):
* Cosmetic change
* Replace uim_scm_make_ptr() with uim_scm_make_func_ptr() to
suppress warning
- (plugin_unload): Replace uim_scm_c_ptr() with uim_scm_c_func_ptr()
to suppress warning

* uim/canna.c
- (UIM_CANNA_DEBUG): New macro. Commented out by default
- (context_array_len): Comment out the unused variable to suppress
warning
- (get_canna_context): Enclose printf debug messages into #ifdef
UIM_CANNA_DEBUG
- (_update_segment, get_nth_candidate):
* Ditto
* Cast buf arg for RkGetKanji() to suppress warning
- (commit_segment): Comment out unused variables to suppress warnings
- (uim_plugin_instance_quit): Comment out unused dynamic loading
related check to suppress warning

scm/skk.scm (skk-flush) : Reset candidate window explicitly.

Update on setup tools. Fix some English.

* xim/canddisp.cpp : Just update copyright.
* xim/canddisp.h : Ditto.
* xim/connection.cpp : Ditto.
* xim/connection.h : Ditto.
* xim/compose.cpp : Ditto.
* xim/compose.h : Ditto.
* xim/convdisp.cpp : Ditto.
* xim/convdisp.h : Ditto.
* xim/helper.cpp : Ditto.
* xim/helper.h : Ditto.
* xim/locale.cpp : Ditto.
* xim/main.cpp : Ditto.
* xim/util.cpp : Ditto.
* xim/util.h : Ditto.
* xim/xdispatch.h : Ditto.
* xim/xim.h : Ditto.
* xim/ximic.cpp : Ditto.
* xim/ximim.cpp : Ditto.
* xim/ximpacket.cpp : Ditto.
* xim/ximpn.h : Ditto.
* xim/ximtrans.cpp : Ditto.
* xim/ximserver.h : Ditto.
(class XimServer) : Add new private member mUsePreservedDefaultIM.
* xim/ximserver.cpp : Update copyright.
(XimServer::customContext) : Update ximserver's global im with
customized one.

* uim/uim-custom.c
- (uim_custom_key_get): Fix broken Scheme interfaces
- (uim_custom_cb_remove): Fix wrong variable name
* uim/uim-compat-scm.c
- (uim_scm_c_str_failsafe): Add check for #f

* scm/custom-vars.scm
- (custom switch-im-key): Uncomment
- (custom generic-on-key, custom generic-off-key, custom
generic-begin-conv-key, custom generic-commit-key, custom
generic-cancel-key, custom generic-next-candidate-key, custom
generic-prev-candidate-key, custom generic-next-page-key, custom
generic-prev-page-key, custom generic-beginning-of-preedit-key,
custom generic-end-of-preedit-key, custom generic-kill-key, custom
generic-kill-backward-key, custom generic-backspace-key, custom
generic-delete-key, custom generic-go-left-key, custom
generic-go-right-key, custom generic-return-key): Gettextize
- (custom skk-dic-file-name, custom skk-personal-dic-filename,
custom skk-uim-personal-dic-filename): Move to bottom of the group
* po/uim.pot
* po/ja.po
- Update

* scm/custom-vars.scm
- (viqr-im-canonical-name, custom 'prime-mask-pending-preedit?):
Modify message appropriately
- (custom uim-color, custom skk-style): Gettextize
* scm/canna.scm
* scm/viqr.scm
- Modify short-desc of IM appropriately

* po/uim.pot
* po/ja.po
- Update

* scm/anthy.scm:
-(anthy-flush): Candidate window should be deactivated before
calling (anthy-context-set-candidate-window! ac #f)

* This commit provides some custom variables for testing new custom
types 'key' and 'ordered-list'

* scm/custom.scm
- (custom-key-advanced-editor?): New procedure
- (custom-range): Fix ordered-list handling
* test/test-custom.scm
- (test custom-range): Follow ordered-list specification fix

* scm/custom-vars.scm
- (pyunihan-im-canonical-name, pinyin-big5-im-canonical-name,
py-im-canonical-name): Update label string
- (custom custom-preserved-default-im-name): Replace manual list
construction with custom-choice-rec-new as proper operation
- (custom-default-enabled-im-list): New variable
- (custom enabled-im-list): New custom
- (custom-group key, custom-group global-keys): New custom group
- (custom generic-on-key, custom generic-off-key, custom
generic-begin-conv-key, custom generic-commit-key, custom
generic-cancel-key, custom generic-next-candidate-key, custom
generic-prev-candidate-key, custom generic-next-page-key, custom
generic-prev-page-key, custom generic-beginning-of-preedit-key,
custom generic-end-of-preedit-key, custom generic-kill-key, custom
generic-kill-backward-key, custom generic-backspace-key, custom
generic-delete-key, custom generic-go-left-key, custom
generic-go-right-key, custom generic-return-key): New custom
* helper/pref-gtk.c
- (add_custom_type_orderedlist): New function as placeholder. Rename
and implement this function appropriately
- (add_custom): Add ordered-list handling

* xim/ximserver.cpp (InputContext::focusIn) : Same change as r256
for uim-xim.
* xim/compose.cpp (XimIM::ParseComposeStringFile) : Cosmetic change.

* gtk/gtk-im-uim.c (focus_in) : Fix occasional mismatch of helper
label with focus in. uim_helper_client_focus_in() is definitely
needed to be called before uim_prop_list_update() and
uim_prop_label_update. This sequence is required to make sure the
exsitence of only one focused context in whole desktop.

* scm/custom-vars.scm
- Comment out all definitions of spellcheck group since spellcheck
IM is not available yet
- Sort some custom variables

* uim/uim-key.c
- (struct key_entry):
* Named from the anonymous struct for key_tab
* Add const qualifier to member 'str'
- (key_tab): Rewrite definition using struct key_entry
- (define_valid_key_symbols): New static function
- (get_sym, keycode_to_sym, handle_key): Add const qualifier to
appropriate 'char *' pointers
- (uim_init_key_subrs):
* Add define_valid_key_symbols() invocation
* Remove unnecessary cast
* scm/key.scm
- (valid-key-symbols): Remove here. The variable is defined in
uim-key.c
- (key-symbol?): New procedure
- (set-key-binding, regist-key-binding): Remove these obsolete
placeholders existing in comment

* uim/slib.c
- (init_subrs): Cosmetic change