Skip to content

Commit

Permalink
update packages
Browse files Browse the repository at this point in the history
  • Loading branch information
groverlynn committed Nov 3, 2023
1 parent 03ac1bf commit e620920
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[submodule "librime"]
path = librime
url = https://github.com/groverlynn/librime.git
branch = choose
branch = extension
ignore = dirty
[submodule "plum"]
path = plum
Expand Down
7 changes: 2 additions & 5 deletions SquirrelInputController.m
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ - (BOOL)handleEvent:(NSEvent *)event client:(id)sender
// Key processing will not continue in that case. In other words the
// system will not deliver a key down event to the application.
// Returning NO means the original key down will be passed on to the client.
_currentClient = sender;

NSEventModifierFlags modifiers = event.modifierFlags & NSEventModifierFlagDeviceIndependentFlagsMask;
int eventCount = CGEventSourceCounterForEventType(kCGEventSourceStateCombinedSessionState, kCGEventFlagsChanged) +
CGEventSourceCounterForEventType(kCGEventSourceStateCombinedSessionState, kCGEventKeyDown) +
Expand Down Expand Up @@ -106,9 +106,6 @@ - (BOOL)handleEvent:(NSEvent *)event client:(id)sender
[self processKey:rime_keycode modifiers:(rime_modifiers | release_mask)];
}
if (changes & OSX_FN_MASK) {
if (!keyCodeAvailable) {
rime_keycode = XK_Hyper_L;
}
release_mask = modifiers & OSX_FN_MASK ? 0 : kReleaseMask;
[self processKey:rime_keycode modifiers:(rime_modifiers | release_mask)];
}
Expand Down Expand Up @@ -474,7 +471,7 @@ - (void)showPanelWithPreedit:(NSString *)preedit
//NSLog(@"showPanelWithPreedit:...:");
_candidates = candidates;
NSRect inputPos;
[_currentClient attributesForCharacterIndex:0 lineHeightRectangle:&inputPos];
[self.client attributesForCharacterIndex:0 lineHeightRectangle:&inputPos];
SquirrelPanel *panel = NSApp.squirrelAppDelegate.panel;
if (@available(macOS 14.0, *)) { // avoid overlapping with cursor effects view
if (_lastModifier & OSX_CAPITAL_MASK) {
Expand Down
2 changes: 1 addition & 1 deletion librime
Submodule librime updated 44 files
+1 −1 .github/workflows/commit-ci.yml
+0 −1 .github/workflows/linux-build.yml
+18 −3 .github/workflows/release-ci.yml
+3 −2 .gitignore
+1 −0 Dockerfile
+3 −2 README.md
+3 −6 action-install-linux.sh
+3 −2 data/minimal/default.yaml
+1 −1 deps.mk
+1 −1 deps/opencc
+0 −2 src/rime/common.h
+4 −5 src/rime/config/config_types.cc
+1 −1 src/rime/context.cc
+3 −3 src/rime/context.h
+2 −2 src/rime/deployer.h
+0 −1 src/rime/dict/entry_collector.cc
+4 −4 src/rime/dict/mapped_file.h
+2 −3 src/rime/dict/preset_vocabulary.cc
+0 −1 src/rime/dict/reverse_lookup_dictionary.cc
+3 −2 src/rime/dict/string_table.h
+1 −1 src/rime/dict/table.h
+2 −3 src/rime/dict/table_db.cc
+6 −7 src/rime/dict/user_db.cc
+2 −2 src/rime/dict/user_db_recovery_task.cc
+2 −3 src/rime/dict/user_dictionary.cc
+5 −4 src/rime/gear/ascii_composer.cc
+3 −1 src/rime/gear/editor.cc
+16 −9 src/rime/gear/key_binder.cc
+9 −6 src/rime/gear/punctuator.cc
+1 −1 src/rime/gear/recognizer.cc
+1 −1 src/rime/gear/selector.cc
+2 −2 src/rime/gear/shape.cc
+47 −19 src/rime/gear/simplifier.cc
+1 −1 src/rime/gear/speller.cc
+19 −14 src/rime/gear/switch_translator.cc
+8 −5 src/rime/key_event.h
+1 −2 src/rime/lever/customizer.cc
+6 −6 src/rime/lever/deployment_tasks.cc
+4 −4 src/rime/segmentation.h
+2 −2 src/rime/service.h
+1 −1 src/rime/switcher.cc
+1 −1 src/rime/translation.h
+3 −5 test/table_test.cc
+7 −1 tools/rime_api_console.cc

0 comments on commit e620920

Please sign in to comment.