Update SquirrelInputController.m

groverlynn · groverlynn · commit 4e212279b96e · 2023-05-15T12:12:23.000+02:00
diff --git a/SquirrelInputController.m b/SquirrelInputController.m
@@ -91,20 +91,21 @@ - (BOOL)handleEvent:(NSEvent*)event client:(id)sender
           [self processKey:rime_keycode modifiers:rime_modifiers];
         }
         if (changes & OSX_SHIFT_MASK) {
-          release_mask = modifiers & OSX_SHIFT_MASK ? 0 : kReleaseMask | (eventCount - _lastEventCount == 1 ? 0 : kIgnoredMask);
+          release_mask = modifiers & OSX_SHIFT_MASK ? 0 : kReleaseMask | (eventCount - _lastEventCount <= 1 ? 0 : kIgnoredMask);
           [self processKey:rime_keycode modifiers:(rime_modifiers | release_mask)];
         }
         if (changes & OSX_CTRL_MASK) {
-          release_mask = modifiers & OSX_CTRL_MASK ? 0 : kReleaseMask | (eventCount - _lastEventCount == 1 ? 0 : kIgnoredMask);
+          release_mask = modifiers & OSX_CTRL_MASK ? 0 : kReleaseMask | (eventCount - _lastEventCount <= 1 ? 0 : kIgnoredMask);
           [self processKey:rime_keycode modifiers:(rime_modifiers | release_mask)];
         }
         if (changes & OSX_ALT_MASK) {
-          release_mask = modifiers & OSX_ALT_MASK ? 0 : kReleaseMask | (eventCount - _lastEventCount == 1 ? 0 : kIgnoredMask);
+          release_mask = modifiers & OSX_ALT_MASK ? 0 : kReleaseMask | (eventCount - _lastEventCount <= 1 ? 0 : kIgnoredMask);
           [self processKey:rime_keycode modifiers:(rime_modifiers | release_mask)];
         }
         if (changes & OSX_COMMAND_MASK) {
-          release_mask = modifiers & OSX_COMMAND_MASK ? 0 : kReleaseMask | (eventCount - _lastEventCount == 1 ? 0 : kIgnoredMask);
+          release_mask = modifiers & OSX_COMMAND_MASK ? 0 : kReleaseMask | (eventCount - _lastEventCount <= 1 ? 0 : kIgnoredMask);
           [self processKey:rime_keycode modifiers:(rime_modifiers | release_mask)];
+          _lastEventCount = eventCount;
           // do not update UI when using Command key
           break;
         }

Original file line number	Diff line number	Diff line change
`@@ -91,20 +91,21 @@ - (BOOL)handleEvent:(NSEvent*)event client:(id)sender`
`91`	`91`	`[self processKey:rime_keycode modifiers:rime_modifiers];`
`92`	`92`	`}`
`93`	`93`	`if (changes & OSX_SHIFT_MASK) {`
`94`		`- release_mask = modifiers & OSX_SHIFT_MASK ? 0 : kReleaseMask \| (eventCount - _lastEventCount == 1 ? 0 : kIgnoredMask);`
	`94`	`+ release_mask = modifiers & OSX_SHIFT_MASK ? 0 : kReleaseMask \| (eventCount - _lastEventCount <= 1 ? 0 : kIgnoredMask);`
`95`	`95`	`[self processKey:rime_keycode modifiers:(rime_modifiers \| release_mask)];`
`96`	`96`	`}`
`97`	`97`	`if (changes & OSX_CTRL_MASK) {`
`98`		`- release_mask = modifiers & OSX_CTRL_MASK ? 0 : kReleaseMask \| (eventCount - _lastEventCount == 1 ? 0 : kIgnoredMask);`
	`98`	`+ release_mask = modifiers & OSX_CTRL_MASK ? 0 : kReleaseMask \| (eventCount - _lastEventCount <= 1 ? 0 : kIgnoredMask);`
`99`	`99`	`[self processKey:rime_keycode modifiers:(rime_modifiers \| release_mask)];`
`100`	`100`	`}`
`101`	`101`	`if (changes & OSX_ALT_MASK) {`
`102`		`- release_mask = modifiers & OSX_ALT_MASK ? 0 : kReleaseMask \| (eventCount - _lastEventCount == 1 ? 0 : kIgnoredMask);`
	`102`	`+ release_mask = modifiers & OSX_ALT_MASK ? 0 : kReleaseMask \| (eventCount - _lastEventCount <= 1 ? 0 : kIgnoredMask);`
`103`	`103`	`[self processKey:rime_keycode modifiers:(rime_modifiers \| release_mask)];`
`104`	`104`	`}`
`105`	`105`	`if (changes & OSX_COMMAND_MASK) {`
`106`		`- release_mask = modifiers & OSX_COMMAND_MASK ? 0 : kReleaseMask \| (eventCount - _lastEventCount == 1 ? 0 : kIgnoredMask);`
	`106`	`+ release_mask = modifiers & OSX_COMMAND_MASK ? 0 : kReleaseMask \| (eventCount - _lastEventCount <= 1 ? 0 : kIgnoredMask);`
`107`	`107`	`[self processKey:rime_keycode modifiers:(rime_modifiers \| release_mask)];`
	`108`	`+ _lastEventCount = eventCount;`
`108`	`109`	`// do not update UI when using Command key`
`109`	`110`	`break;`
`110`	`111`	`}`