@@ -18,7 +18,7 @@ public abstract class IKerKerInputMethod { /* Keyboard Events */ public Keyboard getDesiredKeyboard() { return null; } - public boolean wantHandleEvent(int keyCode) { return (keyCode > -2); } + public boolean wantHandleEvent(int keyCode) { return (keyCode > -2) || (keyCode == Keyboard.KEYCODE_DELETE) ; } abstract public boolean onKeyEvent(int keyCode, int[] keyCodes); abstract public void commitCandidate(int currentCandidate); public void onTextEvent(CharSequence text) { if (_core != null) _core.getConnection().commitText(text, 1); } src/idv/Zero/KerKerInput/IKerKerInputMethod.java @@ -10,6 +10,10 @@ public class KBManager { public static final int KEYCODE_IME = -103; public static final int KEYCODE_NEXT_IME = -104; public static final int KEYCODE_DO_OUTPUT_CHARS = -105; + public static final int KEYCODE_DPAD_UP = -106; + public static final int KEYCODE_DPAD_DOWN = -107; + public static final int KEYCODE_DPAD_LEFT = -108; + public static final int KEYCODE_DPAD_RIGHT = -109; private KerKerInputCore _core = null; private KeyboardView _currentKBView = null; src/idv/Zero/KerKerInput/KBManager.java @@ -138,12 +138,34 @@ public class KerKerInputCore implements OnKeyboardActionListener { // Allow user to user BACK key to hide SIP if (e.getKeyCode() == KeyEvent.KEYCODE_BACK) return false; - else if (e.getKeyCode() == KeyEvent.KEYCODE_MENU) - return false; - else if (e.getKeyCode() == KeyEvent.KEYCODE_ALT_LEFT) - requestNextInputMethod(); - return _currentMethod.onKeyEvent(keyCode, new int[]{keyCode}); + if (_currentMethod.wantHandleEvent(e.getKeyCode())) + _currentMethod.onKeyEvent(keyCode, new int[]{keyCode}); + else + { + switch(e.getKeyCode()) + { + case KeyEvent.KEYCODE_MENU: + return false; + case KeyEvent.KEYCODE_ALT_LEFT: + requestNextInputMethod(); + break; + case KBManager.KEYCODE_DPAD_UP: + getFrontend().sendDownUpKeyEvents(KeyEvent.KEYCODE_DPAD_UP); + break; + case KBManager.KEYCODE_DPAD_DOWN: + getFrontend().sendDownUpKeyEvents(KeyEvent.KEYCODE_DPAD_DOWN); + break; + case KBManager.KEYCODE_DPAD_LEFT: + getFrontend().sendDownUpKeyEvents(KeyEvent.KEYCODE_DPAD_LEFT); + break; + case KBManager.KEYCODE_DPAD_RIGHT: + getFrontend().sendDownUpKeyEvents(KeyEvent.KEYCODE_DPAD_RIGHT); + break; + } + } + + return false; } public boolean onKeyMultiple(int keyCode, int count, KeyEvent e) @@ -177,16 +199,19 @@ public class KerKerInputCore implements OnKeyboardActionListener { _currentMode = InputMode.MODE_SYM; _kbm.setNativeKeyboard(NativeKeyboardTypes.MODE_SYM); showIMENamePopup("123"); + hideCandidatesView(); break; case KBManager.KEYCODE_SYM_ALT: // 123 Keyboard _currentMode = InputMode.MODE_SYM_ALT; _kbm.setNativeKeyboard(NativeKeyboardTypes.MODE_SYM_ALT); showIMENamePopup("#+="); + hideCandidatesView(); break; case KBManager.KEYCODE_ABC: // ABC Keyboard _currentMode = InputMode.MODE_ABC; _kbm.setNativeKeyboard(NativeKeyboardTypes.MODE_ABC); showIMENamePopup("ABC"); + hideCandidatesView(); break; case KBManager.KEYCODE_IME: // IME Keyboard _currentMode = InputMode.MODE_IME; @@ -238,7 +263,9 @@ public class KerKerInputCore implements OnKeyboardActionListener { } public void hideCandidatesView() { - _frontEnd.setCandidatesViewShown(false); + //_frontEnd.setCandidatesViewShown(false); + if (_candidatesContainer != null) + clearCandidates(); } public void setCompositeBuffer(CharSequence buf) { src/idv/Zero/KerKerInput/KerKerInputCore.java @@ -62,13 +62,13 @@ public class KerKerInputService extends InputMethodService { if (e.getKeyCode() == KeyEvent.KEYCODE_DEL) return -5; else if (e.getKeyCode() == KeyEvent.KEYCODE_DPAD_UP) - return -100; + return KBManager.KEYCODE_DPAD_UP; else if (e.getKeyCode() == KeyEvent.KEYCODE_DPAD_DOWN) - return -101; + return KBManager.KEYCODE_DPAD_DOWN; else if (e.getKeyCode() == KeyEvent.KEYCODE_DPAD_LEFT) - return -102; + return KBManager.KEYCODE_DPAD_LEFT; else if (e.getKeyCode() == KeyEvent.KEYCODE_DPAD_RIGHT) - return -103; + return KBManager.KEYCODE_DPAD_RIGHT; return e.getUnicodeChar(); } src/idv/Zero/KerKerInput/KerKerInputService.java @@ -80,6 +80,8 @@ public class BPMFInput extends idv.Zero.KerKerInput.IKerKerInputMethod { public void onEnterInputMethod() { currentState = InputState.STATE_INPUT; + inputBufferRaw = ""; + updateCandidates(); } public void destroyInputMethod() @@ -112,15 +114,22 @@ public class BPMFInput extends idv.Zero.KerKerInput.IKerKerInputMethod { else _core.getFrontend().sendDownUpKeyEvents(KeyEvent.KEYCODE_DEL); } - else if(keyCode == 32) { // space + else if (keyCode == 32) // space + { if (_currentCandidates.size() > 0) + { currentState = InputState.STATE_CHOOSE; + handleBPMFKeyEvent(32, null); + } else _core.getFrontend().sendKeyChar((char) keyCode); } - else if(keyCode >= -104 && keyCode <= -100) + else if (keyCode == 10) // RETURN { - return false; + if (inputBufferRaw.length() > 0) + commitText(getCompositeString()); + else + _core.getFrontend().sendKeyChar((char) keyCode); } else { @@ -150,19 +159,22 @@ public class BPMFInput extends idv.Zero.KerKerInput.IKerKerInputMethod { Log.e("BPMFInput", "InputBuffer is requested to delete, but the buffer is empty"); break; + // TODO: Make sure DPad & Keyboard L/R keyCode case -103: // DPad Left if (_currentPage > 0) _currentPage--; else _currentPage = _totalPages - 1; break; - case ' ': case -104: // DPad Right if (_currentPage < _totalPages - 1) _currentPage++; else _currentPage = 0; break; + case ' ': + case 10: + keyCode = KeyEvent.KEYCODE_0; default: if (keyCode >= KeyEvent.KEYCODE_0 && keyCode <= KeyEvent.KEYCODE_9) { @@ -173,8 +185,6 @@ public class BPMFInput extends idv.Zero.KerKerInput.IKerKerInputMethod { if ((_currentPage * CANDIDATES_PER_PAGE + keyCode - KeyEvent.KEYCODE_0 - 1) < _currentCandidates.size()) { commitCandidate(_currentPage * CANDIDATES_PER_PAGE + keyCode - KeyEvent.KEYCODE_0 - 1); - currentState = InputState.STATE_INPUT; - inputBufferRaw = ""; } } break; @@ -205,7 +215,8 @@ public class BPMFInput extends idv.Zero.KerKerInput.IKerKerInputMethod { try { - Cursor currentQuery = db.rawQuery("Select val from bpmf where key glob '" + inputBufferRaw.toString() + "*'", null); + // Cursor currentQuery = db.rawQuery("Select val from bpmf where key glob '" + inputBufferRaw.toString() + "*'", null); + Cursor currentQuery = db.rawQuery("Select val from bpmf where key >= '" + inputBufferRaw.toString() + "' AND key < '" + inputBufferRaw.toString() + "zzz'", null); if (currentQuery.getCount() == 0) { inputBufferRaw = inputBufferRaw.substring(0, inputBufferRaw.length() - 1); @@ -240,13 +251,11 @@ public class BPMFInput extends idv.Zero.KerKerInput.IKerKerInputMethod { } } - public void commitCandidate(int selectedCandidate) { - _core.getConnection().commitText(_currentCandidates.get(selectedCandidate), 1); - _core.hideCandidatesView(); - inputBufferRaw = ""; - currentState = InputState.STATE_INPUT; + public void commitCandidate(int selectedCandidate) + { + commitText(_currentCandidates.get(selectedCandidate)); } - + public void setTotalPages(int totalPages) { _totalPages = totalPages; @@ -257,6 +266,15 @@ public class BPMFInput extends idv.Zero.KerKerInput.IKerKerInputMethod { _currentPage = currentPage; } + private void commitText(CharSequence str) + { + _core.getConnection().commitText(str, 1); + _core.hideCandidatesView(); + inputBufferRaw = ""; + updateCandidates(); + currentState = InputState.STATE_INPUT; + } + private void initKeyNameData() { K2N = new HashMap<Character, String>(); src/idv/Zero/KerKerInput/Methods/BPMFInput.java @@ -42,6 +42,7 @@ public class NoSeeing extends idv.Zero.KerKerInput.IKerKerInputMethod { } catch(SQLiteException ex) { + db = null; System.out.println("Error, no database file found. Copying..."); new Thread(new Runnable() { @@ -64,18 +65,24 @@ public class NoSeeing extends idv.Zero.KerKerInput.IKerKerInputMethod { } catch (IOException e) { e.printStackTrace(); } - } + + db = SQLiteDatabase.openDatabase(_dbpath, null, SQLiteDatabase.OPEN_READONLY); + db.setLocale(Locale.TRADITIONAL_CHINESE); + } }).start(); } } public void onEnterInputMethod() { + inputBufferRaw.delete(0, inputBufferRaw.length()); + updateCandidates(); } public void destroyInputMethod() { - db.close(); + if (db != null) + db.close(); } public String getName() @@ -101,11 +108,14 @@ public class NoSeeing extends idv.Zero.KerKerInput.IKerKerInputMethod { else _core.getFrontend().sendDownUpKeyEvents(KeyEvent.KEYCODE_DEL); } - else if(keyCode >= -104 && keyCode <= -100) + else if (keyCode == 10) { - return false; + if (inputBufferRaw.length() > 0) + commitText(getCompositeString()); + else + _core.getFrontend().sendKeyChar((char) keyCode); } - else if((keyCode >= KeyEvent.KEYCODE_0 && keyCode <= KeyEvent.KEYCODE_9) || keyCode == 32) + else if(((keyCode >= KeyEvent.KEYCODE_0 && keyCode <= KeyEvent.KEYCODE_9) || (keyCode == 32)) && inputBufferRaw.length() > 0) { // Noseeing users tend to use SPACE to select first candidate if (keyCode == 32) @@ -155,11 +165,13 @@ public class NoSeeing extends idv.Zero.KerKerInput.IKerKerInputMethod { return; } + if (db == null) + return; + try { - db = SQLiteDatabase.openDatabase(_dbpath, null, SQLiteDatabase.OPEN_READONLY); - db.setLocale(Locale.TRADITIONAL_CHINESE); - Cursor currentQuery = db.rawQuery("Select val from noseeing where key glob '" + inputBufferRaw.toString() + "*'", null); + //Cursor currentQuery = db.rawQuery("Select val from noseeing where key glob '" + inputBufferRaw.toString() + "*'", null); + Cursor currentQuery = db.rawQuery("Select val from noseeing where key >= '" + inputBufferRaw.toString() + "' AND key < '" + inputBufferRaw.toString() + "zzz'", null); if (currentQuery.getCount() == 0) { inputBufferRaw.deleteCharAt(inputBufferRaw.length() - 1); @@ -184,19 +196,24 @@ public class NoSeeing extends idv.Zero.KerKerInput.IKerKerInputMethod { currentQuery.moveToNext(); } - _core.showCandidatesView(); _core.setCandidates(_currentCandidates); + _core.showCandidatesView(); } } catch(Exception e) {} finally { - db.close(); } } - public void commitCandidate(int selectedCandidate) { - _core.getConnection().commitText(_currentCandidates.get(selectedCandidate), 1); + public void commitCandidate(int selectedCandidate) + { + commitText(_currentCandidates.get(selectedCandidate)); + } + + private void commitText(CharSequence str) + { + _core.getConnection().commitText(str, 1); _core.hideCandidatesView(); inputBufferRaw.delete(0, inputBufferRaw.length()); } src/idv/Zero/KerKerInput/Methods/NoSeeing.java 07288dab0807d0878fb68464d26e6cd1533a3908 itsZero (Chien-An "Zero" Cho) itsero@gmail.com http://github.com/itszero/KerKerInput/commit/f8ab0393c9dafdb9fbdada9ff76fca7af14b905f f8ab0393c9dafdb9fbdada9ff76fca7af14b905f 2009-09-29T09:18:46-07:00 2009-09-29T09:18:46-07:00 Abstracted the common keycode processing to the Core. Add common-used KKI-customized keycode to KBManager b16490f0dadb2997a9d6f3748b8473b80c00a0ed itsZero (Chien-An "Zero" Cho) itsero@gmail.com