extern/Unexpected-Keyboard
1
0
Fork 1
mirror of https://github.com/Julow/Unexpected-Keyboard.git synced 2025-06-28 21:51:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix modifiers

Browse Source 
Fixes:
- Toggling off a modifier was not possible in the corners (eg. accents).
- Modifiers on the same key can't be activated at the same time.
- Characters on the same key as a modifier weren't working properly.
This commit is contained in:
Jules Aguillon 2021-04-29 00:08:55 +02:00
parent d00576ac2d
commit 3f0c18612f
1 changed files with 60 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,24 +208,10 @@ public class Keyboard2View extends View
float keyW = _keyWidth * key.width; float keyW = _keyWidth * key.width;
if (touchX >= x && touchX < (x + keyW)) if (touchX >= x && touchX < (x + keyW))
{ {
KeyDown down = getKeyDown(key); int what = _currentWhat++;
if (down != null) if (key.key0 != null && (key.key0.flags & KeyValue.FLAG_NOREPEAT) == 0)
{ _handler.sendEmptyMessageDelayed(what, _config.longPressTimeout);
if ((down.flags & KeyValue.FLAG_LOCK) != 0) _downKeys.add(new KeyDown(pointerId, key, touchX, touchY, what));
{
down.flags ^= KeyValue.FLAG_LOCK;
down.flags |= KeyValue.FLAG_LOCKED;
}
else if (down.pointerId == -1)
down.pointerId = pointerId;
}
else
{
int what = _currentWhat++;
if (key.key0 != null && (key.key0.flags & KeyValue.FLAG_NOREPEAT) == 0)
_handler.sendEmptyMessageDelayed(what, _config.longPressTimeout);
_downKeys.add(new KeyDown(pointerId, key, touchX, touchY, what));
}
handleKeyDown(key.key0); handleKeyDown(key.key0);
updateFlags(); updateFlags();
invalidate(); invalidate();
@ -236,36 +222,67 @@ public class Keyboard2View extends View
} }
} }
// Whether a key is already activated (key down but pointer up)
private KeyDown getActivatedKey(KeyValue kv)
{
for (KeyDown k : _downKeys)
{
if (k.value == kv && k.pointerId == -1)
return (k);
}
return (null);
}
private void onTouchUp(int pointerId) private void onTouchUp(int pointerId)
{ {
KeyDown k = getKeyDown(pointerId); KeyDown k = getKeyDown(pointerId);
if (k != null) if (k != null)
{ {
if (k.timeoutWhat != -1) // Stop key repeat
{ if (k.timeoutWhat != -1)
_handler.removeMessages(k.timeoutWhat); {
k.timeoutWhat = -1; _handler.removeMessages(k.timeoutWhat);
} k.timeoutWhat = -1;
if ((k.flags & KeyValue.FLAG_KEEP_ON) != 0) }
{ KeyDown k_on = getActivatedKey(k.value);
k.flags ^= KeyValue.FLAG_KEEP_ON; if (k_on != null)
k.pointerId = -1; {
return ; _downKeys.remove(k); // Remove dupplicate
} // Same key with FLAG_LOCK is already on, do lock
for (int i = 0; i < _downKeys.size(); i++) if ((k_on.flags & KeyValue.FLAG_LOCK) != 0)
{ {
KeyDown downKey = _downKeys.get(i); k_on.flags ^= KeyValue.FLAG_LOCK; // Next time, disable it
if (downKey.pointerId == -1 && (downKey.flags & KeyValue.FLAG_LOCKED) == 0) k_on.flags |= KeyValue.FLAG_LOCKED;
_downKeys.remove(i--); }
else if ((downKey.flags & KeyValue.FLAG_KEEP_ON) != 0) // Otherwise, toggle it
downKey.flags ^= KeyValue.FLAG_KEEP_ON; else
} {
_downKeys.remove(k); _downKeys.remove(k_on);
handleKeyUp(k); }
updateFlags(); }
invalidate(); // Key stay activated
return ; else if ((k.flags & KeyValue.FLAG_KEEP_ON) != 0)
{
k.pointerId = -1; // Set pointer up
}
else // Regular key up
{
for (int i = 0; i < _downKeys.size(); i++)
{
KeyDown downKey = _downKeys.get(i);
// Disable other activated keys that aren't locked
if (downKey.pointerId == -1 && (downKey.flags & KeyValue.FLAG_LOCKED) == 0)
_downKeys.remove(i--);
// Other keys currently down won't stay activated
else if ((downKey.flags & KeyValue.FLAG_KEEP_ON) != 0)
downKey.flags ^= KeyValue.FLAG_KEEP_ON;
}
_downKeys.remove(k);
handleKeyUp(k);
}
updateFlags();
invalidate();
} }
} }
@ -413,6 +430,7 @@ public class Keyboard2View extends View
private static class KeyDown private static class KeyDown
{ {
/* -1 if pointer is up. */
public int pointerId; public int pointerId;
public KeyValue value; public KeyValue value;
public KeyboardData.Key key; public KeyboardData.Key key;