Revision: 7438 Author: ek.kato Date: Tue Feb 7 17:30:34 2012 Log: * Merge r7436, r7437 from trunk.
http://code.google.com/p/uim/source/detail?r=7438 Modified: /branches/1.7/scm/m17nlib.scm /branches/1.7/uim/m17nlib.c ======================================= --- /branches/1.7/scm/m17nlib.scm Wed Jan 11 00:24:17 2012 +++ /branches/1.7/scm/m17nlib.scm Tue Feb 7 17:30:34 2012 @@ -305,7 +305,10 @@ (define m17nlib-release-key-handler (lambda (mc key key-state) - #f)) + (if (or (ichar-control? key) + (not (m17nlib-context-on mc))) + ;; don't discard key release event for apps + (m17nlib-commit-raw mc)))) (define m17nlib-reset-handler (lambda (mc) ======================================= --- /branches/1.7/uim/m17nlib.c Wed Jan 11 00:24:17 2012 +++ /branches/1.7/uim/m17nlib.c Tue Feb 7 17:30:34 2012 @@ -325,7 +325,8 @@ for (i = 0; i < ic->cursor_pos ;i++) p = m17nlib_utf8_find_next_char(p); - buf_ = MAKE_STR_DIRECTLY(p); + buf_ = MAKE_STR(p); + free(buf); return buf_; } @@ -387,7 +388,8 @@ p = m17nlib_utf8_find_next_char(p); *p = '\0'; - buf_ = MAKE_STR_DIRECTLY(start); + buf_ = MAKE_STR(start); + free(buf); return buf_; } @@ -412,7 +414,8 @@ for (i = 0; i < ic->candidate_to ;i++) p = m17nlib_utf8_find_next_char(p); - buf_ = MAKE_STR_DIRECTLY(p); + buf_ = MAKE_STR(p); + free(buf); return buf_; }
