Add a ton of new features

Author: tuyenvm

Sources/OpenKey/engine/Engine.cpp

@@ -112,6 +112,7 @@ static bool _isCharKeyCode;
 static vector<Uint32> _specialChar;
 static bool _useSpellCheckingBefore;
 static bool _hasHandleQuickConsonant;
+static bool _willTempOffEngine = false;
 
 //function prototype
 void findAndCalculateVowel(const bool& forGrammar=false);
@@ -1216,6 +1217,10 @@ void vSetCheckSpelling() {
     _useSpellCheckingBefore = vCheckSpelling;
 }
 
+void vTempOffEngine() {
+    _willTempOffEngine = true;
+}
+
 bool checkQuickConsonant() {
     if (_index <= 1) return false;
     l = 0;
@@ -1267,22 +1272,28 @@ void vEnglishMode(const vKeyEventState& state, const Uint16& data, const bool& i
     hCode = vDoNothing;
     if (state == vKeyEventState::MouseDown || (otherControlKey && !isCaps)) {
         hMacroKey.clear();
+        _willTempOffEngine = false;
     } else if (data == KEY_SPACE) {
         if (!_hasHandledMacro && findMacro(hMacroKey, hMacroData)) {
             hCode = vReplaceMaro;
             hBPC = (Byte)hMacroKey.size();
         }
         hMacroKey.clear();
+        _willTempOffEngine = false;
     } else if (data == KEY_DELETE) {
         if (hMacroKey.size() > 0) {
             hMacroKey.pop_back();
+        } else {
+            _willTempOffEngine = false;
         }
     } else {
         if (isWordBreak(vKeyEvent::Keyboard, state, data) &&
             std::find(_charKeyCode.begin(), _charKeyCode.end(), data) == _charKeyCode.end()) {
             hMacroKey.clear();
+            _willTempOffEngine = false;
         } else {
-            hMacroKey.push_back(data | (isCaps ? CAPS_MASK : 0));
+            if (!_willTempOffEngine)
+                hMacroKey.push_back(data | (isCaps ? CAPS_MASK : 0));
         }
     }
 }
@@ -1335,6 +1346,7 @@ void vKeyHandleEvent(const vKeyEvent& event,
         if (hCode == vDoNothing) {
             startNewSession();
             vCheckSpelling = _useSpellCheckingBefore;
+            _willTempOffEngine = false;
         } else if (hCode == vReplaceMaro || _hasHandleQuickConsonant) {
             _index = 0;
         }
@@ -1391,6 +1403,7 @@ void vKeyHandleEvent(const vKeyEvent& event,
             }
         }
         vCheckSpelling = _useSpellCheckingBefore;
+        _willTempOffEngine = false;
     } else if (data == KEY_DELETE) {
         hCode = vDoNothing;
         hExt = 2; //delete
@@ -1438,6 +1451,11 @@ void vKeyHandleEvent(const vKeyEvent& event,
             }
         }
     } else { //START AND CHECK KEY
+        if (_willTempOffEngine) {
+            hCode = vDoNothing;
+            hExt = 3;
+            return;
+        }
         if (_spaceCount > 0) {
             hBPC = 0;
             hNCC = 0;

Sources/OpenKey/engine/Engine.h

@@ -161,14 +161,25 @@ extern int vAllowConsonantZFWJ;
  */
 extern int vQuickStartConsonant;
 
-/*
+/**
  * 0: No; 1: Yes
  * g -> ng: hag -> hang,...
  * h -> nh: vih -> vinh,...
  * k -> ch: bak -> bach,...
  */
 extern int vQuickEndConsonant;
 
+/**
+ * 0: No; 1: Yes
+ * Auto remember table code for each application
+ */
+extern int vRememberCode;
+
+/**
+ * 0: No; 1: Yes
+ * Temporarily turn off OpenKey  by hot key (Command on mac, Alt on Windows and Linux)
+ */
+extern int vTempOffOpenKey;
 
 /**
  * Call this function first to receive data pointer
@@ -214,6 +225,11 @@ void vTempOffSpellChecking();
  */
 void vSetCheckSpelling();
 
+/**
+ * temporarily turn off OpenKey engine
+ */
+void vTempOffEngine();
+
 /**
  * some utils function
  */

Sources/OpenKey/macOS/ModernKey/AboutViewController.m

@@ -41,12 +41,7 @@ - (IBAction)onLatestReleaseVersion:(id)sender {
 }
 
 - (IBAction)onCheckUpdateOnStartup:(NSButton *)sender {
-    NSInteger val = 0;
-    if (sender.state == NSControlStateValueOn) {
-        val = 0;
-    } else {
-        val = 1;
-    }
+    NSInteger val = sender.state == NSControlStateValueOn ? 0 : 1;
     [[NSUserDefaults standardUserDefaults] setInteger:val forKey:@"DontCheckUpdate"];
 }
 
@@ -55,7 +50,7 @@ - (IBAction)onCheckNewVersion:(id)sender {
     self.CheckNewVersionButton.title = @"Đang kiểm tra...";
     self.CheckNewVersionButton.enabled = false;
 
-    [OpenKeyManager checkNewVersion:^{
+    [OpenKeyManager checkNewVersion: self.view.window callbackFunc:^{
         self.CheckNewVersionButton.enabled = true;
         self.CheckNewVersionButton.title = @"Kiểm tra bản mới...";
     }];

Sources/OpenKey/macOS/ModernKey/AppDelegate.h

@@ -9,6 +9,8 @@
 #import <Cocoa/Cocoa.h>
 #import "ViewController.h"
 
+#define OPENKEY_BUNDLE @"com.tuyenmai.openkey"
+
 @interface AppDelegate : NSObject <NSApplicationDelegate>
 
 -(void)onImputMethodChanged:(BOOL)willNotify;
@@ -27,5 +29,7 @@
 -(void)onMacroSelected;
 -(void)onQuickConvert;
 -(void)setQuickConvertString;
+
+-(void)showIconOnDock:(BOOL)val;
 @end
 

Sources/OpenKey/macOS/ModernKey/AppDelegate.m

@@ -44,6 +44,13 @@
 int vAllowConsonantZFWJ = 0;
 int vQuickStartConsonant = 0;
 int vQuickEndConsonant = 0;
+int vRememberCode = 1; //new on version 2.0
+int vTempOffOpenKey = 0; //new on version 2.0
+
+int vShowIconOnDock = 0; //new on version 2.0
+
+//beta feature
+int vFixChromiumBrowser = 0; //new on version 2.0
 
 extern int convertToolHotKey;
 extern bool convertToolDontAlertWhenCompleted;
@@ -103,9 +110,13 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
 
     [self registerSupportedNotification];
 
+    //set quick tooltip
+    [[NSUserDefaults standardUserDefaults] setObject: [NSNumber numberWithInt: 50]
+                                              forKey: @"NSInitialToolTipDelay"];
+    
     //check whether this app has been launched before that or not
     NSArray* runningApp = [[NSWorkspace sharedWorkspace] runningApplications];
-    if ([runningApp containsObject:@"com.tuyenmai.openkey"]) { //if already running -> exit
+    if ([runningApp containsObject:OPENKEY_BUNDLE]) { //if already running -> exit
         [NSApp terminate:nil];
         return;
     }
@@ -115,8 +126,10 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
         [self askPermission];
         return;
     }
-
-    //[NSApp setActivationPolicy: NSApplicationActivationPolicyProhibited];
+    
+    vShowIconOnDock = (int)[[NSUserDefaults standardUserDefaults] integerForKey:@"vShowIconOnDock"];
+    if (vShowIconOnDock)
+        [NSApp setActivationPolicy: NSApplicationActivationPolicyRegular];
 
     if (vSwitchKeyStatus & 0x8000)
         NSBeep();
@@ -145,7 +158,11 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
     //check update if enable
     NSInteger dontCheckUpdate = [[NSUserDefaults standardUserDefaults] integerForKey:@"DontCheckUpdate"];
     if (!dontCheckUpdate)
-        [OpenKeyManager checkNewVersion:nil];
+        [OpenKeyManager checkNewVersion:nil callbackFunc:nil];
+    
+    //correct run on startup
+    NSInteger val = [[NSUserDefaults standardUserDefaults] integerForKey:@"RunOnStartup"];
+    [appDelegate setRunOnStartup:val];
 }
 
 
@@ -248,7 +265,7 @@ -(void)loadDefaultConfig {
     vCodeTable = 0; [[NSUserDefaults standardUserDefaults] setInteger:vCodeTable forKey:@"CodeTable"];
     vSwitchKeyStatus = DEFAULT_SWITCH_STATUS; [[NSUserDefaults standardUserDefaults] setInteger:vCodeTable forKey:@"SwitchKeyStatus"];
     vQuickTelex = 0; [[NSUserDefaults standardUserDefaults] setInteger:vQuickTelex forKey:@"QuickTelex"];
-    vUseModernOrthography = 1; [[NSUserDefaults standardUserDefaults] setInteger:vUseModernOrthography forKey:@"ModernOrthography"];
+    vUseModernOrthography = 0; [[NSUserDefaults standardUserDefaults] setInteger:vUseModernOrthography forKey:@"ModernOrthography"];
     vRestoreIfWrongSpelling = 0; [[NSUserDefaults standardUserDefaults] setInteger:vRestoreIfWrongSpelling forKey:@"RestoreIfInvalidWord"];
     vFixRecommendBrowser = 1; [[NSUserDefaults standardUserDefaults] setInteger:vFixRecommendBrowser forKey:@"FixRecommendBrowser"];
     vUseMacro = 1; [[NSUserDefaults standardUserDefaults] setInteger:vUseMacro forKey:@"UseMacro"];
@@ -260,6 +277,11 @@ -(void)loadDefaultConfig {
     vAllowConsonantZFWJ = 0;[[NSUserDefaults standardUserDefaults] setInteger:vAllowConsonantZFWJ forKey:@"vAllowConsonantZFWJ"];
     vQuickStartConsonant = 0;[[NSUserDefaults standardUserDefaults] setInteger:vQuickStartConsonant forKey:@"vQuickStartConsonant"];
     vQuickEndConsonant = 0;[[NSUserDefaults standardUserDefaults] setInteger:vQuickEndConsonant forKey:@"vQuickEndConsonant"];
+    vRememberCode = 1;[[NSUserDefaults standardUserDefaults] setInteger:vRememberCode forKey:@"vRememberCode"];
+    vTempOffOpenKey = 0;[[NSUserDefaults standardUserDefaults] setInteger:vTempOffOpenKey forKey:@"vTempOffOpenKey"];
+    vShowIconOnDock = 0;[[NSUserDefaults standardUserDefaults] setInteger:vShowIconOnDock forKey:@"vShowIconOnDock"];
+    vFixChromiumBrowser = 0;[[NSUserDefaults standardUserDefaults] setInteger:vFixChromiumBrowser forKey:@"vFixChromiumBrowser"];
+    [[NSUserDefaults standardUserDefaults] setInteger:1 forKey:@"RunOnStartup"];
 
     [self fillData];
     [viewController fillData];
@@ -273,6 +295,11 @@ -(void)setRunOnStartup:(BOOL)val {
 -(void)setGrayIcon:(BOOL)val {
     [self fillData];
 }
+
+-(void)showIconOnDock:(BOOL)val {
+    [NSApp setActivationPolicy: val ? NSApplicationActivationPolicyRegular : NSApplicationActivationPolicyProhibited];
+}
+
 #pragma mark -StatusBar menu data
 
 - (void)setInputTypeMenu:(NSMenuItem*) parent {