Skip to content

Add "Simple Telex 2" #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 31, 2023
Merged

Add "Simple Telex 2" #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions Sources/OpenKey/engine/DataType.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ enum vKeyEventState {
enum vKeyInputType {
vTelex = 0,
vVNI,
vSimpleTelex
vSimpleTelex1,
vSimpleTelex2
};

typedef unsigned char Byte;
Expand Down Expand Up @@ -137,9 +138,12 @@ struct vKeyHookState {
: (vInputType == vVNI ? \
keyCode == KEY_1 || keyCode == KEY_2 || keyCode == KEY_3 || keyCode == KEY_4 || \
keyCode == KEY_5 || keyCode == KEY_6 || keyCode == KEY_7 || keyCode == KEY_8 || keyCode == KEY_9 || keyCode == KEY_0 \
: (vInputType == vSimpleTelex ? \
: (vInputType == vSimpleTelex1 ? \
keyCode == KEY_W || keyCode == KEY_E || keyCode == KEY_R || keyCode == KEY_O || keyCode == KEY_A || keyCode == KEY_S || \
keyCode == KEY_D || keyCode == KEY_F || keyCode == KEY_J || keyCode == KEY_Z || keyCode == KEY_X || keyCode == KEY_W : false)))
keyCode == KEY_D || keyCode == KEY_F || keyCode == KEY_J || keyCode == KEY_Z || keyCode == KEY_X || keyCode == KEY_W \
: (vInputType == vSimpleTelex2 ? \
keyCode == KEY_W || keyCode == KEY_E || keyCode == KEY_R || keyCode == KEY_O || keyCode == KEY_A || keyCode == KEY_S || \
keyCode == KEY_D || keyCode == KEY_F || keyCode == KEY_J || keyCode == KEY_Z || keyCode == KEY_X || keyCode == KEY_W : false))))

//is VNI or Unicode compound...
#define IS_DOUBLE_CODE(code) (code == 2 || code == 3)
Expand Down
15 changes: 8 additions & 7 deletions Sources/OpenKey/engine/Engine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,23 @@ static vector<Uint8> _macroBreakCode = {
static Uint16 ProcessingChar[][11] = {
{KEY_S, KEY_F, KEY_R, KEY_X, KEY_J, KEY_A, KEY_O, KEY_E, KEY_W, KEY_D, KEY_Z}, //Telex
{KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_6, KEY_7, KEY_8, KEY_9, KEY_0}, //VNI
{KEY_S, KEY_F, KEY_R, KEY_X, KEY_J, KEY_A, KEY_O, KEY_E, KEY_W, KEY_D, KEY_Z} //Simple Telex
{KEY_S, KEY_F, KEY_R, KEY_X, KEY_J, KEY_A, KEY_O, KEY_E, KEY_W, KEY_D, KEY_Z}, //Simple Telex 1
{KEY_S, KEY_F, KEY_R, KEY_X, KEY_J, KEY_A, KEY_O, KEY_E, KEY_W, KEY_D, KEY_Z} //Simple Telex 2
};

#define IS_KEY_Z(key) (ProcessingChar[vInputType][10] == key)
#define IS_KEY_D(key) (ProcessingChar[vInputType][9] == key)
#define IS_KEY_W(key) ((vInputType == vTelex || vInputType == vSimpleTelex) ? ProcessingChar[vInputType][8] == key : \
#define IS_KEY_W(key) ((vInputType != vVNI) ? ProcessingChar[vInputType][8] == key : \
(vInputType == vVNI ? (ProcessingChar[vInputType][8] == key || ProcessingChar[vInputType][7] == key) : false))
#define IS_KEY_DOUBLE(key) ((vInputType == vTelex || vInputType == vSimpleTelex) ? (ProcessingChar[vInputType][5] == key || ProcessingChar[vInputType][6] == key || ProcessingChar[vInputType][7] == key) :\
#define IS_KEY_DOUBLE(key) ((vInputType != vVNI) ? (ProcessingChar[vInputType][5] == key || ProcessingChar[vInputType][6] == key || ProcessingChar[vInputType][7] == key) :\
(vInputType == vVNI ? ProcessingChar[vInputType][6] == key : false))
#define IS_KEY_S(key) (ProcessingChar[vInputType][0] == key)
#define IS_KEY_F(key) (ProcessingChar[vInputType][1] == key)
#define IS_KEY_R(key) (ProcessingChar[vInputType][2] == key)
#define IS_KEY_X(key) (ProcessingChar[vInputType][3] == key)
#define IS_KEY_J(key) (ProcessingChar[vInputType][4] == key)

#define IS_MARK_KEY(keyCode) (((vInputType == vTelex || vInputType == vSimpleTelex) && (keyCode == KEY_S || keyCode == KEY_F || keyCode == KEY_R || keyCode == KEY_J || keyCode == KEY_X)) || \
#define IS_MARK_KEY(keyCode) (((vInputType != vVNI) && (keyCode == KEY_S || keyCode == KEY_F || keyCode == KEY_R || keyCode == KEY_J || keyCode == KEY_X)) || \
(vInputType == vVNI && (keyCode == KEY_1 || keyCode == KEY_2 || keyCode == KEY_3 || keyCode == KEY_5 || keyCode == KEY_4)))
#define IS_BRACKET_KEY(key) (key == KEY_LEFT_BRACKET || key == KEY_RIGHT_BRACKET)

Expand Down Expand Up @@ -1150,7 +1151,7 @@ void handleMainKey(const Uint16& data, const bool& isCaps) {
}
}

keyForAEO = ((vInputType == vTelex || vInputType == vSimpleTelex) ? data : ((data == KEY_7 || data == KEY_8 ? KEY_W : (data == KEY_6 ? TypingWord[VEI] : data))));
keyForAEO = ((vInputType != vVNI) ? data : ((data == KEY_7 || data == KEY_8 ? KEY_W : (data == KEY_6 ? TypingWord[VEI] : data))));
vector<vector<Uint16>>& charset = _vowel[keyForAEO];
isCorect = false;
isChanged = false;
Expand Down Expand Up @@ -1183,7 +1184,7 @@ void handleMainKey(const Uint16& data, const bool& isCaps) {
}

if (!isChanged) {
if (data == KEY_W && vInputType != vSimpleTelex) {
if (data == KEY_W && vInputType != vSimpleTelex1) {
checkForStandaloneChar(data, isCaps, KEY_U);
} else {
insertKey(data, isCaps);
Expand Down Expand Up @@ -1537,7 +1538,7 @@ void vKeyHandleEvent(const vKeyEvent& event,
}

//case [ ]
if (IS_BRACKET_KEY(data) && (( IS_BRACKET_KEY((Uint16)hData[0])) || vInputType == vSimpleTelex)) {
if (IS_BRACKET_KEY(data) && (( IS_BRACKET_KEY((Uint16)hData[0])) || vInputType == vSimpleTelex1 || vInputType == vSimpleTelex2)) {
if (_index - (hCode == vWillProcess ? hBPC : 0) > 0) {
_index--;
saveWord();
Expand Down
Binary file added Sources/OpenKey/macOS/.DS_Store
View file
Open in desktop
Binary file not shown.
16 changes: 11 additions & 5 deletions Sources/OpenKey/macOS/ModernKey/AppDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ @implementation AppDelegate {

NSMenuItem* mnuTelex;
NSMenuItem* mnuVNI;
NSMenuItem* mnuSimpleTelex;
NSMenuItem* mnuSimpleTelex1;
NSMenuItem* mnuSimpleTelex2;

NSMenuItem* mnuUnicode;
NSMenuItem* mnuTCVN;
Expand Down Expand Up @@ -319,8 +320,10 @@ - (void)setInputTypeMenu:(NSMenuItem*) parent {
mnuTelex.tag = 0;
mnuVNI = [sub addItemWithTitle:@"VNI" action:@selector(onInputTypeSelected:) keyEquivalent:@""];
mnuVNI.tag = 1;
mnuSimpleTelex = [sub addItemWithTitle:@"Simple Telex" action:@selector(onInputTypeSelected:) keyEquivalent:@""];
mnuSimpleTelex.tag = 2;
mnuSimpleTelex1 = [sub addItemWithTitle:@"Simple Telex 1" action:@selector(onInputTypeSelected:) keyEquivalent:@""];
mnuSimpleTelex1.tag = 2;
mnuSimpleTelex2 = [sub addItemWithTitle:@"Simple Telex 2" action:@selector(onInputTypeSelected:) keyEquivalent:@""];
mnuSimpleTelex2.tag = 3;
[theMenu setSubmenu:sub forItem:parent];
}

Expand Down Expand Up @@ -356,13 +359,16 @@ - (void) fillData {
NSInteger intInputType = [[NSUserDefaults standardUserDefaults] integerForKey:@"InputType"];
[mnuTelex setState:NSControlStateValueOff];
[mnuVNI setState:NSControlStateValueOff];
[mnuSimpleTelex setState:NSControlStateValueOff];
[mnuSimpleTelex1 setState:NSControlStateValueOff];
[mnuSimpleTelex2 setState:NSControlStateValueOff];
if (intInputType == 0) {
[mnuTelex setState:NSControlStateValueOn];
} else if (intInputType == 1) {
[mnuVNI setState:NSControlStateValueOn];
} else if (intInputType == 2) {
[mnuSimpleTelex setState:NSControlStateValueOn];
[mnuSimpleTelex1 setState:NSControlStateValueOn];
} else if (intInputType == 3) {
[mnuSimpleTelex2 setState:NSControlStateValueOn];
}
vInputType = (int)intInputType;

Expand Down
Loading