extern/Unexpected-Keyboard
1
0
Fork 1
mirror of https://github.com/Julow/Unexpected-Keyboard.git synced 2024-12-24 15:08:52 +01:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Record activated modifiers on key down

Browse Source 
The View no longer keeps flags for something other than rendering.
This commit is contained in:
Jules Aguillon 2022-04-30 23:17:20 +02:00
parent 2df4764557
commit 84af72c222
2 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,33 +67,33 @@ public class Keyboard2View extends View
invalidate(); invalidate();
} }
public KeyValue onPointerDown(KeyValue k) public KeyValue onPointerDown(KeyValue k, int flags)
{ {
k = KeyModifier.handleFlags(k, _flags); k = KeyModifier.handleFlags(k, flags);
invalidate(); invalidate();
if (k != null) if (k != null)
vibrate(); vibrate();
return k; return k;
} }
public KeyValue onPointerSwipe(KeyValue k) public KeyValue onPointerSwipe(KeyValue k, int flags)
{ {
k = KeyModifier.handleFlags(k, _flags); k = KeyModifier.handleFlags(k, flags);
invalidate(); invalidate();
if (k != null) if (k != null)
vibrate(); vibrate();
return k; return k;
} }
public void onPointerUp(KeyValue k) public void onPointerUp(KeyValue k, int flags)
{ {
_config.handler.handleKeyUp(k, _flags); _config.handler.handleKeyUp(k, flags);
invalidate(); invalidate();
} }
public void onPointerHold(KeyValue k) public void onPointerHold(KeyValue k, int flags)
{ {
_config.handler.handleKeyUp(k, _flags); _config.handler.handleKeyUp(k, flags);
} }
public void onPointerFlagsChanged() public void onPointerFlagsChanged()

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

@ -80,7 +80,7 @@ public final class Pointers implements Handler.Callback
else // Otherwise, unlatch else // Otherwise, unlatch
{ {
removePtr(latched); removePtr(latched);
_handler.onPointerUp(ptr.value); _handler.onPointerUp(ptr.value, ptr.modifier_flags);
} }
} }
else if ((ptr.flags & KeyValue.FLAG_LATCH) != 0) else if ((ptr.flags & KeyValue.FLAG_LATCH) != 0)
@ -93,7 +93,7 @@ public final class Pointers implements Handler.Callback
{ {
clearLatched(); clearLatched();
removePtr(ptr); removePtr(ptr);
_handler.onPointerUp(ptr.value); _handler.onPointerUp(ptr.value, ptr.modifier_flags);
} }
} }
@ -114,8 +114,9 @@ public final class Pointers implements Handler.Callback
// keys. // keys.
if (isModulatedKeyPressed()) if (isModulatedKeyPressed())
return; return;
KeyValue value = _handler.onPointerDown(key.key0); int mflags = getFlags();
Pointer ptr = new Pointer(pointerId, key, 0, value, x, y); KeyValue value = _handler.onPointerDown(key.key0, mflags);
Pointer ptr = new Pointer(pointerId, key, 0, value, x, y, mflags);
_ptrs.add(ptr); _ptrs.add(ptr);
if (value != null && (value.flags & KeyValue.FLAG_NOREPEAT) == 0) if (value != null && (value.flags & KeyValue.FLAG_NOREPEAT) == 0)
startKeyRepeat(ptr); startKeyRepeat(ptr);
@ -152,7 +153,8 @@ public final class Pointers implements Handler.Callback
if (newIndex != ptr.value_index) if (newIndex != ptr.value_index)
{ {
ptr.value_index = newIndex; ptr.value_index = newIndex;
KeyValue newValue = _handler.onPointerSwipe(ptr.key.getValue(newIndex)); KeyValue newValue =
_handler.onPointerSwipe(ptr.key.getValue(newIndex), ptr.modifier_flags);
if (newValue != null) if (newValue != null)
{ {
int old_flags = ptr.flags; int old_flags = ptr.flags;
@ -237,7 +239,7 @@ public final class Pointers implements Handler.Callback
nextInterval = (long)((float)nextInterval / modulatePreciseRepeat(ptr)); nextInterval = (long)((float)nextInterval / modulatePreciseRepeat(ptr));
} }
_keyrepeat_handler.sendEmptyMessageDelayed(msg.what, nextInterval); _keyrepeat_handler.sendEmptyMessageDelayed(msg.what, nextInterval);
_handler.onPointerHold(ptr.value); _handler.onPointerHold(ptr.value, ptr.modifier_flags);
return (true); return (true);
} }
} }
@ -290,13 +292,16 @@ public final class Pointers implements Handler.Callback
public float downY; public float downY;
/** Distance of the pointer to the initial press. */ /** Distance of the pointer to the initial press. */
public float ptrDist; public float ptrDist;
/** Modifier flags at the time the key was pressed. */
public int modifier_flags;
/** Flags of the value. Latch, lock and locked flags are updated. */
public int flags; public int flags;
/** Identify timeout messages. */ /** Identify timeout messages. */
public int timeoutWhat; public int timeoutWhat;
/** ptrDist at the first repeat, -1 otherwise. */ /** ptrDist at the first repeat, -1 otherwise. */
public float repeatingPtrDist; public float repeatingPtrDist;
public Pointer(int p, KeyboardData.Key k, int vi, KeyValue v, float x, float y) public Pointer(int p, KeyboardData.Key k, int vi, KeyValue v, float x, float y, int mflags)
{ {
pointerId = p; pointerId = p;
key = k; key = k;
@ -305,6 +310,7 @@ public final class Pointers implements Handler.Callback
downX = x; downX = x;
downY = y; downY = y;
ptrDist = 0.f; ptrDist = 0.f;
modifier_flags = mflags;
flags = (v == null) ? 0 : v.flags; flags = (v == null) ? 0 : v.flags;
timeoutWhat = -1; timeoutWhat = -1;
repeatingPtrDist = -1.f; repeatingPtrDist = -1.f;
@ -315,19 +321,19 @@ public final class Pointers implements Handler.Callback
{ {
/** A key is pressed. Key can be modified or removed by returning [null]. /** A key is pressed. Key can be modified or removed by returning [null].
[getFlags()] is not uptodate. */ [getFlags()] is not uptodate. */
public KeyValue onPointerDown(KeyValue k); public KeyValue onPointerDown(KeyValue k, int flags);
/** Pointer swipes into a corner. Key can be modified or removed. */ /** Pointer swipes into a corner. Key can be modified or removed. */
public KeyValue onPointerSwipe(KeyValue k); public KeyValue onPointerSwipe(KeyValue k, int flags);
/** Key is released. [k] is the key that was returned by [onPointerDown] or /** Key is released. [k] is the key that was returned by [onPointerDown] or
[onPointerSwipe]. */ [onPointerSwipe]. */
public void onPointerUp(KeyValue k); public void onPointerUp(KeyValue k, int flags);
/** Flags changed because latched or locked keys or cancelled pointers. */ /** Flags changed because latched or locked keys or cancelled pointers. */
public void onPointerFlagsChanged(); public void onPointerFlagsChanged();
/** Key is repeating. */ /** Key is repeating. */
public void onPointerHold(KeyValue k); public void onPointerHold(KeyValue k, int flags);
} }
} }