Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[wiki-app] Updates from Symbio

Fixed two issues in Japanese Romaji keyboards:

1. Returning form 123 keyboard to the default keyboard after typing blank or '
2. Clicking multiple times on a specific English alphabet key caused inversion broken

Signed-off-by: Christopher Hall <hsw@openmoko.com>
  • Loading branch information...
commit f7ff3cbd646442b7e11ff2b09ea3608d10032314 1 parent f552a0d
@hxw hxw authored
Showing with 4 additions and 4 deletions.
  1. +1 −1  wiki-app/keyboard.c
  2. +3 −3 wiki-app/wikilib.c
View
2  wiki-app/keyboard.c
@@ -833,7 +833,7 @@ int keyboard_key_reset_invert(int bFlag, unsigned long ev_time)
if (kb_mode == KEYBOARD_NUM && ((!b_first_123_keyin && *pre_key->key == ' ') || *pre_key->key == '\''))
{
- keyboard_set_mode(KEYBOARD_CHAR);
+ keyboard_set_mode(wiki_default_keyboard());
guilib_fb_lock();
keyboard_paint();
guilib_fb_unlock();
View
6 wiki-app/wikilib.c
@@ -327,8 +327,7 @@ void handle_search_key(struct keyboard_key *key, unsigned long ev_time)
keycode == WL_KEY_POHONE_STYLE_KEYBOARD_123) { // toggling keyboard will be handled at key down
rc = -1;
} else {
-// int mode = keyboard_get_mode();
-// if (mode == KEYBOARD_PHONE_STYLE_JP || mode == KEYBOARD_PHONE_STYLE_ABC || mode == KEYBOARD_PHONE_STYLE_123)
+ int mode = keyboard_get_mode();
if (wiki_is_japanese())
{
if (keycode == WL_KEY_SONANT)
@@ -349,7 +348,8 @@ void handle_search_key(struct keyboard_key *key, unsigned long ev_time)
{
last_key = temp_last_key;
last_key_utf8_char = temp_last_key_utf8_char;
- if (key == last_key && time_diff(ev_time, last_ev_time) <= seconds_to_ticks(PHONE_STYLE_KEYIN_BEFORE_COMMIT_TIME))
+ if ((mode == KEYBOARD_PHONE_STYLE_JP || mode == KEYBOARD_PHONE_STYLE_ABC || mode == KEYBOARD_PHONE_STYLE_123) &&
+ key == last_key && time_diff(ev_time, last_ev_time) <= seconds_to_ticks(PHONE_STYLE_KEYIN_BEFORE_COMMIT_TIME))
{
last_ev_time = ev_time;
last_key_utf8_char = next_utf8_char(last_key_utf8_char);
Please sign in to comment.
Something went wrong with that request. Please try again.