extern/Unexpected-Keyboard
1
0
Fork 1
mirror of https://github.com/Julow/Unexpected-Keyboard.git synced 2024-11-25 00:33:24 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix KeyValue flags layout

Browse Source 
The kind field wasn't large enough to hold the new Compose_pending kind.
The flags field is reduced in size by removing a free spot.

The FLAGS_BITS mask is defined in a safer way.
This commit is contained in:
Jules Aguillon 2024-02-16 20:43:39 +01:00
parent d56e4d129e
commit bb60ed9b13
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,28 +93,36 @@ public final class KeyValue
Compose_pending Compose_pending
} }
private static final int FLAGS_OFFSET = 19;
private static final int KIND_OFFSET = 28;
// Behavior flags. // Behavior flags.
public static final int FLAG_LATCH = (1 << 20); public static final int FLAG_LATCH = (1 << FLAGS_OFFSET << 0);
public static final int FLAG_LOCK = (1 << 21); public static final int FLAG_LOCK = (1 << FLAGS_OFFSET << 1);
// Special keys are not repeated and don't clear latched modifiers. // Special keys are not repeated and don't clear latched modifiers.
public static final int FLAG_SPECIAL = (1 << 22); public static final int FLAG_SPECIAL = (1 << FLAGS_OFFSET << 2);
// Free flag: (1 << 23); // Free flag: (1 << FLAGS_OFFSET << 3);
// Rendering flags. // Rendering flags.
public static final int FLAG_KEY_FONT = (1 << 24); // special font file public static final int FLAG_KEY_FONT = (1 << FLAGS_OFFSET << 4); // special font file
public static final int FLAG_SMALLER_FONT = (1 << 25); // 25% smaller symbols public static final int FLAG_SMALLER_FONT = (1 << FLAGS_OFFSET << 5); // 25% smaller symbols
public static final int FLAG_SECONDARY = (1 << 26); // dimmer public static final int FLAG_SECONDARY = (1 << FLAGS_OFFSET << 6); // dimmer
// Used by [Pointers]. // Used by [Pointers].
public static final int FLAG_LOCKED = (1 << 28); public static final int FLAG_LOCKED = (1 << FLAGS_OFFSET << 7);
public static final int FLAG_FAKE_PTR = (1 << 29); public static final int FLAG_FAKE_PTR = (1 << FLAGS_OFFSET << 8);
// Ranges for the different components // Ranges for the different components
private static final int FLAGS_BITS = (0b111111111 << 20); // 9 bits wide private static final int FLAGS_BITS =
private static final int KIND_BITS = (0b111 << 29); // 3 bits wide FLAG_LATCH | FLAG_LOCK | FLAG_SPECIAL | FLAG_KEY_FONT | FLAG_SMALLER_FONT |
FLAG_SECONDARY | FLAG_LOCKED | FLAG_FAKE_PTR;
private static final int KIND_BITS = (0b1111 << KIND_OFFSET); // 4 bits wide
private static final int VALUE_BITS = ~(FLAGS_BITS | KIND_BITS); // 20 bits wide private static final int VALUE_BITS = ~(FLAGS_BITS | KIND_BITS); // 20 bits wide
static static
{ {
check((FLAGS_BITS & KIND_BITS) == 0); // No overlap check((FLAGS_BITS & KIND_BITS) == 0); // No overlap
check((FLAGS_BITS | KIND_BITS | VALUE_BITS) == ~0); // No holes check((FLAGS_BITS | KIND_BITS | VALUE_BITS) == ~0); // No holes
// No kind is out of range
check((((Kind.values().length - 1) << KIND_OFFSET) & ~KIND_BITS) == 0);
} }
private final String _symbol; private final String _symbol;
@ -124,7 +132,7 @@ public final class KeyValue
public Kind getKind() public Kind getKind()
{ {
return Kind.values()[(_code & KIND_BITS) >>> 29]; return Kind.values()[(_code & KIND_BITS) >>> KIND_OFFSET];
} }
public int getFlags() public int getFlags()
@ -229,16 +237,13 @@ public final class KeyValue
public KeyValue(String s, int kind, int value, int flags) public KeyValue(String s, int kind, int value, int flags)
{ {
check((kind & ~KIND_BITS) == 0);
check((flags & ~FLAGS_BITS) == 0);
check((value & ~VALUE_BITS) == 0);
_symbol = s; _symbol = s;
_code = kind | flags | value; _code = (kind & KIND_BITS) | (flags & FLAGS_BITS) | (value & VALUE_BITS);
} }
public KeyValue(String s, Kind k, int v, int f) public KeyValue(String s, Kind k, int v, int f)
{ {
this(s, (k.ordinal() << 29), v, f); this(s, (k.ordinal() << KIND_OFFSET), v, f);
} }
private static KeyValue charKey(String symbol, char c, int flags) private static KeyValue charKey(String symbol, char c, int flags)