holm/Unexpected-Keyboard
1
0
Fork 0
forked from extern/Unexpected-Keyboard
Code Pull Requests Activity

Separate handling of modifiers from KeyValue class

Browse Source 
KeyValue defines an ADT and some of its values, it now contains public
final fields and no internal logic.
KeyModifier handles modifiers and accents and creates new instances of
KeyValue when needed.
This operation is now properly cached.
This commit is contained in:
Jules Aguillon 2021-04-18 23:28:49 +02:00
parent 67d3a99a92
commit 81803c406a
8 changed files with 148 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
srcs/juloo.keyboard2/EmojiGridView.java
View File

@ -90,7 +90,7 @@ public class EmojiGridView extends GridView
HashSet<String> set = new HashSet<String>(); HashSet<String> set = new HashSet<String>();
for (Emoji emoji : _lastUsed.keySet()) for (Emoji emoji : _lastUsed.keySet())
set.add(String.valueOf(_lastUsed.get(emoji)) + "-" + emoji.getName()); set.add(String.valueOf(_lastUsed.get(emoji)) + "-" + emoji.name);
edit.putStringSet(LAST_USE_PREF, set); edit.putStringSet(LAST_USE_PREF, set);
edit.apply(); edit.apply();
} }
@ -130,7 +130,7 @@ public class EmojiGridView extends GridView
public void setEmoji(Emoji emoji) public void setEmoji(Emoji emoji)
{ {
setText(emoji.getSymbol(0)); setText(emoji.symbol);
} }
} }

2
srcs/juloo.keyboard2/EmojiGroupButtonsBar.java
View File

@ -15,7 +15,7 @@ public class EmojiGroupButtonsBar extends LinearLayout
for (int i = 0; i < Emoji.num_groups; i++) for (int i = 0; i < Emoji.num_groups; i++)
{ {
Emoji first = Emoji.getEmojisByGroup(i)[0]; Emoji first = Emoji.getEmojisByGroup(i)[0];
add_group(i, first.getSymbol(0)); add_group(i, first.symbol);
} }
} }

4
srcs/juloo.keyboard2/EmojiKeyButton.java
View File

@ -15,8 +15,8 @@ public class EmojiKeyButton extends Button
super(context, attrs); super(context, attrs);
setOnClickListener(this); setOnClickListener(this);
_key = KeyValue.getKeyByName(attrs.getAttributeValue(null, "key")); _key = KeyValue.getKeyByName(attrs.getAttributeValue(null, "key"));
setText(_key.getSymbol(0)); setText(_key.symbol);
if ((_key.getFlags() & KeyValue.FLAG_KEY_FONT) != 0) if ((_key.flags & KeyValue.FLAG_KEY_FONT) != 0)
setTypeface(((Keyboard2)context).getSpecialKeyFont()); setTypeface(((Keyboard2)context).getSpecialKeyFont());
} }

70
srcs/juloo.keyboard2/KeyModifier.java Normal file
View File

@ -0,0 +1,70 @@
package juloo.keyboard2;
import android.util.SparseArray;
import android.view.KeyCharacterMap;
import java.util.HashMap;
class KeyModifier
{
/* Cache key is KeyValue's name */
private static HashMap<String, SparseArray<KeyValue>> _cache =
new HashMap<String, SparseArray<KeyValue>>();
/* Modify a key according to modifiers. */
public static KeyValue handleFlags(KeyValue k, int flags)
{
if (flags == 0) // No modifier
return k;
SparseArray<KeyValue> ks = cacheEntry(k);
KeyValue r = ks.get(flags);
if (r != null) // Found in cache
return r;
char c = handleChar(k.char_, flags);
if (c == k.char_) // Don't override the symbol if the char didn't change
r = k;
else
r = k.withCharAndSymbol(String.valueOf(c), c);
ks.put(flags, r);
return r;
}
private static char handleChar(char c, int flags)
{
if (c == KeyValue.CHAR_NONE)
return c;
if ((flags & KeyValue.FLAG_SHIFT) != 0) // Shift
c = Character.toUpperCase(c);
if ((flags & KeyValue.FLAGS_ACCENTS) != 0) // Accents, after shift is applied
c = handleAccentChar(c, flags);
return c;
}
private static char handleAccentChar(char c, int flags)
{
char accent;
switch ((flags & KeyValue.FLAGS_ACCENTS))
{
case KeyValue.FLAG_ACCENT1: accent = '\u02CB'; break;
case KeyValue.FLAG_ACCENT2: accent = '\u00B4'; break;
case KeyValue.FLAG_ACCENT3: accent = '\u02C6'; break;
case KeyValue.FLAG_ACCENT4: accent = '\u02DC'; break;
case KeyValue.FLAG_ACCENT5: accent = '\u00B8'; break;
case KeyValue.FLAG_ACCENT6: accent = '\u00A8'; break;
default: return c; // Can't happen
}
char r = (char)KeyCharacterMap.getDeadChar(accent, (int)c);
return (r == 0) ? c : r;
}
/* Lookup the cache entry for a key. Create it needed. */
private static SparseArray<KeyValue> cacheEntry(KeyValue k)
{
SparseArray<KeyValue> ks = _cache.get(k.name);
if (ks == null)
{
ks = new SparseArray<KeyValue>();
_cache.put(k.name, ks);
}
return ks;
}
}

145
srcs/juloo.keyboard2/KeyValue.java
View File

@ -6,115 +6,62 @@ import java.util.HashMap;
class KeyValue class KeyValue
{ {
public static final int EVENT_NONE = -1; public static final int EVENT_NONE = -1;
public static final int EVENT_CONFIG = -2; public static final int EVENT_CONFIG = -2;
public static final int EVENT_SWITCH_TEXT = -3; public static final int EVENT_SWITCH_TEXT = -3;
public static final int EVENT_SWITCH_NUMERIC = -4; public static final int EVENT_SWITCH_NUMERIC = -4;
public static final int EVENT_SWITCH_EMOJI = -5; public static final int EVENT_SWITCH_EMOJI = -5;
public static final int EVENT_SWITCH_BACK_EMOJI = -6; public static final int EVENT_SWITCH_BACK_EMOJI = -6;
public static final int EVENT_CHANGE_METHOD = -7; public static final int EVENT_CHANGE_METHOD = -7;
public static final char CHAR_NONE = '\0'; public static final char CHAR_NONE = '\0';
public static final int FLAG_KEEP_ON = 1; public static final int FLAG_KEEP_ON = 1;
public static final int FLAG_LOCK = (1 << 1); public static final int FLAG_LOCK = (1 << 1);
public static final int FLAG_CTRL = (1 << 2); public static final int FLAG_CTRL = (1 << 2);
public static final int FLAG_SHIFT = (1 << 3); public static final int FLAG_SHIFT = (1 << 3);
public static final int FLAG_ALT = (1 << 4); public static final int FLAG_ALT = (1 << 4);
public static final int FLAG_NOREPEAT = (1 << 5); public static final int FLAG_NOREPEAT = (1 << 5);
public static final int FLAG_NOCHAR = (1 << 6); public static final int FLAG_NOCHAR = (1 << 6);
public static final int FLAG_LOCKED = (1 << 8); public static final int FLAG_LOCKED = (1 << 8);
public static final int FLAG_KEY_FONT = (1 << 12); public static final int FLAG_KEY_FONT = (1 << 12);
public static final int FLAG_ACCENT1 = (1 << 16); public static final int FLAG_ACCENT1 = (1 << 16);
public static final int FLAG_ACCENT2 = (1 << 17); public static final int FLAG_ACCENT2 = (1 << 17);
public static final int FLAG_ACCENT3 = (1 << 18); public static final int FLAG_ACCENT3 = (1 << 18);
public static final int FLAG_ACCENT4 = (1 << 19); public static final int FLAG_ACCENT4 = (1 << 19);
public static final int FLAG_ACCENT5 = (1 << 20); public static final int FLAG_ACCENT5 = (1 << 20);
public static final int FLAG_ACCENT6 = (1 << 21); public static final int FLAG_ACCENT6 = (1 << 21);
public static final int FLAGS_ACCENTS = FLAG_ACCENT1 | FLAG_ACCENT2 | public static final int FLAGS_ACCENTS = FLAG_ACCENT1 | FLAG_ACCENT2 |
FLAG_ACCENT3 | FLAG_ACCENT4 | FLAG_ACCENT5 | FLAG_ACCENT6; FLAG_ACCENT3 | FLAG_ACCENT4 | FLAG_ACCENT5 | FLAG_ACCENT6;
private final String _name; public final String name;
private final String _symbol; public final String symbol;
private final char _char; public final char char_;
private final int _eventCode; public final int eventCode;
private final int _flags; public final int flags;
private int _cacheFlags; public KeyValue withCharAndSymbol(String s, char c)
private String _cacheSymbol; {
return new KeyValue(name, s, c, eventCode, flags);
}
public String getName() private static HashMap<String, KeyValue> keys = new HashMap<String, KeyValue>();
{
return (_name);
}
public String getSymbol(int flags) protected KeyValue(String n, String s, char c, int e, int f)
{ {
if (_symbol == null) name = n;
{ symbol = s;
if (flags != _cacheFlags) char_ = c;
{ eventCode = e;
_cacheSymbol = String.valueOf(getChar(flags)); flags = f;
_cacheFlags = flags; }
}
return (_cacheSymbol);
}
return (_symbol);
}
public char getChar(int flags) public static KeyValue getKeyByName(String name)
{ {
if (flags != 0) return (KeyValue.keys.get(name));
{ }
char c = _char;
if ((flags & FLAG_SHIFT) != 0)
c = Character.toUpperCase(_char);
if ((flags & FLAG_ACCENT1) != 0)
c = (char)KeyCharacterMap.getDeadChar('\u02CB', (int)c);
if ((flags & FLAG_ACCENT2) != 0)
c = (char)KeyCharacterMap.getDeadChar('\u00B4', (int)c);
if ((flags & FLAG_ACCENT3) != 0)
c = (char)KeyCharacterMap.getDeadChar('\u02C6', (int)c);
if ((flags & FLAG_ACCENT4) != 0)
c = (char)KeyCharacterMap.getDeadChar('\u02DC', (int)c);
if ((flags & FLAG_ACCENT5) != 0)
c = (char)KeyCharacterMap.getDeadChar('\u00B8', (int)c);
if ((flags & FLAG_ACCENT6) != 0)
c = (char)KeyCharacterMap.getDeadChar('\u00A8', (int)c);
if (c != 0)
return (c);
}
return (_char);
}
public int getEventCode()
{
return (_eventCode);
}
public int getFlags()
{
return (_flags);
}
private static HashMap<String, KeyValue> keys = new HashMap<String, KeyValue>();
protected KeyValue(String name, String symbol, char c, int eventCode, int flags)
{
_name = name;
_symbol = symbol;
_char = c;
_eventCode = eventCode;
_flags = flags;
_cacheFlags = -1;
}
public static KeyValue getKeyByName(String name)
{
return (KeyValue.keys.get(name));
}
private static void addKey(String name, String symbol, char c, int event, int flags) private static void addKey(String name, String symbol, char c, int event, int flags)
{ {
@ -215,6 +162,6 @@ class KeyValue
addKey("insert", "Ins", CHAR_NONE, KeyEvent.KEYCODE_INSERT, 0); addKey("insert", "Ins", CHAR_NONE, KeyEvent.KEYCODE_INSERT, 0);
addKey("tab", "↹", '\t', KeyEvent.KEYCODE_TAB, 0); addKey("tab", "↹", '\t', KeyEvent.KEYCODE_TAB, 0);
addKey("space", null, ' ', KeyEvent.KEYCODE_SPACE, 0); addKey("space", " ", ' ', KeyEvent.KEYCODE_SPACE, 0);
} }
} }

28
srcs/juloo.keyboard2/Keyboard2.java
View File

@ -130,30 +130,28 @@ public class Keyboard2 extends InputMethodService
public void handleKeyUp(KeyValue key, int flags) public void handleKeyUp(KeyValue key, int flags)
{ {
int eventCode = key.getEventCode();
char keyChar = key.getChar(flags);
if (getCurrentInputConnection() == null) if (getCurrentInputConnection() == null)
return ; return ;
if (eventCode == KeyValue.EVENT_CONFIG) key = KeyModifier.handleFlags(key, flags);
if (key.eventCode == KeyValue.EVENT_CONFIG)
{ {
Intent intent = new Intent(this, SettingsActivity.class); Intent intent = new Intent(this, SettingsActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(intent); startActivity(intent);
} }
else if (eventCode == KeyValue.EVENT_SWITCH_TEXT) else if (key.eventCode == KeyValue.EVENT_SWITCH_TEXT)
_keyboardView.setKeyboard(getLayout(_currentTextLayout)); _keyboardView.setKeyboard(getLayout(_currentTextLayout));
else if (eventCode == KeyValue.EVENT_SWITCH_NUMERIC) else if (key.eventCode == KeyValue.EVENT_SWITCH_NUMERIC)
_keyboardView.setKeyboard(getLayout(R.xml.numeric)); _keyboardView.setKeyboard(getLayout(R.xml.numeric));
else if (eventCode == KeyValue.EVENT_SWITCH_EMOJI) else if (key.eventCode == KeyValue.EVENT_SWITCH_EMOJI)
{ {
if (_emojiPane == null) if (_emojiPane == null)
_emojiPane = (ViewGroup)getLayoutInflater().inflate(R.layout.emoji_pane, null); _emojiPane = (ViewGroup)getLayoutInflater().inflate(R.layout.emoji_pane, null);
setInputView(_emojiPane); setInputView(_emojiPane);
} }
else if (eventCode == KeyValue.EVENT_SWITCH_BACK_EMOJI) else if (key.eventCode == KeyValue.EVENT_SWITCH_BACK_EMOJI)
setInputView(_keyboardView); setInputView(_keyboardView);
else if (eventCode == KeyValue.EVENT_CHANGE_METHOD) else if (key.eventCode == KeyValue.EVENT_CHANGE_METHOD)
{ {
InputMethodManager imm = (InputMethodManager)getSystemService(INPUT_METHOD_SERVICE); InputMethodManager imm = (InputMethodManager)getSystemService(INPUT_METHOD_SERVICE);
@ -165,15 +163,15 @@ public class Keyboard2 extends InputMethodService
// handleDelKey(1, 0); // handleDelKey(1, 0);
// else if (eventCode == KeyEvent.KEYCODE_FORWARD_DEL) // else if (eventCode == KeyEvent.KEYCODE_FORWARD_DEL)
// handleDelKey(0, 1); // handleDelKey(0, 1);
else if (keyChar == KeyValue.CHAR_NONE) else if (key.char_ == KeyValue.CHAR_NONE)
{ {
if (eventCode != KeyValue.EVENT_NONE) if (key.eventCode != KeyValue.EVENT_NONE)
handleMetaKeyUp(key, flags); handleMetaKeyUp(key, flags);
else else
getCurrentInputConnection().commitText(key.getSymbol(flags), 1); getCurrentInputConnection().commitText(key.symbol, 1);
} }
else else
sendKeyChar(keyChar); sendKeyChar(key.char_);
} }
// private void handleDelKey(int before, int after) // private void handleDelKey(int before, int after)
@ -191,7 +189,7 @@ public class Keyboard2 extends InputMethodService
int metaState = 0; int metaState = 0;
KeyEvent event; KeyEvent event;
if (key.getEventCode() == KeyValue.EVENT_NONE) if (key.eventCode == KeyValue.EVENT_NONE)
return ; return ;
if ((flags & KeyValue.FLAG_CTRL) != 0) if ((flags & KeyValue.FLAG_CTRL) != 0)
metaState |= KeyEvent.META_CTRL_LEFT_ON | KeyEvent.META_CTRL_ON; metaState |= KeyEvent.META_CTRL_LEFT_ON | KeyEvent.META_CTRL_ON;
@ -199,7 +197,7 @@ public class Keyboard2 extends InputMethodService
metaState |= KeyEvent.META_ALT_LEFT_ON | KeyEvent.META_ALT_ON; metaState |= KeyEvent.META_ALT_LEFT_ON | KeyEvent.META_ALT_ON;
if ((flags & KeyValue.FLAG_SHIFT) != 0) if ((flags & KeyValue.FLAG_SHIFT) != 0)
metaState |= KeyEvent.META_SHIFT_LEFT_ON | KeyEvent.META_SHIFT_ON; metaState |= KeyEvent.META_SHIFT_LEFT_ON | KeyEvent.META_SHIFT_ON;
event = new KeyEvent(1, 1, KeyEvent.ACTION_DOWN, key.getEventCode(), 1, metaState); event = new KeyEvent(1, 1, KeyEvent.ACTION_DOWN, key.eventCode, 1, metaState);
getCurrentInputConnection().sendKeyEvent(event); getCurrentInputConnection().sendKeyEvent(event);
getCurrentInputConnection().sendKeyEvent(KeyEvent.changeAction(event, KeyEvent.ACTION_UP)); getCurrentInputConnection().sendKeyEvent(KeyEvent.changeAction(event, KeyEvent.ACTION_UP));
} }

22
srcs/juloo.keyboard2/Keyboard2View.java
View File

@ -172,11 +172,11 @@ public class Keyboard2View extends View
if (key.timeoutWhat != -1) if (key.timeoutWhat != -1)
{ {
_handler.removeMessages(key.timeoutWhat); _handler.removeMessages(key.timeoutWhat);
if ((newValue.getFlags() & KeyValue.FLAG_NOREPEAT) == 0) if ((newValue.flags & KeyValue.FLAG_NOREPEAT) == 0)
_handler.sendEmptyMessageDelayed(key.timeoutWhat, _config.longPressTimeout); _handler.sendEmptyMessageDelayed(key.timeoutWhat, _config.longPressTimeout);
} }
key.value = newValue; key.value = newValue;
key.flags = newValue.getFlags(); key.flags = newValue.flags;
updateFlags(); updateFlags();
invalidate(); invalidate();
handleKeyDown(newValue); handleKeyDown(newValue);
@ -213,7 +213,7 @@ public class Keyboard2View extends View
else else
{ {
int what = _currentWhat++; int what = _currentWhat++;
if (key.key0 != null && (key.key0.getFlags() & KeyValue.FLAG_NOREPEAT) == 0) if (key.key0 != null && (key.key0.flags & KeyValue.FLAG_NOREPEAT) == 0)
_handler.sendEmptyMessageDelayed(what, _config.longPressTimeout); _handler.sendEmptyMessageDelayed(what, _config.longPressTimeout);
_downKeys.add(new KeyDown(pointerId, key, touchX, touchY, what)); _downKeys.add(new KeyDown(pointerId, key, touchX, touchY, what));
} }
@ -376,18 +376,20 @@ public class Keyboard2View extends View
private void drawLabel(Canvas canvas, KeyValue k, float x, float y, boolean locked) private void drawLabel(Canvas canvas, KeyValue k, float x, float y, boolean locked)
{ {
if ((k.getFlags() & KeyValue.FLAG_KEY_FONT) != 0) k = KeyModifier.handleFlags(k, _flags);
canvas.drawText(k.getSymbol(_flags), x, y, locked ? _specialKeyLabelLockedPaint : _specialKeyLabelPaint); if ((k.flags & KeyValue.FLAG_KEY_FONT) != 0)
canvas.drawText(k.symbol, x, y, locked ? _specialKeyLabelLockedPaint : _specialKeyLabelPaint);
else else
canvas.drawText(k.getSymbol(_flags), x, y, locked ? _keyLabelLockedPaint : _keyLabelPaint); canvas.drawText(k.symbol, x, y, locked ? _keyLabelLockedPaint : _keyLabelPaint);
} }
private void drawSubLabel(Canvas canvas, KeyValue k, float x, float y, boolean right) private void drawSubLabel(Canvas canvas, KeyValue k, float x, float y, boolean right)
{ {
if ((k.getFlags() & KeyValue.FLAG_KEY_FONT) != 0) k = KeyModifier.handleFlags(k, _flags);
canvas.drawText(k.getSymbol(_flags), x, y, right ? _specialKeySubLabelRightPaint : _specialKeySubLabelPaint); if ((k.flags & KeyValue.FLAG_KEY_FONT) != 0)
canvas.drawText(k.symbol, x, y, right ? _specialKeySubLabelRightPaint : _specialKeySubLabelPaint);
else else
canvas.drawText(k.getSymbol(_flags), x, y, right ? _keySubLabelRightPaint : _keySubLabelPaint); canvas.drawText(k.symbol, x, y, right ? _keySubLabelRightPaint : _keySubLabelPaint);
} }
private static class KeyDown private static class KeyDown
@ -407,7 +409,7 @@ public class Keyboard2View extends View
this.key = key; this.key = key;
downX = x; downX = x;
downY = y; downY = y;
flags = (value == null) ? 0 : value.getFlags(); flags = (value == null) ? 0 : value.flags;
timeoutWhat = what; timeoutWhat = what;
} }
} }

4
srcs/juloo.keyboard2/KeyboardData.java
View File

@ -168,7 +168,7 @@ class KeyboardData
public KeyValue map(KeyValue k) public KeyValue map(KeyValue k)
{ {
return (k == null || (k.getFlags() & _flags) != 0) ? null : k; return (k == null || (k.flags & _flags) != 0) ? null : k;
} }
} }
@ -180,7 +180,7 @@ class KeyboardData
public KeyValue map(KeyValue k) public KeyValue map(KeyValue k)
{ {
return (k == null || k.getEventCode() == _eventCode) ? null : k; return (k == null || k.eventCode == _eventCode) ? null : k;
} }
} }
} }