From f1d9f5304863fee2afa012ba57fc977632b9bc20 Mon Sep 17 00:00:00 2001 From: rc-swag <58423624+rc-swag@users.noreply.github.com> Date: Thu, 22 Aug 2024 16:32:39 +1000 Subject: [PATCH 01/22] feat(windows): add right modifier included in HotKey --- windows/src/desktop/kmshell/xml/strings.xml | 16 +++--- .../keyman32/k32_lowlevelkeyboardhook.cpp | 52 +++++++++++++++++++ .../engine/kmcomapi/util/utilkeymanoption.pas | 3 +- .../delphi/general/KeymanOptionNames.pas | 5 +- 4 files changed, 66 insertions(+), 10 deletions(-) diff --git a/windows/src/desktop/kmshell/xml/strings.xml b/windows/src/desktop/kmshell/xml/strings.xml index 774a4d5e42..e15ba78945 100644 --- a/windows/src/desktop/kmshell/xml/strings.xml +++ b/windows/src/desktop/kmshell/xml/strings.xml @@ -377,6 +377,11 @@ Simulate AltGr with Ctrl+Alt + + + + Right Modifier keys work with Hotkeys + @@ -792,18 +797,13 @@ keyboard that you use in Windows. Keyman keyboards will adapt automatically to - Keyman + Keyman Start Keyman - - - - Start %1$s - @@ -860,7 +860,7 @@ keyboard that you use in Windows. Keyman keyboards will adapt automatically to - Keyman + Keyman @@ -1026,7 +1026,7 @@ keyboard that you use in Windows. Keyman keyboards will adapt automatically to - Keyman + Keyman diff --git a/windows/src/engine/keyman32/k32_lowlevelkeyboardhook.cpp b/windows/src/engine/keyman32/k32_lowlevelkeyboardhook.cpp index 8e3fe92a3c..4d842401dd 100644 --- a/windows/src/engine/keyman32/k32_lowlevelkeyboardhook.cpp +++ b/windows/src/engine/keyman32/k32_lowlevelkeyboardhook.cpp @@ -129,6 +129,27 @@ BOOL IsTouchPanelVisible() { return touchPanelVisible; } +/* + Cache UseRightModifierHotKey debug flag for this session +*/ +BOOL UseRightModifierHotKey() { + static BOOL flag_UseRightModifierHotKey = FALSE; + static BOOL loaded = FALSE; + + if (!loaded) { + RegistryReadOnly reg(HKEY_CURRENT_USER); + if (reg.OpenKeyReadOnly(REGSZ_KeymanCU)) { + if (reg.ValueExists(REGSZ_UseRightModifierHotKey)) { + flag_UseRightModifierHotKey = !!reg.ReadInteger(REGSZ_UseRightModifierHotKey); + } + } + loaded = TRUE; // Set loaded to TRUE whether or not the key exists + } + return flag_UseRightModifierHotKey; +} + + + LRESULT _kmnLowLevelKeyboardProc( _In_ int nCode, _In_ WPARAM wParam, @@ -157,6 +178,37 @@ LRESULT _kmnLowLevelKeyboardProc( if (GetKeyState(VK_RMENU) < 0) FHotkeyShiftState |= HK_RALT_INVALID; if (GetKeyState(VK_LSHIFT) < 0) FHotkeyShiftState |= HK_SHIFT; if (GetKeyState(VK_RSHIFT) < 0) FHotkeyShiftState |= HK_RSHIFT_INVALID; + + if (GetKeyState(VK_LCONTROL) < 0) { + FHotkeyShiftState |= HK_CTRL; + // TODO remove + SendDebugMessageFormat("ProcessHotkey VK_LCONTROL [vkCode:%x isUp:%d FHotkeyShiftState:%x useRight:%d", hs->vkCode, isUp, FHotkeyShiftState, UseRightModifierHotKey()); + } + + if (GetKeyState(VK_RCONTROL) < 0) { + FHotkeyShiftState |= UseRightModifierHotKey() ? HK_CTRL : HK_RCTRL_INVALID; + // TODO remove + SendDebugMessageFormat("ProcessHotkey VK_RCONTROL [vkCode:%x isUp:%d FHotkeyShiftState:%x useRight:%d", hs->vkCode, isUp, FHotkeyShiftState, UseRightModifierHotKey()); + } + + if (GetKeyState(VK_LMENU) < 0) { + FHotkeyShiftState |= HK_ALT; + } + + if (GetKeyState(VK_RMENU) < 0) { + FHotkeyShiftState |= UseRightModifierHotKey() ? HK_ALT : HK_RALT_INVALID; + } + + if (GetKeyState(VK_LSHIFT) < 0) { + FHotkeyShiftState |= HK_SHIFT; + } + if (GetKeyState(VK_RSHIFT) < 0) { + FHotkeyShiftState |= UseRightModifierHotKey() ? HK_SHIFT : HK_RSHIFT_INVALID; + } + + + + //TODO: #8064. Can remove debug message once issue #8064 is resolved SendDebugMessageFormat("!UseCachedHotkeyModifierState [FHotkeyShiftState:%x]", FHotkeyShiftState); diff --git a/windows/src/engine/kmcomapi/util/utilkeymanoption.pas b/windows/src/engine/kmcomapi/util/utilkeymanoption.pas index ce1b8af33a..2df38b5c82 100644 --- a/windows/src/engine/kmcomapi/util/utilkeymanoption.pas +++ b/windows/src/engine/kmcomapi/util/utilkeymanoption.pas @@ -121,12 +121,13 @@ type GroupName: string; end; -const KeymanOptionInfo: array[0..15] of TKeymanOptionInfo = ( // I3331 // I3620 // I4552 +const KeymanOptionInfo: array[0..16] of TKeymanOptionInfo = ( // I3331 // I3620 // I4552 // Global options (opt: koKeyboardHotkeysAreToggle; RegistryName: SRegValue_KeyboardHotkeysAreToggle; OptionType: kotBool; BoolValue: False; GroupName: 'kogGeneral'), (opt: koSwitchLanguageForAllApplications; RegistryName: SRegValue_SwitchLanguageForAllApplications; OptionType: kotBool; BoolValue: True; GroupName: 'kogGeneral'), // I2277 // I4393 (opt: koAltGrCtrlAlt; RegistryName: SRegValue_AltGrCtrlAlt; OptionType: kotBool; BoolValue: False; GroupName: 'kogGeneral'), + (opt: koRightModifierHK; RegistryName: SRegValue_UseRightModifierHotKey; OptionType: kotBool; BoolValue: False; GroupName: 'kogGeneral'), (opt: koShowHints; RegistryName: SRegValue_EnableHints; OptionType: kotBool; BoolValue: True; GroupName: 'kogGeneral'), (opt: koBaseLayout; RegistryName: SRegValue_UnderlyingLayout; OptionType: kotLong; IntValue: 0; GroupName: 'kogGeneral'), diff --git a/windows/src/global/delphi/general/KeymanOptionNames.pas b/windows/src/global/delphi/general/KeymanOptionNames.pas index 27aef82ab5..73356d19cb 100644 --- a/windows/src/global/delphi/general/KeymanOptionNames.pas +++ b/windows/src/global/delphi/general/KeymanOptionNames.pas @@ -5,7 +5,10 @@ interface type TUtilKeymanOption = ( // General options - koKeyboardHotkeysAreToggle, koAltGrCtrlAlt, koReleaseShiftKeysAfterKeyPress, + koKeyboardHotkeysAreToggle, + koAltGrCtrlAlt, + koRightModifierHK, + koReleaseShiftKeysAfterKeyPress, koShowHints, // I1256 // Startup options koTestKeymanFunctioning, From 2927f57c04fc779d917149ea9fda2ebcddfa9d3c Mon Sep 17 00:00:00 2001 From: rc-swag <58423624+rc-swag@users.noreply.github.com> Date: Fri, 23 Aug 2024 15:41:31 +1000 Subject: [PATCH 02/22] feat(windows): missed checked in file --- common/windows/delphi/general/RegistryKeys.pas | 1 + 1 file changed, 1 insertion(+) diff --git a/common/windows/delphi/general/RegistryKeys.pas b/common/windows/delphi/general/RegistryKeys.pas index 1557de5865..0553b82306 100644 --- a/common/windows/delphi/general/RegistryKeys.pas +++ b/common/windows/delphi/general/RegistryKeys.pas @@ -115,6 +115,7 @@ const SRegValue_AltGrCtrlAlt = 'simulate altgr'; // CU SRegValue_KeyboardHotKeysAreToggle = 'hotkeys are toggles'; // CU + SRegValue_UseRightModifierHotKey = 'use right modifier for hotkey'; // CU SRegValue_ReleaseShiftKeysAfterKeyPress = 'release shift keys after key press'; // CU SRegValue_TestKeymanFunctioning = 'test keyman functioning'; // CU, default true From 558636886c7a776fcd6eeb3791efae29d432c6d6 Mon Sep 17 00:00:00 2001 From: rc-swag <58423624+rc-swag@users.noreply.github.com> Date: Mon, 26 Aug 2024 19:39:47 +1000 Subject: [PATCH 03/22] feat(windows): remove left modifier only bit flag --- windows/src/engine/keyman32/k32_lowlevelkeyboardhook.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/windows/src/engine/keyman32/k32_lowlevelkeyboardhook.cpp b/windows/src/engine/keyman32/k32_lowlevelkeyboardhook.cpp index 4d842401dd..e33a610e61 100644 --- a/windows/src/engine/keyman32/k32_lowlevelkeyboardhook.cpp +++ b/windows/src/engine/keyman32/k32_lowlevelkeyboardhook.cpp @@ -172,12 +172,6 @@ LRESULT _kmnLowLevelKeyboardProc( // #5190: Don't cache modifier state because sometimes we won't receive // modifier change events (e.g. on lock screen) FHotkeyShiftState = 0; - if (GetKeyState(VK_LCONTROL) < 0) FHotkeyShiftState |= HK_CTRL; - if (GetKeyState(VK_RCONTROL) < 0) FHotkeyShiftState |= HK_RCTRL_INVALID; - if (GetKeyState(VK_LMENU) < 0) FHotkeyShiftState |= HK_ALT; - if (GetKeyState(VK_RMENU) < 0) FHotkeyShiftState |= HK_RALT_INVALID; - if (GetKeyState(VK_LSHIFT) < 0) FHotkeyShiftState |= HK_SHIFT; - if (GetKeyState(VK_RSHIFT) < 0) FHotkeyShiftState |= HK_RSHIFT_INVALID; if (GetKeyState(VK_LCONTROL) < 0) { FHotkeyShiftState |= HK_CTRL; @@ -207,8 +201,6 @@ LRESULT _kmnLowLevelKeyboardProc( } - - //TODO: #8064. Can remove debug message once issue #8064 is resolved SendDebugMessageFormat("!UseCachedHotkeyModifierState [FHotkeyShiftState:%x]", FHotkeyShiftState); From 930221376c09d8004c81ba22f55a7b25d31b28d5 Mon Sep 17 00:00:00 2001 From: Shawn Schantz Date: Tue, 27 Aug 2024 04:19:51 +0700 Subject: [PATCH 04/22] fix(mac): show package info after keyboard install Move to updated APIs that no longer require window dismissal. Fixes: #9308 --- .../Keyman4MacIM/KMInputMethodAppDelegate.m | 40 ++++++++++++------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.m b/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.m index 9189e39d58..0482f78432 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.m +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.m @@ -1119,14 +1119,16 @@ CGEventRef eventTapFunction(CGEventTapProxy proxy, CGEventType type, CGEventRef * TODO: this should really be refactored */ -- (void)alertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo { - NSButton *button = (NSButton *)[alert.buttons objectAtIndex:0]; - if (button.tag == -1) { +- (void)downloadComplete:(NSModalResponse) returnCode { + os_log_debug([KMLogs uiLog], "downloadComplete, NSModalResponse returnCode: %ld", (long)returnCode); + if (returnCode == NSModalResponseCancel) { + os_log_debug([KMLogs uiLog], "downloadComplete, returnCode == NSModalResponseCancel"); [_connection cancel]; } - else if (button.tag == 1) { - [_downloadKBWindow close]; + else if (returnCode == NSModalResponseOK) { + os_log_debug([KMLogs uiLog], "downloadComplete, returnCode == NSModalResponseOK"); if (self.configWindow.window != nil) { + os_log_debug([KMLogs uiLog], "downloadComplete, self.configWindow.window != nil"); [self.configWindow.window makeKeyAndOrderFront:nil]; if (![[self.configWindow.window childWindows] containsObject:self.infoWindow.window]) { [self.configWindow.window addChildWindow:self.infoWindow.window ordered:NSWindowAbove]; @@ -1135,6 +1137,7 @@ CGEventRef eventTapFunction(CGEventTapProxy proxy, CGEventType type, CGEventRef [self.infoWindow.window makeKeyAndOrderFront:nil]; } else { + os_log_debug([KMLogs uiLog], "downloadComplete, self.configWindow.window == nil"); [self.infoWindow.window centerInParent]; [self.infoWindow.window makeKeyAndOrderFront:nil]; [self.infoWindow.window setLevel:NSFloatingWindowLevel]; @@ -1152,6 +1155,7 @@ CGEventRef eventTapFunction(CGEventTapProxy proxy, CGEventType type, CGEventRef } - (NSAlert *)downloadInfoView { + os_log_debug([KMLogs uiLog], "downloadInfoView"); if (_downloadInfoView == nil) { _downloadInfoView = [[NSAlert alloc] init]; [_downloadInfoView setMessageText:NSLocalizedString(@"message-keyboard-downloading", nil)]; @@ -1165,6 +1169,7 @@ CGEventRef eventTapFunction(CGEventTapProxy proxy, CGEventType type, CGEventRef } - (NSProgressIndicator *)progressIndicator { + os_log_debug([KMLogs uiLog], "progressIndicator"); if (_progressIndicator == nil) { _progressIndicator = [[NSProgressIndicator alloc] initWithFrame:NSMakeRect(0, 0, 300, 20)]; [_progressIndicator setIndeterminate:NO]; @@ -1186,36 +1191,39 @@ CGEventRef eventTapFunction(CGEventTapProxy proxy, CGEventType type, CGEventRef - (void)downloadKeyboardFromURL:(NSURL *)url { NSURL* downloadUrl = url; - + os_log_debug([KMLogs uiLog], "downloadKeyboardFromURL, url.path: %{public}@", url.path); + if (downloadUrl && _downloadFilename) { if (_infoWindow.window != nil) [_infoWindow close]; [self.downloadInfoView setInformativeText:self.downloadFilename]; + if (self.configWindow.window != nil) { + os_log_debug([KMLogs uiLog], "downloadKeyboardFromURL, self.configWindow.window != nil"); [self.configWindow.window makeKeyAndOrderFront:nil]; if (![[self.configWindow.window childWindows] containsObject:self.downloadKBWindow.window]) { [self.configWindow.window addChildWindow:self.downloadKBWindow.window ordered:NSWindowAbove]; } [self.downloadKBWindow.window centerInParent]; [self.downloadKBWindow.window makeKeyAndOrderFront:nil]; - [self.downloadInfoView beginSheetModalForWindow:self.downloadKBWindow.window - modalDelegate:self - didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) - contextInfo:nil]; + [self.downloadInfoView beginSheetModalForWindow:self.downloadKBWindow.window completionHandler:^(NSModalResponse returnCode) { + [self downloadComplete:returnCode]; + }]; } else { + os_log_debug([KMLogs uiLog], "downloadKeyboardFromURL, self.configWindow.window == nil"); [self.downloadKBWindow.window centerInParent]; [self.downloadKBWindow.window makeKeyAndOrderFront:nil]; [self.downloadKBWindow.window setLevel:NSFloatingWindowLevel]; - [self.downloadInfoView beginSheetModalForWindow:self.downloadKBWindow.window - modalDelegate:self - didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) - contextInfo:nil]; + [self.downloadInfoView beginSheetModalForWindow:self.downloadKBWindow.window completionHandler:^(NSModalResponse returnCode) { + [self downloadComplete:returnCode]; + }]; } if (_connection == nil) { - [_downloadInfoView setMessageText:NSLocalizedString(@"message-keyboard-downloading", nil)]; + os_log_debug([KMLogs uiLog], "downloadKeyboardFromURL, _connection == nil, set button title cancel downloading, tag = -1"); + [_downloadInfoView setMessageText:NSLocalizedString(@"message-keyboard-downloading", nil)]; NSButton *button = (NSButton *)[_downloadInfoView.buttons objectAtIndex:0]; [button setTitle:NSLocalizedString(@"button-cancel-downloading", nil)]; [button setTag:-1]; @@ -1257,6 +1265,7 @@ CGEventRef eventTapFunction(CGEventTapProxy proxy, CGEventType type, CGEventRef } - (void)connectionDidFinishLoading:(NSURLConnection *)connection { + os_log_debug([KMLogs uiLog], "connectionDidFinishLoading"); NSString *filePath = [self.keyboardsPath stringByAppendingPathComponent:self.downloadFilename]; [self.receivedData writeToFile:filePath atomically:YES]; [self unzipFile:filePath]; @@ -1264,6 +1273,7 @@ CGEventRef eventTapFunction(CGEventTapProxy proxy, CGEventType type, CGEventRef [_downloadInfoView setMessageText:NSLocalizedString(@"message-keyboard-download-complete", nil)]; NSButton *button = (NSButton *)[_downloadInfoView.buttons objectAtIndex:0]; + os_log_debug([KMLogs uiLog], "connectionDidFinishLoading, set button title download complete, tag = 1"); [button setTitle:NSLocalizedString(@"button-download-complete", nil)]; [button setTag:1]; [[NSNotificationCenter defaultCenter] postNotificationName:kKeymanKeyboardDownloadCompletedNotification From 500c800bb495ab44db66e3b4558cd40224230f1e Mon Sep 17 00:00:00 2001 From: rc-swag <58423624+rc-swag@users.noreply.github.com> Date: Tue, 27 Aug 2024 11:01:50 +1000 Subject: [PATCH 05/22] feat(windows): remove developer debug logging --- common/windows/cpp/include/registry.h | 2 +- windows/src/desktop/kmshell/xml/strings.xml | 4 ++-- windows/src/engine/keyman32/hotkeys.cpp | 2 -- .../keyman32/k32_lowlevelkeyboardhook.cpp | 24 ++++--------------- 4 files changed, 7 insertions(+), 25 deletions(-) diff --git a/common/windows/cpp/include/registry.h b/common/windows/cpp/include/registry.h index c6d1bf85ec..842176e9ed 100644 --- a/common/windows/cpp/include/registry.h +++ b/common/windows/cpp/include/registry.h @@ -110,7 +110,7 @@ #define REGSZ_KeyboardHotkeysAreToggle "hotkeys are toggles" #define REGSZ_DeadkeyConversionMode "deadkey conversion mode" // CU // I4552 #define REGSZ_ZapVirtualKeyCode "zap virtual key code" // LM, defaults to 0x0E (_VK_PREFIX_DEFAULT) -/* Non-chiral use of hotkeys instead of left-only hotkeys */ +/* Default is to only use left modifier in hotkeys trigger */ #define REGSZ_UseRightModifierHotKey "use right modifier for hotkey" diff --git a/windows/src/desktop/kmshell/xml/strings.xml b/windows/src/desktop/kmshell/xml/strings.xml index ea09ca5b74..9409d6d8c1 100644 --- a/windows/src/desktop/kmshell/xml/strings.xml +++ b/windows/src/desktop/kmshell/xml/strings.xml @@ -379,8 +379,8 @@ - - Right Modifier keys work with Hotkeys + + Right-side modifier keys trigger hotkeys diff --git a/windows/src/engine/keyman32/hotkeys.cpp b/windows/src/engine/keyman32/hotkeys.cpp index e7fdbe3d79..1652397d77 100644 --- a/windows/src/engine/keyman32/hotkeys.cpp +++ b/windows/src/engine/keyman32/hotkeys.cpp @@ -139,8 +139,6 @@ Hotkey *Hotkeys::GetHotkey(DWORD hotkey) { for (int i = 0; i < m_nHotkeys; i++) { if (m_hotkeys[i].HotkeyValue == hotkey) { - SendDebugMessageFormat( - "LanguageHotkey[%d] = {HotkeyValue: %x, hkl: %x} passed in: %x", i, m_hotkeys[i].HotkeyValue, m_hotkeys[i].hkl, hotkey); return &m_hotkeys[i]; } } diff --git a/windows/src/engine/keyman32/k32_lowlevelkeyboardhook.cpp b/windows/src/engine/keyman32/k32_lowlevelkeyboardhook.cpp index e33a610e61..8e16d536f2 100644 --- a/windows/src/engine/keyman32/k32_lowlevelkeyboardhook.cpp +++ b/windows/src/engine/keyman32/k32_lowlevelkeyboardhook.cpp @@ -130,7 +130,7 @@ BOOL IsTouchPanelVisible() { } /* - Cache UseRightModifierHotKey debug flag for this session + Cache UseRightModifierHotKey for this session */ BOOL UseRightModifierHotKey() { static BOOL flag_UseRightModifierHotKey = FALSE; @@ -148,8 +148,6 @@ BOOL UseRightModifierHotKey() { return flag_UseRightModifierHotKey; } - - LRESULT _kmnLowLevelKeyboardProc( _In_ int nCode, _In_ WPARAM wParam, @@ -169,20 +167,14 @@ LRESULT _kmnLowLevelKeyboardProc( SendDebugMessageFormat("wparam: %x lparam: %x [vk:%s scan:%x flags:%x extra:%x]", wParam, lParam, Debug_VirtualKey((WORD) hs->vkCode), hs->scanCode, hs->flags, hs->dwExtraInfo); // I4674 - // #5190: Don't cache modifier state because sometimes we won't receive - // modifier change events (e.g. on lock screen) FHotkeyShiftState = 0; - if (GetKeyState(VK_LCONTROL) < 0) { + if (GetKeyState(VK_LCONTROL) < 0) { FHotkeyShiftState |= HK_CTRL; - // TODO remove - SendDebugMessageFormat("ProcessHotkey VK_LCONTROL [vkCode:%x isUp:%d FHotkeyShiftState:%x useRight:%d", hs->vkCode, isUp, FHotkeyShiftState, UseRightModifierHotKey()); } if (GetKeyState(VK_RCONTROL) < 0) { FHotkeyShiftState |= UseRightModifierHotKey() ? HK_CTRL : HK_RCTRL_INVALID; - // TODO remove - SendDebugMessageFormat("ProcessHotkey VK_RCONTROL [vkCode:%x isUp:%d FHotkeyShiftState:%x useRight:%d", hs->vkCode, isUp, FHotkeyShiftState, UseRightModifierHotKey()); } if (GetKeyState(VK_LMENU) < 0) { @@ -200,10 +192,8 @@ LRESULT _kmnLowLevelKeyboardProc( FHotkeyShiftState |= UseRightModifierHotKey() ? HK_SHIFT : HK_RSHIFT_INVALID; } - - //TODO: #8064. Can remove debug message once issue #8064 is resolved - SendDebugMessageFormat("!UseCachedHotkeyModifierState [FHotkeyShiftState:%x]", FHotkeyShiftState); - + //TODO: #8064. Can remove debug message once issue #8064 is resolved + SendDebugMessageFormat("!UseCachedHotkeyModifierState [FHotkeyShiftState:%x]", FHotkeyShiftState); // #7337 Post the modifier state ensuring the serialized queue is in sync // Note that the modifier key may be posted again with WM_KEYMAN_KEY_EVENT, @@ -287,30 +277,24 @@ BOOL ProcessHotkey(UINT vkCode, BOOL isUp, DWORD ShiftState) { Hotkeys *hotkeys = Hotkeys::Instance(); // I4641 if (!hotkeys) { - SendDebugMessageFormat("Failed to get Instance"); return FALSE; } Hotkey *hotkey = hotkeys->GetHotkey(ShiftState | vkCode); // I4641 if (!hotkey) { - SendDebugMessageFormat("GetHotkey Null"); return FALSE; } if (isUp) { - SendDebugMessageFormat("Is Up"); return TRUE; } if (hotkey->HotkeyType == hktInterface) { - SendDebugMessageFormat("PostMasterController"); Globals::PostMasterController(wm_keyman_control, MAKELONG(KMC_INTERFACEHOTKEY, hotkey->Target), 0); } else { - SendDebugMessageFormat("ReportKeyboardChanged"); ReportKeyboardChanged(PC_HOTKEYCHANGE, hotkey->hkl == 0 ? TF_PROFILETYPE_INPUTPROCESSOR : TF_PROFILETYPE_KEYBOARDLAYOUT, 0, hotkey->hkl, GUID_NULL, hotkey->profileGUID); } - SendDebugMessageFormat("PostDummyKeyEvent"); /* Generate a dummy keystroke to block menu activations, etc but let the shift key through */ PostDummyKeyEvent(); // I3301 - this is imperfect because we don't deal with HC_NOREMOVE. But good enough? // I3534 // I4844 From 569a8a8a49f14c6153d688dd39787c1780b1b7d3 Mon Sep 17 00:00:00 2001 From: sgschantz Date: Thu, 29 Aug 2024 15:38:00 +0700 Subject: [PATCH 06/22] fix(mac): eliminate all use of deprecated API beginSheetModalForWindow beginSheetModalForWindow:modalDelegate:didEndSelector:contextInfo: was deprecated in macOS 10.10 and replaced by beginSheetModalForWindow:completionHandler: The newer API automatically closes the sheet. Explicitly closing the sheet also seemed to be causing the parent windows to close. Fixes: #9308 --- .../KMConfigurationWindowController.m | 43 +++++++++++-------- .../KMInfoWindow/KMInfoWindowController.m | 2 - .../Keyman4MacIM/KMInputMethodAppDelegate.m | 4 +- .../Keyman4MacIM/KMPackageReader.m | 7 --- mac/Keyman4MacIM/Keyman4MacIM/KeySender.m | 11 ++--- .../KME/OnScreenKeyboard/KeyView.m | 8 +++- .../KME/OnScreenKeyboard/OSKKey.m | 5 ++- .../KME/OnScreenKeyboard/OSKView.m | 2 +- 8 files changed, 43 insertions(+), 39 deletions(-) diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/KMConfigurationWindowController.m b/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/KMConfigurationWindowController.m index 3e2ffe2410..4a5f194241 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/KMConfigurationWindowController.m +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/KMConfigurationWindowController.m @@ -398,8 +398,8 @@ } - (void)removeAction:(id)sender { - NSButton *removeButton = (NSButton *)sender; - NSDictionary *info = [self.tableContents objectAtIndex:removeButton.tag]; + NSButton *deleteButton = (NSButton *)sender; + NSDictionary *info = [self.tableContents objectAtIndex:deleteButton.tag]; NSString *deleteKeyboardMessage = NSLocalizedString(@"message-confirm-delete-keyboard", nil); if ([info objectForKey:@"HeaderTitle"] != nil) @@ -407,10 +407,13 @@ else [self.deleteAlertView setMessageText:[NSString localizedStringWithFormat:deleteKeyboardMessage, [info objectForKey:kKMKeyboardNameKey]]]; - [self.deleteAlertView beginSheetModalForWindow:self.window - modalDelegate:self - didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) - contextInfo:(__bridge void *)([NSNumber numberWithInteger:removeButton.tag])]; + [self.deleteAlertView beginSheetModalForWindow:self.window completionHandler:^(NSModalResponse returnCode) { + if (returnCode == NSAlertFirstButtonReturn) { + os_log_debug([KMLogs uiLog], "confirm delete keyboard alert dismissed"); + [self deleteFileAtIndex:[NSNumber numberWithInteger:deleteButton.tag]]; + self.deleteAlertView = nil; + } + }]; } - (IBAction)downloadAction:(id)sender { @@ -438,25 +441,29 @@ } - (void)handleRequestToInstallPackage:(KMPackage *) package { + os_log_debug([KMLogs dataLog], "handleRequestToInstallPackage"); NSString *keyboardInfoString = NSLocalizedString(@"info-install-keyboard-filename", nil); [self.confirmKmpInstallAlertView setInformativeText:[NSString localizedStringWithFormat:keyboardInfoString, package.getOrigKmpFilename]]; os_log_debug([KMLogs uiLog], "Asking user to confirm installation of %{public}@, KMP - temp file name: %{public}@", package.getOrigKmpFilename, package.getTempKmpFilename); - [self.confirmKmpInstallAlertView beginSheetModalForWindow:self.window - modalDelegate:self - didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) - contextInfo:(__bridge void *)(package)]; + [self.confirmKmpInstallAlertView beginSheetModalForWindow:self.window completionHandler:^(NSModalResponse returnCode) { + os_log_debug([KMLogs uiLog], "confirm keyboard installation alert dismissed"); + if (returnCode == NSAlertFirstButtonReturn) { + [self installPackageFile: package.getTempKmpFilename]; + self.confirmKmpInstallAlertView = nil; + } + }]; } - (void)installPackageFile:(NSString *)kmpFile { // kmpFile could be a temp file (in fact, it always is!), so don't display the name. - - os_log_debug([KMLogs dataLog], "KMP - Ready to unzip/install Package File: %{public}@", kmpFile); + os_log_debug([KMLogs dataLog], "kmpFile - ready to unzip/install Package File: %{public}@", kmpFile); BOOL didUnzip = [self.AppDelegate unzipFile:kmpFile]; if (!didUnzip) { + os_log_debug([KMLogs dataLog], "kmpFile, unzipFile failed"); NSAlert *failure = [[NSAlert alloc] init]; [failure addButtonWithTitle:NSLocalizedString(@"button-keyboard-file-unreadable", @"Alert button")]; @@ -465,13 +472,12 @@ [failure setIcon:[[NSBundle mainBundle] imageForResource:@"logo.png"]]; [failure setAlertStyle:NSAlertStyleWarning]; - [failure beginSheetModalForWindow:self.window - modalDelegate:self - didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) - contextInfo:nil]; + [failure beginSheetModalForWindow:self.window completionHandler:^(NSModalResponse returnCode) { + os_log_debug([KMLogs uiLog], "kmpFile, keyboard file unreadable alert dismissed with returnCode: %ld", (long)returnCode); + }]; } else { - os_log_debug([KMLogs dataLog], "Completed installation of KMP file."); + os_log_debug([KMLogs dataLog], "kmpFile, completed installation of KMP file"); } } @@ -547,6 +553,7 @@ return _confirmKmpInstallAlertView; } +/* - (void)alertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo { os_log_debug([KMLogs uiLog], "User responded to NSAlert"); if (alert == _deleteAlertView) { @@ -568,7 +575,7 @@ } // else, just a message - nothing to do. } - +*/ - (void)deleteFileAtIndex:(NSNumber *) n { NSInteger index = [n integerValue]; NSString *path2Remove = nil; diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMInfoWindow/KMInfoWindowController.m b/mac/Keyman4MacIM/Keyman4MacIM/KMInfoWindow/KMInfoWindowController.m index 6be446ddd2..32a8377b64 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/KMInfoWindow/KMInfoWindowController.m +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMInfoWindow/KMInfoWindowController.m @@ -85,8 +85,6 @@ // TODO: refactor: any reason for this to be HTML? hard to read stringWithFormat applied to template with 16 arguments - (NSString *)detailsHtml { - NSString *errorString = NSLocalizedString(@"message-keyboard-file-unreadable", nil); - @try { NSString *htmlFormat = @"" diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.m b/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.m index 0482f78432..d95982687b 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.m +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.m @@ -1340,7 +1340,9 @@ extern const CGKeyCode kProcessPendingBuffer; NSError *error = nil; NSString *fileName = filePath.lastPathComponent; NSString *folderName = [fileName stringByDeletingPathExtension]; - + + os_log_debug([KMLogs keyboardLog], "unzipFile for filePath: %{public}@", filePath); + // First we unzip into a temp folder, and check kmp.json for the fileVersion // before we continue installation. We don't want to overwrite existing // package if it is there if the files are not compatible with the installed diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMPackageReader.m b/mac/Keyman4MacIM/Keyman4MacIM/KMPackageReader.m index 7406488a8a..6ee4402cb9 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/KMPackageReader.m +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMPackageReader.m @@ -251,14 +251,12 @@ typedef enum { NSString *s = [line substringFromIndex:kName.length+1]; NSArray *vs = [s componentsSeparatedByString:@"\","]; NSString *v1 = [[vs objectAtIndex:0] stringByReplacingOccurrencesOfString:@"\"" withString:@""]; - NSString *v2 = [[vs objectAtIndex:1] stringByReplacingOccurrencesOfString:@"\"" withString:@""]; builder.packageName = v1; } else if ([[line lowercaseString] hasPrefix:[kVersion lowercaseString]]) { NSString *s = [line substringFromIndex:kVersion.length+1]; NSArray *vs = [s componentsSeparatedByString:@"\","]; NSString *v1 = [[vs objectAtIndex:0] stringByReplacingOccurrencesOfString:@"\"" withString:@""]; - NSString *v2 = [[vs objectAtIndex:1] stringByReplacingOccurrencesOfString:@"\"" withString:@""]; builder.packageVersion = v1; } else if ([[line lowercaseString] hasPrefix:[kAuthor lowercaseString]]) { @@ -273,14 +271,12 @@ typedef enum { NSString *s = [line substringFromIndex:kCopyright.length+1]; NSArray *vs = [s componentsSeparatedByString:@"\","]; NSString *v1 = [[vs objectAtIndex:0] stringByReplacingOccurrencesOfString:@"\"" withString:@""]; - NSString *v2 = [[vs objectAtIndex:1] stringByReplacingOccurrencesOfString:@"\"" withString:@""]; builder.copyright = v1; } else if ([[line lowercaseString] hasPrefix:[kWebSite lowercaseString]]) { NSString *s = [line substringFromIndex:kWebSite.length+1]; NSArray *vs = [s componentsSeparatedByString:@"\","]; NSString *v1 = [[vs objectAtIndex:0] stringByReplacingOccurrencesOfString:@"\"" withString:@""]; - NSString *v2 = [[vs objectAtIndex:1] stringByReplacingOccurrencesOfString:@"\"" withString:@""]; builder.website = v1; } @@ -294,20 +290,17 @@ typedef enum { NSString *s = [line substringFromIndex:x+2]; if ([[s lowercaseString] hasPrefix:[kFile lowercaseString]]) { NSArray *vs = [s componentsSeparatedByString:@"\","]; - NSString *v1 = [[[vs objectAtIndex:0] substringFromIndex:kFile.length+1] stringByReplacingOccurrencesOfString:@"\"" withString:@""]; NSString *fileName = [[vs objectAtIndex:1] stringByReplacingOccurrencesOfString:@"\"" withString:@""]; [files addObject:fileName]; } else if ([[s lowercaseString] hasPrefix:[kFont lowercaseString]]) { NSArray *vs = [s componentsSeparatedByString:@"\","]; NSString *fontName = [[[vs objectAtIndex:0] substringFromIndex:kFont.length+1] stringByReplacingOccurrencesOfString:@"\"" withString:@""]; - NSString *fontFileName = [[vs objectAtIndex:1] stringByReplacingOccurrencesOfString:@"\"" withString:@""]; [fontArray addObject:fontName]; } else if ([[s lowercaseString] hasPrefix:[kKeyboard lowercaseString]]) { NSArray *vs = [s componentsSeparatedByString:@"\","]; NSString *keyboardName = [[[vs objectAtIndex:0] substringFromIndex:kKeyboard.length+1] stringByReplacingOccurrencesOfString:@"\"" withString:@""]; - NSString *keyboardFileName = [[vs objectAtIndex:1] stringByReplacingOccurrencesOfString:@"\"" withString:@""]; KMKeyboardInfoBuilder *builder = [[KMKeyboardInfoBuilder alloc] init]; builder.name = keyboardName; diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KeySender.m b/mac/Keyman4MacIM/Keyman4MacIM/KeySender.m index 417475c777..dc73edc11b 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/KeySender.m +++ b/mac/Keyman4MacIM/Keyman4MacIM/KeySender.m @@ -1,9 +1,6 @@ /** * Keyman is copyright (C) SIL International. MIT License. * - * KeySender.m - * Keyman - * * Created by Shawn Schantz on 2023-04-17. * * Sends keydown events for the provided keycode to the frontmost application. @@ -56,15 +53,13 @@ const CGKeyCode kKeymanEventKeyCode = 0xFF; } /** - sendKeymanKeyCodeForEvent sends the kKeymanEventKeyCode to the - frontmost application to indicate that all the backspaces have been processed - and we can insert the queuedText to the client + * sendKeymanKeyCodeForEvent sends the kKeymanEventKeyCode to the + * frontmost application to indicate that all the backspaces have been processed + * and we can insert the queuedText to the client */ - (void)sendKeymanKeyCodeForEvent:(NSEvent *)event { os_log_debug([KMLogs keyLog], "KeySender sendKeymanKeyCodeForEvent"); - - ProcessSerialNumber psn; // Returns the frontmost app, which is the app that receives key events. NSRunningApplication *app = NSWorkspace.sharedWorkspace.frontmostApplication; diff --git a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/KeyView.m b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/KeyView.m index c1dfa75a87..9dfd39856b 100644 --- a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/KeyView.m +++ b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/KeyView.m @@ -41,7 +41,10 @@ static CGFloat const kRelativeModifierLabelHeight = 0.30f; - (id)initWithFrame:(NSRect)frame { self = [super initWithFrame:frame]; if (self) { - os_log_debug([KMELogs oskLog], "KeyView initWithFrame: %{public}@, bounds: %{public}@, default clipsToBounds %{public}@", NSStringFromRect(frame), NSStringFromRect(self.bounds), self.clipsToBounds?@"YES":@"NO"); + /* + // usually too much, but uncomment for debugging + os_log_debug([KMELogs oskLog], "KeyView initWithFrame: %{public}@, bounds: %{public}@, default clipsToBounds %{public}@", NSStringFromRect(frame), NSStringFromRect(self.bounds), self.clipsToBounds?@"YES":@"NO"); + */ self.clipsToBounds = true; CGSize size = frame.size; CGFloat x = size.width*0.05; @@ -70,7 +73,10 @@ static CGFloat const kRelativeModifierLabelHeight = 0.30f; } - (void)drawRect:(NSRect)rect { + /* + // usually too much, but uncomment for debugging os_log_debug([KMELogs uiLog], "KeyView drawRect: %{public}@, bounds: %{public}@, keyCode: 0x%lx, caption: %{public}@, label: %{public}@", NSStringFromRect(rect), NSStringFromRect(self.bounds), self.keyCode, self.caption.stringValue, self.label.stringValue); + */ [[self getOpaqueColorWithRed:241 green:242 blue:242] setFill]; NSRectFillUsingOperation(rect, NSCompositingOperationSourceOver); diff --git a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/OSKKey.m b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/OSKKey.m index d81097d3e2..7ff40ccffe 100644 --- a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/OSKKey.m +++ b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/OSKKey.m @@ -14,7 +14,10 @@ - (id)initWithKeyCode:(NSUInteger)keyCode caption:(NSString *)caption scale:(CGFloat)scale { self = [super init]; if (self) { - os_log_debug([KMELogs oskLog], "OSKKey initWithKeyCode: 0x%lx, caption: %{public}@, scale: %f", keyCode, caption, scale); + /* + // usually too much, but uncomment for debugging + os_log_debug([KMELogs oskLog], "OSKKey initWithKeyCode: 0x%lx, caption: %{public}@, scale: %f", keyCode, caption, scale); + */ _keyCode = keyCode; if (caption == nil) diff --git a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/OSKView.m b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/OSKView.m index f5154fa76d..512920e052 100644 --- a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/OSKView.m +++ b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/OSKView.m @@ -43,7 +43,7 @@ } - (void)drawRect:(NSRect)rect { - os_log_debug([KMELogs uiLog], "OSKView drawRect: %{public}@", NSStringFromRect(rect)); + os_log_debug([KMELogs oskLog], "OSKView drawRect: %{public}@", NSStringFromRect(rect)); CGContextRef context = (CGContextRef)[[NSGraphicsContext currentContext] CGContext]; CGContextSetLineJoin(context, kCGLineJoinRound); From 028a03c998f1a781816ee9ff71c2415a720457c7 Mon Sep 17 00:00:00 2001 From: rc-swag <58423624+rc-swag@users.noreply.github.com> Date: Thu, 29 Aug 2024 22:22:12 +1000 Subject: [PATCH 07/22] feat(windows): add sil global strings --- oem/firstvoices/windows/src/xml/keyman_support.xsl | 12 ++++++++++-- oem/firstvoices/windows/src/xml/strings.xml | 10 ++++++++++ windows/src/desktop/kmshell/xml/keyman_support.xsl | 12 ++++++++++-- windows/src/desktop/kmshell/xml/strings.xml | 10 ++++++++++ 4 files changed, 40 insertions(+), 4 deletions(-) diff --git a/oem/firstvoices/windows/src/xml/keyman_support.xsl b/oem/firstvoices/windows/src/xml/keyman_support.xsl index dfd8c8445b..81f72fdb66 100644 --- a/oem/firstvoices/windows/src/xml/keyman_support.xsl +++ b/oem/firstvoices/windows/src/xml/keyman_support.xsl @@ -32,11 +32,19 @@
- + + + + +
- + + + + +
diff --git a/oem/firstvoices/windows/src/xml/strings.xml b/oem/firstvoices/windows/src/xml/strings.xml index d0708d2b4c..e71f4b2c90 100644 --- a/oem/firstvoices/windows/src/xml/strings.xml +++ b/oem/firstvoices/windows/src/xml/strings.xml @@ -512,6 +512,16 @@ Copyright © SIL International. All Rights Reserved. + + + + Created by %1$s + + + + + Copyright © %1$s. All Rights Reserved. + diff --git a/windows/src/desktop/kmshell/xml/keyman_support.xsl b/windows/src/desktop/kmshell/xml/keyman_support.xsl index d472f88155..4bf93f89bd 100644 --- a/windows/src/desktop/kmshell/xml/keyman_support.xsl +++ b/windows/src/desktop/kmshell/xml/keyman_support.xsl @@ -29,11 +29,19 @@
- + + + + +
- + + + + +
diff --git a/windows/src/desktop/kmshell/xml/strings.xml b/windows/src/desktop/kmshell/xml/strings.xml index 774a4d5e42..9f9a8b105f 100644 --- a/windows/src/desktop/kmshell/xml/strings.xml +++ b/windows/src/desktop/kmshell/xml/strings.xml @@ -536,6 +536,16 @@ Copyright © SIL International. All Rights Reserved. + + + + Created by %1$s + + + + + Copyright © %1$s. All Rights Reserved. + From 19cb236fe5cedb47bc152eb1ebc6facf636c3625 Mon Sep 17 00:00:00 2001 From: sgschantz Date: Fri, 30 Aug 2024 15:05:58 +0700 Subject: [PATCH 08/22] fix(mac): open download info sheet from config window Rather than opening from the keyboard download window which is supposed to be closed by the download info sheet. This prevents the download info sheet from closing its own parent on which it depends. --- .../Keyman4MacIM/KMInputMethodAppDelegate.m | 19 ++++++++++++++++--- .../Keyman4MacIM/KMSettingsRepository.m | 5 ++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.m b/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.m index d0c7e808d5..78c6362de9 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.m +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.m @@ -983,6 +983,7 @@ CGEventRef eventTapFunction(CGEventTapProxy proxy, CGEventType type, CGEventRef return _configWindow; } +// TODO: rewrite confusing pattern, multiple methods differing only by underscore - (NSWindowController *)aboutWindow_ { return _aboutWindow; } @@ -1073,6 +1074,9 @@ CGEventRef eventTapFunction(CGEventTapProxy proxy, CGEventType type, CGEventRef } else if (returnCode == NSModalResponseOK) { os_log_debug([KMLogs uiLog], "downloadComplete, returnCode == NSModalResponseOK"); + + [_downloadKBWindow close]; + if (self.configWindow.window != nil) { os_log_debug([KMLogs uiLog], "downloadComplete, self.configWindow.window != nil"); [self.configWindow.window makeKeyAndOrderFront:nil]; @@ -1135,6 +1139,7 @@ CGEventRef eventTapFunction(CGEventTapProxy proxy, CGEventType type, CGEventRef [self downloadKeyboardFromURL:url]; } + - (void)downloadKeyboardFromURL:(NSURL *)url { NSURL* downloadUrl = url; os_log_debug([KMLogs uiLog], "downloadKeyboardFromURL, url.path: %{public}@", url.path); @@ -1153,7 +1158,13 @@ CGEventRef eventTapFunction(CGEventTapProxy proxy, CGEventType type, CGEventRef } [self.downloadKBWindow.window centerInParent]; [self.downloadKBWindow.window makeKeyAndOrderFront:nil]; - [self.downloadInfoView beginSheetModalForWindow:self.downloadKBWindow.window completionHandler:^(NSModalResponse returnCode) { + + /* + Open sheet off of config window, not the download window. + This is because, if the download is successful, + the download window will be closed by the sheet. + */ + [self.downloadInfoView beginSheetModalForWindow:self.configWindow.window completionHandler:^(NSModalResponse returnCode) { [self downloadComplete:returnCode]; }]; } @@ -1162,7 +1173,10 @@ CGEventRef eventTapFunction(CGEventTapProxy proxy, CGEventType type, CGEventRef [self.downloadKBWindow.window centerInParent]; [self.downloadKBWindow.window makeKeyAndOrderFront:nil]; [self.downloadKBWindow.window setLevel:NSFloatingWindowLevel]; - [self.downloadInfoView beginSheetModalForWindow:self.downloadKBWindow.window completionHandler:^(NSModalResponse returnCode) { + /* + Open sheet off of config window, same as above. + */ + [self.downloadInfoView beginSheetModalForWindow:self.configWindow.window completionHandler:^(NSModalResponse returnCode) { [self downloadComplete:returnCode]; }]; } @@ -1178,7 +1192,6 @@ CGEventRef eventTapFunction(CGEventTapProxy proxy, CGEventType type, CGEventRef _receivedData = [[NSMutableData alloc] initWithLength:0]; _connection = [[NSURLConnection alloc] initWithRequest:request delegate:self startImmediately:YES]; } - } } diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMSettingsRepository.m b/mac/Keyman4MacIM/Keyman4MacIM/KMSettingsRepository.m index d8cca25f94..bbd87a40ec 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/KMSettingsRepository.m +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMSettingsRepository.m @@ -251,7 +251,6 @@ NSInteger const kCurrentDataModelVersionNumber = kVersionStoreDataInLibraryDirec } - (void)convertActiveKeyboardArrayForMigration { - NSUserDefaults *userData = [NSUserDefaults standardUserDefaults]; NSMutableArray *keyboards = [self activeKeyboards]; NSMutableArray *convertedActiveKeyboards = [[NSMutableArray alloc] initWithCapacity:0]; BOOL didConvert = NO; @@ -269,9 +268,9 @@ NSInteger const kCurrentDataModelVersionNumber = kVersionStoreDataInLibraryDirec } } - // only update array in UserDefaults if we actually converted something + // only write array to UserDefaults if we actually converted something if (didConvert) { - [[NSUserDefaults standardUserDefaults] setObject:convertedActiveKeyboards forKey:kActiveKeyboardsKey]; + [self writeActiveKeyboards:convertedActiveKeyboards]; } } From b38700cb19d5535a8c56259e629605a4a689046c Mon Sep 17 00:00:00 2001 From: sgschantz Date: Mon, 2 Sep 2024 09:34:31 +0700 Subject: [PATCH 09/22] fix(mac): comment cleanup --- mac/Keyman4MacIM/Keyman4MacIM/KMSettingsRepository.h | 2 +- .../KeymanEngine4Mac/KME/OnScreenKeyboard/KeyView.m | 4 ++-- .../KeymanEngine4Mac/KME/OnScreenKeyboard/OSKKey.m | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMSettingsRepository.h b/mac/Keyman4MacIM/Keyman4MacIM/KMSettingsRepository.h index 5a7f920c9f..8d7b114f2b 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/KMSettingsRepository.h +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMSettingsRepository.h @@ -1,4 +1,4 @@ -/** +/* * Keyman is copyright (C) SIL International. MIT License. * * KMSettingsRepository.h diff --git a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/KeyView.m b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/KeyView.m index 9dfd39856b..5b31cf8ffa 100644 --- a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/KeyView.m +++ b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/KeyView.m @@ -42,7 +42,7 @@ static CGFloat const kRelativeModifierLabelHeight = 0.30f; self = [super initWithFrame:frame]; if (self) { /* - // usually too much, but uncomment for debugging + // usually too much logging, uncomment for debugging os_log_debug([KMELogs oskLog], "KeyView initWithFrame: %{public}@, bounds: %{public}@, default clipsToBounds %{public}@", NSStringFromRect(frame), NSStringFromRect(self.bounds), self.clipsToBounds?@"YES":@"NO"); */ self.clipsToBounds = true; @@ -74,7 +74,7 @@ static CGFloat const kRelativeModifierLabelHeight = 0.30f; - (void)drawRect:(NSRect)rect { /* - // usually too much, but uncomment for debugging + // usually too much logging, uncomment for debugging os_log_debug([KMELogs uiLog], "KeyView drawRect: %{public}@, bounds: %{public}@, keyCode: 0x%lx, caption: %{public}@, label: %{public}@", NSStringFromRect(rect), NSStringFromRect(self.bounds), self.keyCode, self.caption.stringValue, self.label.stringValue); */ diff --git a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/OSKKey.m b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/OSKKey.m index 7ff40ccffe..b1144a17fa 100644 --- a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/OSKKey.m +++ b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/OSKKey.m @@ -15,7 +15,7 @@ self = [super init]; if (self) { /* - // usually too much, but uncomment for debugging + // usually too much logging, uncomment for debugging os_log_debug([KMELogs oskLog], "OSKKey initWithKeyCode: 0x%lx, caption: %{public}@, scale: %f", keyCode, caption, scale); */ _keyCode = keyCode; From 10c343fc432641b1df11fa73e0e852fde2c6c7cf Mon Sep 17 00:00:00 2001 From: rc-swag <58423624+rc-swag@users.noreply.github.com> Date: Mon, 2 Sep 2024 13:31:21 +1000 Subject: [PATCH 10/22] feat(windows): change verb use to allow for clarity --- common/windows/delphi/general/RegistryKeys.pas | 8 ++++---- windows/src/desktop/kmshell/xml/strings.xml | 2 +- .../keyman32/k32_lowlevelkeyboardhook.cpp | 18 +++++++++--------- .../engine/kmcomapi/util/utilkeymanoption.pas | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/common/windows/delphi/general/RegistryKeys.pas b/common/windows/delphi/general/RegistryKeys.pas index 0553b82306..e351b3860f 100644 --- a/common/windows/delphi/general/RegistryKeys.pas +++ b/common/windows/delphi/general/RegistryKeys.pas @@ -113,11 +113,11 @@ const SRegValue_ShowWelcome = 'show welcome'; // CU SRegValue_UseAdvancedInstall = 'use advanced install'; // CU - SRegValue_AltGrCtrlAlt = 'simulate altgr'; // CU - SRegValue_KeyboardHotKeysAreToggle = 'hotkeys are toggles'; // CU - SRegValue_UseRightModifierHotKey = 'use right modifier for hotkey'; // CU + SRegValue_AltGrCtrlAlt = 'simulate altgr'; // CU + SRegValue_KeyboardHotKeysAreToggle = 'hotkeys are toggles'; // CU + SRegValue_AllowRightModifierHotKey = 'allow right modifier for hotkey'; // CU SRegValue_ReleaseShiftKeysAfterKeyPress = 'release shift keys after key press'; // CU - SRegValue_TestKeymanFunctioning = 'test keyman functioning'; // CU, default true + SRegValue_TestKeymanFunctioning = 'test keyman functioning'; // CU, default true SRegValue_CreateStartMenuAsSubfolders = 'create start menu as subfolders'; // CU SRegValue_CreateUninstallEntries = 'create uninstall entries'; // CU diff --git a/windows/src/desktop/kmshell/xml/strings.xml b/windows/src/desktop/kmshell/xml/strings.xml index 9409d6d8c1..8b6c37c55c 100644 --- a/windows/src/desktop/kmshell/xml/strings.xml +++ b/windows/src/desktop/kmshell/xml/strings.xml @@ -380,7 +380,7 @@ - Right-side modifier keys trigger hotkeys + Allow right modifier for hotkeys diff --git a/windows/src/engine/keyman32/k32_lowlevelkeyboardhook.cpp b/windows/src/engine/keyman32/k32_lowlevelkeyboardhook.cpp index efd5d158bb..a6a84faf44 100644 --- a/windows/src/engine/keyman32/k32_lowlevelkeyboardhook.cpp +++ b/windows/src/engine/keyman32/k32_lowlevelkeyboardhook.cpp @@ -130,22 +130,22 @@ BOOL IsTouchPanelVisible() { } /* - Cache UseRightModifierHotKey for this session + Cache AllowRightModifierHotKey for this session */ -BOOL UseRightModifierHotKey() { - static BOOL flag_UseRightModifierHotKey = FALSE; +BOOL AllowRightModifierHotKey() { + static BOOL flag_AllowRightModifierHotKey = FALSE; static BOOL loaded = FALSE; if (!loaded) { RegistryReadOnly reg(HKEY_CURRENT_USER); if (reg.OpenKeyReadOnly(REGSZ_KeymanCU)) { if (reg.ValueExists(REGSZ_AllowRightModifierHotKey)) { - flag_UseRightModifierHotKey = !!reg.ReadInteger(REGSZ_AllowRightModifierHotKey); + flag_AllowRightModifierHotKey = !!reg.ReadInteger(REGSZ_AllowRightModifierHotKey); } } loaded = TRUE; // Set loaded to TRUE whether or not the key exists } - return flag_UseRightModifierHotKey; + return flag_AllowRightModifierHotKey; } LRESULT _kmnLowLevelKeyboardProc( @@ -176,7 +176,7 @@ LRESULT _kmnLowLevelKeyboardProc( } if (GetKeyState(VK_RCONTROL) < 0) { - FHotkeyShiftState |= UseRightModifierHotKey() ? HK_CTRL : HK_RCTRL_INVALID; + FHotkeyShiftState |= AllowRightModifierHotKey() ? HK_CTRL : HK_RCTRL_INVALID; } if (GetKeyState(VK_LMENU) < 0) { @@ -184,18 +184,18 @@ LRESULT _kmnLowLevelKeyboardProc( } if (GetKeyState(VK_RMENU) < 0) { - FHotkeyShiftState |= UseRightModifierHotKey() ? HK_ALT : HK_RALT_INVALID; + FHotkeyShiftState |= AllowRightModifierHotKey() ? HK_ALT : HK_RALT_INVALID; } if (GetKeyState(VK_LSHIFT) < 0) { FHotkeyShiftState |= HK_SHIFT; } if (GetKeyState(VK_RSHIFT) < 0) { - FHotkeyShiftState |= UseRightModifierHotKey() ? HK_SHIFT : HK_RSHIFT_INVALID; + FHotkeyShiftState |= AllowRightModifierHotKey() ? HK_SHIFT : HK_RSHIFT_INVALID; } //TODO: #8064. Can remove debug message once issue #8064 is resolved - SendDebugMessageFormat("!UseCachedHotkeyModifierState [FHotkeyShiftState:%x]", FHotkeyShiftState); + SendDebugMessageFormat("[FHotkeyShiftState:%x]", FHotkeyShiftState); // #7337 Post the modifier state ensuring the serialized queue is in sync // Note that the modifier key may be posted again with WM_KEYMAN_KEY_EVENT, diff --git a/windows/src/engine/kmcomapi/util/utilkeymanoption.pas b/windows/src/engine/kmcomapi/util/utilkeymanoption.pas index 2df38b5c82..906e121f07 100644 --- a/windows/src/engine/kmcomapi/util/utilkeymanoption.pas +++ b/windows/src/engine/kmcomapi/util/utilkeymanoption.pas @@ -127,7 +127,7 @@ const KeymanOptionInfo: array[0..16] of TKeymanOptionInfo = ( // I3331 // I36 (opt: koKeyboardHotkeysAreToggle; RegistryName: SRegValue_KeyboardHotkeysAreToggle; OptionType: kotBool; BoolValue: False; GroupName: 'kogGeneral'), (opt: koSwitchLanguageForAllApplications; RegistryName: SRegValue_SwitchLanguageForAllApplications; OptionType: kotBool; BoolValue: True; GroupName: 'kogGeneral'), // I2277 // I4393 (opt: koAltGrCtrlAlt; RegistryName: SRegValue_AltGrCtrlAlt; OptionType: kotBool; BoolValue: False; GroupName: 'kogGeneral'), - (opt: koRightModifierHK; RegistryName: SRegValue_UseRightModifierHotKey; OptionType: kotBool; BoolValue: False; GroupName: 'kogGeneral'), + (opt: koRightModifierHK; RegistryName: SRegValue_AllowRightModifierHotKey; OptionType: kotBool; BoolValue: False; GroupName: 'kogGeneral'), (opt: koShowHints; RegistryName: SRegValue_EnableHints; OptionType: kotBool; BoolValue: True; GroupName: 'kogGeneral'), (opt: koBaseLayout; RegistryName: SRegValue_UnderlyingLayout; OptionType: kotLong; IntValue: 0; GroupName: 'kogGeneral'), From cad009acc2627c72fa572f5cbcdbf5b6eb6d4ea4 Mon Sep 17 00:00:00 2001 From: rc-swag <58423624+rc-swag@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:03:37 +1000 Subject: [PATCH 11/22] feat(windows): Fix string id name --- oem/firstvoices/windows/src/xml/strings.xml | 2 +- windows/src/desktop/kmshell/xml/strings.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/oem/firstvoices/windows/src/xml/strings.xml b/oem/firstvoices/windows/src/xml/strings.xml index e71f4b2c90..fbd099c8c7 100644 --- a/oem/firstvoices/windows/src/xml/strings.xml +++ b/oem/firstvoices/windows/src/xml/strings.xml @@ -520,7 +520,7 @@ - Copyright © %1$s. All Rights Reserved. + Copyright © %1$s. All Rights Reserved. diff --git a/windows/src/desktop/kmshell/xml/strings.xml b/windows/src/desktop/kmshell/xml/strings.xml index 9f9a8b105f..bf4cccc117 100644 --- a/windows/src/desktop/kmshell/xml/strings.xml +++ b/windows/src/desktop/kmshell/xml/strings.xml @@ -544,7 +544,7 @@ - Copyright © %1$s. All Rights Reserved. + Copyright © %1$s. All Rights Reserved. From cc2c917bc2babfa1a316fec81bd8637d786eec02 Mon Sep 17 00:00:00 2001 From: sgschantz Date: Mon, 2 Sep 2024 15:56:50 +0700 Subject: [PATCH 12/22] fix(mac): nil window references after dismissing dialogs also delete commented code --- .../KMConfigurationWindowController.m | 28 ++----------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/KMConfigurationWindowController.m b/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/KMConfigurationWindowController.m index 027e4f9bc2..c99d632665 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/KMConfigurationWindowController.m +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/KMConfigurationWindowController.m @@ -422,8 +422,8 @@ if (returnCode == NSAlertFirstButtonReturn) { os_log_debug([KMLogs uiLog], "confirm delete keyboard alert dismissed"); [self deleteFileAtIndex:[NSNumber numberWithInteger:deleteButton.tag]]; - self.deleteAlertView = nil; } + self.deleteAlertView = nil; }]; } @@ -462,8 +462,9 @@ os_log_debug([KMLogs uiLog], "confirm keyboard installation alert dismissed"); if (returnCode == NSAlertFirstButtonReturn) { [self installPackageFile: package.getTempKmpFilename]; - self.confirmKmpInstallAlertView = nil; } + [package releaseTempKMPFile]; + self.confirmKmpInstallAlertView = nil; }]; } @@ -564,29 +565,6 @@ return _confirmKmpInstallAlertView; } -/* -- (void)alertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo { - os_log_debug([KMLogs uiLog], "User responded to NSAlert"); - if (alert == _deleteAlertView) { - if (returnCode == NSAlertFirstButtonReturn) { // Delete - [self deleteFileAtIndex:(__bridge NSNumber *)contextInfo]; - } - - _deleteAlertView = nil; - } - else if (alert == _confirmKmpInstallAlertView) { - KMPackage *package = (__bridge KMPackage *)contextInfo; - os_log_debug([KMLogs uiLog], "KMP - Temp file: %{public}@", package.getTempKmpFilename); - if (returnCode == NSAlertFirstButtonReturn) { // Install - [self installPackageFile: package.getTempKmpFilename]; - } - - [package releaseTempKMPFile]; - _confirmKmpInstallAlertView = nil; - } - // else, just a message - nothing to do. -} -*/ - (void)deleteFileAtIndex:(NSNumber *) n { NSInteger index = [n integerValue]; NSString *path2Remove = nil; From 33715a0b389fa77ff52463c16eb574860c89250a Mon Sep 17 00:00:00 2001 From: Keyman Build Agent Date: Mon, 2 Sep 2024 14:02:38 -0400 Subject: [PATCH 13/22] auto: increment master version to 18.0.104 --- HISTORY.md | 5 +++++ VERSION.md | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index a99386923b..6a45fe68ea 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,10 @@ # Keyman Version History +## 18.0.103 alpha 2024-09-02 + +* feat(windows): Remove hotkey related feature flags (#12252) +* feat(windows): update SIL logo for Windows UI (#12250) + ## 18.0.102 alpha 2024-08-30 * docs(web): add documentation comments for touch layout interfaces (#12314) diff --git a/VERSION.md b/VERSION.md index 237f3b532e..6451a36310 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -18.0.103 \ No newline at end of file +18.0.104 \ No newline at end of file From 99adf9c7e1db99e88d01d489889a9248a2239997 Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Tue, 3 Sep 2024 11:05:13 +0700 Subject: [PATCH 14/22] chore(common): Fix missing entries in HISTORY.md --- HISTORY.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 6a45fe68ea..2bc57835ac 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -25,7 +25,7 @@ * fix(android): Prioritize certain actions over multi-line for ENTER key (#12315) * fix(linux): add `keymanFacename` to .ldml file (#12277) * chore(common): Update crowdin strings for Czech (#12316) -* (#12313) +* fix(web): prevent unintuitive space-output blocking for mid-context suggestions (#12313) ## 18.0.100 alpha 2024-08-28 @@ -35,8 +35,8 @@ * feat(web): import the generator for the pred-text wordbreaker's Unicode-property data-table (#10690) * feat(web): optimize the wordbreaker data table for filesize and ease of first-load parsing (#10692) -* (#12297) -* (#12115) +* fix(web): fixes wordbreaker test import path (#12297) +* feat(web): enable utf8 charset encoding for the build artifacts (#12115) ## 18.0.98 alpha 2024-08-26 @@ -81,11 +81,11 @@ ## 18.0.93 alpha 2024-08-20 -* (#12188) +* refactor(web): remove engine/interfaces dependency on engine/js-processor (#12188) * fix(web): fix malformed reversion display strings (#12201) * feat(android): Add menu to specify long-press delay (#12170) * feat(android): Pass longpress delay to KeymanWeb (#12185) -* (#12223) +* fix(core): set mac build version for meson cli build to 10.13 (#12223) ## 18.0.92 alpha 2024-08-19 From f5677782b0157ce2b5faa1d107df9068471238fd Mon Sep 17 00:00:00 2001 From: sgschantz Date: Tue, 3 Sep 2024 13:07:25 +0700 Subject: [PATCH 15/22] fix(mac): check for macOS 11 for PostEvent access CGPreflightPostEventAccess API should be available with macOS 10.5 (Catalina) but that does not appear to be true in experience. Changing to check for 11.0 (Big Sur) before using that API instead. Fixes: #12295 --- .../Keyman4MacIM/Privacy/PrivacyConsent.m | 58 ++++++++++--------- 1 file changed, 31 insertions(+), 27 deletions(-) diff --git a/mac/Keyman4MacIM/Keyman4MacIM/Privacy/PrivacyConsent.m b/mac/Keyman4MacIM/Keyman4MacIM/Privacy/PrivacyConsent.m index 057f401cbe..89e6338852 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/Privacy/PrivacyConsent.m +++ b/mac/Keyman4MacIM/Keyman4MacIM/Privacy/PrivacyConsent.m @@ -1,4 +1,4 @@ -/** +/* * Keyman is copyright (C) SIL International. MIT License. * * PrivacyConsent.m @@ -7,8 +7,8 @@ * Created by Shawn Schantz on 2022-09-22. * * Used to determine if the user has provided consent to the services it needs - * and, if not, to request that consent. For versions of macOS prior to 10.15, - * Keyman requires Accessibility access. For 10.15 and later, Keyman requires + * and, if not, to request that consent. For versions of macOS prior to 11.0, + * Keyman requires Accessibility access. For 11.0 and later, Keyman requires * PostEvent access. Both are presented to the user as a need for Accessibility * when prompted by the system and are listed under Accessibility in the Privacy * tab in System Preferences, Security & Privacy. Both Accessibility and @@ -16,7 +16,11 @@ * that access is not explicitly needed as long as one of the others is provided * first. * - * Access this functionality through the shared instance. Call + * Note that Apple's documentation states that the PostEvent access APIs are + * available with macOS 10.15 (Catalina) but testing showed that it was only + * available with macOS 11.0 (Big Sur). This is documented with issue #12295. + * + * To access this functionality, used the shared instance. Call * requestPrivacyAccess which will check whether access has been granted. If * not, then a dialog will be presented to the user to inform them that * Accessibility is required. Dismissing this dialog will trigger the API call @@ -24,7 +28,7 @@ * only happen once. If the user was prompted earlier and did not grant access, * they can still go to System Preferences and enable it there. So it is useful * to prompt with a dialog from Keyman at startup. Without Accessibility, the - * shift layer and the OSK do not work -- so Keyman is basically useless. + * shift layer and the OSK do not work. */ #import "PrivacyConsent.h" @@ -43,7 +47,7 @@ } /** - * For macOS earlier than 10.15: check for Accessibility access. + * For macOS earlier than 11.0: check for Accessibility access. */ - (BOOL)checkAccessibility { @@ -66,7 +70,7 @@ BOOL hasAccessibility = NO; // check if we already have accessibility - if (@available(macOS 10.15, *)) { + if (@available(macOS 11.0, *)) { hasAccessibility = [self checkPostEventAccess]; } else { hasAccessibility = [self checkAccessibility]; @@ -85,7 +89,7 @@ } /** - * For macOS earlier than 10.15: request Accessibility access. + * For macOS earlier than 11.0: request Accessibility access. */ - (void)requestAccessibility { @@ -113,18 +117,18 @@ */ - (void)configureDialogForOsVersion { - if (@available(macOS 10.15, *)) { - [self configureDialogForCatalinaAndLater]; + if (@available(macOS 11.0, *)) { + [self configureDialogForBigSurAndLater]; } else { - [self configureDialogForPreCatalina]; + [self configureDialogForPreBigSur]; } } /** - * Initialize privacy dialog for macOS versions prior to Catalina (10.15). + * Initialize privacy dialog for macOS versions prior to Big Sur (11.0). * In this case, request Accessibility access, not PostEvent. */ -- (void)configureDialogForPreCatalina { +- (void)configureDialogForPreBigSur { void (^consentPrompt)(void) = ^(void) { [self requestAccessibility]; @@ -136,10 +140,10 @@ } /** - * Initialize privacy dialog for macOS versions of Catalina (10.15) or later. + * Initialize privacy dialog for macOS versions of Big Sur (11.0) or later. * In this case, request PostEvent access, not Accessibility. */ -- (void)configureDialogForCatalinaAndLater { +- (void)configureDialogForBigSurAndLater { void (^consentPrompt)(void) = ^(void) { [self requestPostEventAccess]; @@ -160,7 +164,7 @@ /** * Check whether the user has allowed ListenEvent access. - * Only available with macOS Catalina (10.15) or later. + * Only available with macOS Big Sur (11.0) or later. * * If user has granted Accessibility or PostEvent access, then * ListenEvent access is also granted. @@ -170,18 +174,18 @@ BOOL hasAccess = NO; // below checks for ListenEvent access - if (@available(macOS 10.15, *)) { + if (@available(macOS 11.0, *)) { hasAccess = CGPreflightListenEventAccess(); os_log([KMLogs privacyLog], "CGPreflightListenEventAccess() returned %@", hasAccess ? @"YES" : @"NO"); } else { - os_log([KMLogs privacyLog], "CGPreflightListenEventAccess not available before macOS version 10.15"); + os_log([KMLogs privacyLog], "CGPreflightListenEventAccess not available before macOS version 11.0"); } return hasAccess; } /** * Check whether the user has allowed PostEvent access. - * Only available with macOS Catalina (10.15) or later. + * Only available with macOS Big Sur (11.0) or later. * * If user has granted Accessibility, then PostEvent access is also granted. */ @@ -190,46 +194,46 @@ BOOL hasAccess = NO; // below checks for PostEvent access - if (@available(macOS 10.15, *)) { + if (@available(macOS 11.0, *)) { hasAccess = CGPreflightPostEventAccess(); os_log([KMLogs privacyLog], "CGPreflightPostEventAccess() returned %@", hasAccess ? @"YES" : @"NO"); } else { - os_log([KMLogs privacyLog], "CGPreflightPostEventAccess not available before macOS version 10.15"); + os_log([KMLogs privacyLog], "CGPreflightPostEventAccess not available before macOS version 11.0"); } return hasAccess; } /** * Request ListenEvent access. - * Only available with macOS Catalina (10.15) or later. + * Only available with macOS Big Sur (11.0) or later. */ - (BOOL)requestListenEventAccess { BOOL granted = NO; - if (@available(macOS 10.15, *)) { + if (@available(macOS 11.0, *)) { granted = CGRequestListenEventAccess(); os_log([KMLogs privacyLog], "CGRequestListenEventAccess() returned %@", granted ? @"YES" : @"NO"); } else { - os_log([KMLogs privacyLog], "CGRequestListenEventAccess not available before macOS version 10.15"); + os_log([KMLogs privacyLog], "CGRequestListenEventAccess not available before macOS version 11.0"); } return granted; } /** * Request PostEvent access. - * Only available with macOS Catalina (10.15) or later. + * Only available with macOS Big Sur (11.0) or later. */ - (BOOL)requestPostEventAccess { BOOL granted = NO; - if (@available(macOS 10.15, *)) { + if (@available(macOS 11.0, *)) { granted = CGRequestPostEventAccess(); os_log([KMLogs privacyLog], "CGRequestPostEventAccess() returned %@", granted ? @"YES" : @"NO"); } else { - os_log([KMLogs privacyLog], "CGRequestPostEventAccess not available before macOS version 10.15"); + os_log([KMLogs privacyLog], "CGRequestPostEventAccess not available before macOS version 11.0"); } return granted; } From ca48f44065b9b067c5afbd38721f83d60d7977b8 Mon Sep 17 00:00:00 2001 From: Keyman Build Agent Date: Tue, 3 Sep 2024 14:02:35 -0400 Subject: [PATCH 16/22] auto: increment master version to 18.0.105 --- HISTORY.md | 4 ++++ VERSION.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index 6a45fe68ea..bbf7e3960b 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,9 @@ # Keyman Version History +## 18.0.104 alpha 2024-09-03 + +* fix(mac): display package info after keyboard installation (#12326) + ## 18.0.103 alpha 2024-09-02 * feat(windows): Remove hotkey related feature flags (#12252) diff --git a/VERSION.md b/VERSION.md index 6451a36310..65cb0d73ef 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -18.0.104 \ No newline at end of file +18.0.105 \ No newline at end of file From 0a42e5bba60a4e5f54774975697d5e78ea08cbb9 Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Wed, 4 Sep 2024 12:54:55 +0700 Subject: [PATCH 17/22] docs(android): Add in-app help for adjusting longpress delay --- android/help/android_images/ic_timelapse.png | Bin 0 -> 2943 bytes .../help/android_images/longpress-slider.png | Bin 0 -> 6054 bytes .../android_images/settings-screen-ap.png | Bin 28237 -> 38196 bytes .../basic/config/adjust-longpress-delay.md | 13 +++++++++++++ android/help/basic/config/index.md | 5 +++++ 5 files changed, 18 insertions(+) create mode 100644 android/help/android_images/ic_timelapse.png create mode 100644 android/help/android_images/longpress-slider.png create mode 100644 android/help/basic/config/adjust-longpress-delay.md diff --git a/android/help/android_images/ic_timelapse.png b/android/help/android_images/ic_timelapse.png new file mode 100644 index 0000000000000000000000000000000000000000..9f948825b2c55ccd2048dc1f2158ce52635b44d7 GIT binary patch literal 2943 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

RPKRvZVC&N=slpg09vP`nhD?r z6eE25TQ%YzzrH3@5S0!x82TTMjRXbG6YPRpT-=`qiiU~*8LCGM5juf);R;oMc6qtZ zT!@l}#t+27D4QQC1E3zQ5|?c8B7Ce?G_6~zVW61DAcwjRe}*lIv6zj(A#fKh{2sz} zf$2yDAH((CfUHPycH{=e9?q~pQPFh@Bm+7#1+5eLQy{Y52}7CP9G z03WQQF9lNz-YBsC)?0|J`)T>_Ax)QW-TTS0Rf1i5)L=K92Tb9KYd3&r zX)h{aLm|bq3x#8XQ+J5O%%i#0FaHT&xyIAg-O(|FdwUu>I-|>v`}D!d-))G9dyexe z&L=$%3NpjlbHeDlJ-010Eo~SanFZ(U!P`WOMb44~aho6`Myxsp_6QIkS_Khu0nobe zaCh9-2_g@K!HPyt-tV>cCp>x+2!;Rwy}5o6dX{qrCA%M_rEw7;8vWRpz0#M4agJ+Hj+zqkC`hEtuuB_ohd(80|4h z53Of=xmG;elP=?s3XVAPqtgHgF?!5YT5VR?^yZBD_Ql=qFMI()M53gk;vg3wSULSr z_|IjGd`><-;?5yDMx@F-JxlxDq9xqJuzbX~JRo?)Rh$SbZyvZO7YS~H8b?J%F;qL_ zR1M+C;W#e_o7fES8)vWu90{Zw7HTd*3 z_<)6f^7~R!QvO>^3)7BqbH-093(q0}J1(4hU;Ik!u4UBzM2T?LcB64j*5v%;w^y)mfT*R(2$TT=otspl%faBHH1OCIkmlTHqi_d->LeZN0Uy0(Nw!nv&A-Ytdrr^4G72 z5idv>lW_OiC6@b{k%5#aCns-*1I1FRKfSPaVzYQ@D{ms~;1B4J#AzZHd{+k|A<&il zpuvNap${BpV7Q8bhrd9f-;=1~59b4ZGI6ZG&HQmd05j6f>@hA68XDw*X)tmUzzU(e z;%M1Z`9$gT&i0<3E1(BNW-Y7N+F`i>?Ep&S=TpiUNnll%Gc+6-@%?UzGj2A12O4 zqV)sxtzbJ6hgy+J!EUWL4M#hjoU}y#WEE$2dl6m*f+eulBVS*Kzx|>ta&Obpo@}fw zA3k!V7Nl%-glX#vt{tKjN(#FXXJ@cQN6=azoDdE^wx`EJn{0)TlO{xMQ~=Iiq5z2y zHn8X1kB1b*p%8o-&VC`kMq6`pLTdniJaq7&-34uEA^19j%a?aSfg_Uf8i#g>j2_NhC~@#+$seGg zNQU4=fW)LEHe&cZzWZ_5v-Q4Do%*S0g^* zycoVLqWsOfXX^|Web&P7G_2C+we_(gee_gIrTM( zW@^`i!5z|%y7#7cas^E=7}qt{*c2G&X=i@iuNgVLSZ$h{H|I&S9wdB9y6$}leQCyT z?JV>;OH0eqR?v|uldb%Oghwc0gS$t6JFQWVxl2G%KOrjG+goG)@`J^p?O;6l|N2od zkk7%pNIxSG#eQRrSN(w1FRCV>x*I`u#o8TvN_V_!VbNTXR5IA_! zsQK5(AawTWAS9QYi-S#7mU$2(&RbaE1RQ5aM+X)h6c5Ka_m}DqPLAEo)`F!2OB6(y z?WI4)YyFzhv2s2h9$Z#iN5>_3`6s$E0X5RdeB#B!c@#j2fdO7jy}^I#3cs|zUX_!> zNlN2_K29#KVeoMTn3L39?}{D6o=VKgQIVX6V~RpVz8xARzT1X4lJ?yu{44{wR6}

t_!AOKB0fIwRCngKD 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 literal 28237 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 diff --git a/android/help/basic/config/adjust-longpress-delay.md b/android/help/basic/config/adjust-longpress-delay.md new file mode 100644 index 0000000000..0f3e740bdf --- /dev/null +++ b/android/help/basic/config/adjust-longpress-delay.md @@ -0,0 +1,13 @@ +--- +title: Adjust Longpress Delay - Keyman for Android Help +--- + +## Adjust Longpress Delay + +This menu is used to adjust the duration for triggering a longpress gesture. + +Drag the slider to set the delay between 0.3 seconds to 1.5 seconds. + +The default value is 0.5 seconds. + +![](../../android_images/longpress-slider.png) diff --git a/android/help/basic/config/index.md b/android/help/basic/config/index.md index 1c45d27508..92ac70afe5 100644 --- a/android/help/basic/config/index.md +++ b/android/help/basic/config/index.md @@ -44,6 +44,11 @@ Click on this to bring up the Android system configuration for setting Keyman as Click on this to [adjust the keyboard height](adjust-keyboard-height). +## Adjust longpress delay +![](../../android_images/ic_timelapse.png) + +Click on this to adjust the delay time for a longpress gesture. + ## Spacebar Caption Click on this to [change the displayed keyboard name](spacebar-caption) on the spacebar. From 60fa60d59c6889912a5717c6dc8db17897df0297 Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Wed, 4 Sep 2024 15:14:20 +0700 Subject: [PATCH 18/22] fix(android): Skip language counts for lexical-model packages --- .../src/main/java/com/tavultesoft/kmapro/PackageActivity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/PackageActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/PackageActivity.java index 3806d5f4b8..161d966308 100644 --- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/PackageActivity.java +++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/PackageActivity.java @@ -112,7 +112,8 @@ public class PackageActivity extends AppCompatActivity implements // Number of languages associated with the first keyboard in a keyboard package. // lexical-model packages will be 0 - final int languageCount = kmpProcessor.getLanguageCount(pkgInfo, PackageProcessor.PP_KEYBOARDS_KEY, 0); + final int languageCount = (keyboardCount > 0) ? + kmpProcessor.getLanguageCount(pkgInfo, PackageProcessor.PP_KEYBOARDS_KEY, 0) : 0; // Sanity check for keyboard packages if (pkgTarget.equals(PackageProcessor.PP_TARGET_KEYBOARDS)) { From 7ad1e44836c2573d79e5f4fb61e647d12b9eb643 Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Fri, 23 Aug 2024 11:18:45 +0700 Subject: [PATCH 19/22] chore(oem/fv): Update to fv_all 13.0 --- oem/firstvoices/keyboards.csv | 50 +++++++++++++++++------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/oem/firstvoices/keyboards.csv b/oem/firstvoices/keyboards.csv index 22812ec14d..d1f1b92180 100644 --- a/oem/firstvoices/keyboards.csv +++ b/oem/firstvoices/keyboards.csv @@ -12,40 +12,40 @@ fv,fv_dexwlesucid,Dəxʷləšucid,BC Coast,fv_dexwlesucid_kmw-9.0.js,9.2.1,lut-L fv,fv_diitiidatx,Diidiitidq,BC Coast,fv_diitiidatx_kmw-9.0.js,9.2.1,nuk-Latn,Nuu-chah-nulth (Latin) fv,fv_gitsenimx,Gitsenimx̱,BC Coast,fv_gitsenimx_kmw-9.0.js,10.1.2,git,Gitxsan (Latin) fv,fv_hailzaqvla,Haiɫzaqvla,BC Coast,fv_hailzaqvla_kmw-9.0.js,9.5.2,hei,Heiltsuk (Latin) -fv,fv_haisla,Haisla,BC Coast,fv_haisla.js,2.1.2,has-Latn,Haisla (Latin) -fv,fv_halqemeylem,Halq'eméylem,BC Coast,fv_halqemeylem_kmw-9.0.js,9.2,hur-Latn,Halkomelem (Latin) -fv,fv_henqeminem,Hǝn̓q̓ǝmin̓ǝm,BC Coast,fv_henqeminem_kmw-9.0.js,10.1,hur-Latn,Halkomelem (Latin) -fv,fv_klahoose,Homalco-Klahoose-Sliammon,BC Coast,fv_klahoose_kmw-9.0.js,10.1,coo,Comox -fv,fv_hulquminum,Hul’q’umi’num’,BC Coast,fv_hulquminum_kmw-9.0.js,9.1,hur-Latn,Halkomelem (Latin) +fv,fv_haisla,Haisla,BC Coast,fv_haisla.js,2.1.3,has-Latn,Haisla (Latin) +fv,fv_halqemeylem,Halq'eméylem,BC Coast,fv_halqemeylem_kmw-9.0.js,9.2.1,hur-Latn,Halkomelem (Latin) +fv,fv_henqeminem,Hǝn̓q̓ǝmin̓ǝm,BC Coast,fv_henqeminem_kmw-9.0.js,10.2.1,hur-Latn,Halkomelem (Latin) +fv,fv_klahoose,Homalco-Klahoose-Sliammon,BC Coast,fv_klahoose_kmw-9.0.js,10.2,coo,Comox +fv,fv_hulquminum,Hul’q’umi’num’,BC Coast,fv_hulquminum_kmw-9.0.js,9.1,hur,Halkomelem fv,fv_hulquminum_combine,Hul̓q̓umin̓um̓,BC Coast,fv_hulquminum_combine_kmw-9.0.js,2.0.1,hur-Latn,Halkomelem (Latin) fv,fv_kwakwala_liqwala,Kʷak̓ʷala,BC Coast,fv_kwakwala_liqwala_kmw-9.0.js,9.3,kwk-Latn,Kwakiutl (Latin) fv,fv_kwakwala,Kwak̕wala,BC Coast,fv_kwakwala_kmw-9.0.js,9.2,kwk-Latn,Kwakiutl (Latin) -fv,fv_lekwungen,Lək̓ʷəŋən,BC Coast,fv_lekwungen-9.0.js,1.0,str,Lekwungen -fv,fv_nexwslayemucen,Nəxʷsƛ̓ay̓əmúcən,BC Coast,fv_nexwslayemucen_kmw-9.0.js,10.0,clm-Latn,Clallam (Latin) -fv,fv_nisgaa,Nisg̱a'a,BC Coast,fv_nisgaa_kmw-9.0.js,9.2,ncg-Latn,Nisga'a (Latin) +fv,fv_lekwungen,Lekwungen (Lək̓ʷəŋən),BC Coast,fv_lekwungen_kmw-9.0.js,1.0.1,str,Straits Salish +fv,fv_nexwslayemucen,Nəxʷsƛ̓ay̓əmúcən,BC Coast,fv_nexwslayemucen_kmw-9.0.js,11.0,clm,Clallam +fv,fv_nisgaa,Nisg̱a'a,BC Coast,fv_nisgaa_kmw-9.0.js,9.2.1,ncg-Latn,Nisga'a (Latin) fv,fv_nuucaanul,Nuučaan̓uł,BC Coast,fv_nuucaanul_kmw-9.0.js,9.2,nuk-Latn,Nuu-chah-nulth (Latin) fv,fv_nuxalk,Nuxalk,BC Coast,fv_nuxalk_kmw-9.0.js,10.0.1,blc-Latn,Bella Coola (Latin) -fv,fv_sencoten,SENĆOŦEN,BC Coast,fv_sencoten_kmw-9.0.js,9.2.2,str,Straits Salish +fv,fv_sencoten,SENĆOŦEN,BC Coast,fv_sencoten_kmw-9.0.js,9.2.3,str,Straits Salish fv,fv_sguuxs,Sgüüx̱s,BC Coast,fv_sguuxs.js,1.1,tsi,Tsimshian -fv,fv_shashishalhem,Shashishalhem,BC Coast,fv_shashishalhem_kmw-9.0.js,9.2,sec-Latn,Sechelt (Latin) +fv,fv_shashishalhem,Shashishalhem,BC Coast,fv_shashishalhem_kmw-9.0.js,9.2.1,sec-Latn,Sechelt (Latin) fv,fv_skwxwumesh_snichim,Sḵwx̱wúmesh sníchim,BC Coast,fv_skwxwumesh_snichim_kmw-9.0.js,10.0,squ-Latn,Squamish (Latin) -fv,fv_smalgyax,Sm'algya̱x,BC Coast,fv_smalgyax_kmw-9.0.js,9.2,tsi-Latn,Tsimshian (Latin) +fv,fv_smalgyax,Sm'algya̱x,BC Coast,fv_smalgyax_kmw-9.0.js,9.3,tsi-Latn,Tsimshian (Latin) fv,fv_xaislakala,X̄a'ʼislak̓ala,BC Coast,fv_xaislakala_kmw-9.0.js,10.0,has-Latn,Haisla (Latin) fv,fv_hlgaagilda_xaayda_kil,X̱aayda-X̱aad Kil,BC Coast,fv_hlgaagilda_xaayda_kil_kmw-9.0.js,9.4,hax,Southern Haida fv,fv_dakelh,Dakelh,BC Interior,fv_dakelh_kmw-9.0.js,9.2.1,caf-Latn,Southern Carrier (Latin) fv,fv_ktunaxa,Ktunaxa,BC Interior,fv_ktunaxa_kmw-9.0.js,10.0,kut-Latn,Kutenai (Latin) fv,fv_kwadacha_tsekene,Kwadacha Tsek’ene,BC Interior,fv_kwadacha_tsekene_kmw-9.0.js,1.1,sek-Latn,Sekani -fv,fv_natwits,Nedut’en-Witsuwit'en,BC Interior,fv_natwits_kmw-9.0.js,9.1.3,caf-Latn,Southern Carrier (Latin) +fv,fv_natwits,Nedut’en-Witsuwit'en,BC Interior,fv_natwits_kmw-9.0.js,9.2,caf-Latn,Southern Carrier (Latin) fv,fv_nlekepmxcin,Nłeʔkepmxcin,BC Interior,fv_nlekepmxcin_kmw-9.0.js,9.5.1,thp-Latn,Thompson (Latin) -fv,fv_nlha7kapmxtsin,Nlha7kapmxtsin,BC Interior,fv_nlha7kapmxtsin_kmw-9.0.js,10.1.1,thp-Latn,Thompson (Latin) +fv,fv_nlha7kapmxtsin,Nlha7kapmxtsin,BC Interior,fv_nlha7kapmxtsin_kmw-9.0.js,10.1.2,thp,Thompson fv,fv_nlakapamuxcheen,Nlakapamuxcheen,BC Interior,fv_nlakapamuxcheen_kmw-9.0.js,1.1,thp,Thompson -fv,fv_nsilxcen,Nsilxcən,BC Interior,fv_nsilxcen_kmw-9.0.js,10.0,oka,Okanagan -fv,fv_secwepemctsin,Secwepemctsín,BC Interior,fv_secwepemctsin_kmw-9.0.js,9.2,shs-Latn,Shuswap (Latin) -fv,fv_stlatlimxec,Sƛ̓aƛ̓imxəc,BC Interior,fv_stlatlimxec_kmw-9.0.js,9.3,lil-Latn,Lillooet (Latin) +fv,fv_nsilxcen,Nsilxcən,BC Interior,fv_nsilxcen_kmw-9.0.js,10.0.1,oka,Okanagan +fv,fv_secwepemctsin,Secwepemctsín,BC Interior,fv_secwepemctsin_kmw-9.0.js,9.3,shs,Shuswap +fv,fv_stlatlimxec,Sƛ̓aƛ̓imxəc,BC Interior,fv_stlatlimxec_kmw-9.0.js,9.4,lil-Latn,Lillooet (Latin) fv,fv_statimcets,St̓át̓imcets,BC Interior,fv_statimcets_kmw-9.0.js,9.2,lil-Latn,Lillooet (Latin) fv,fv_taltan,Tāłtān,BC Interior,fv_taltan_kmw-9.0.js,9.2,tht-Latn,Tahltan (Latin) fv,fv_tsekehne,Tsek'ehne,BC Interior,fv_tsekehne_kmw-9.0.js,9.2,sek-Latn,Sekani (Latin) -fv,fv_tsilhqotin,Tŝilhqot'in,BC Interior,fv_tsilhqotin_kmw-9.0.js,9.2,clc-Latn,Chilcotin (Latin) +fv,fv_tsilhqotin,Tŝilhqot'in,BC Interior,fv_tsilhqotin_kmw-9.0.js,9.3,clc-Latn,Chilcotin (Latin) fv,fv_southern_carrier,ᑐᑊᘁᗕᑋᗸ (Southern Carrier),BC Interior,fv_southern_carrier_kmw-9.0.js,10.1,caf-Cans,Southern Carrier (Unified Canadian Aboriginal Syllabics) fv,fv_anicinapemi8in,Anicinapemi8in/Anishinàbemiwin,Eastern Subarctic,fv_anicinapemi8in_kmw-9.0.js,9.1.1,alq-Latn,Algonquin (Latin) fv,fv_atikamekw,Atikamekw,Eastern Subarctic,fv_atikamekw_kmw-9.0.js,9.1.1,atj-Latn,Atikamekw (Latin) @@ -53,16 +53,16 @@ fv,fv_ilnu_innu_aimun,Ilnu-Innu Aimun,Eastern Subarctic,fv_ilnu_innu_aimun_kmw-9 fv,fv_swampy_cree,ᐃᓂᓂᒧᐎᐣ (Swampy Cree),Eastern Subarctic,fv_swampy_cree_kmw-9.0.js,9.2.1,csw-Cans,Swampy Cree (Unified Canadian Aboriginal Syllabics) fv,fv_moose_cree,ᐃᓕᓖᒧᐎᓐ (Moose Cree),Eastern Subarctic,fv_moose_cree_kmw-9.0.js,9.2.1,crm-Cans,Moose Cree (Unified Canadian Aboriginal Syllabics) fv,fv_northern_east_cree,ᐄᔨᔫ-ᐄᓅ ᐊᔨᒨᓐ (Northern East Cree),Eastern Subarctic,fv_northern_east_cree_kmw-9.0.js,9.2.1,crl-Cans,Northern East Cree (Unified Canadian Aboriginal Syllabics) -fv,fv_severn_ojibwa,ᐊᓂᔑᓂᓂᒧᐎᐣ (Severn Ojibwa),Eastern Subarctic,fv_severn_ojibwa_kmw-9.0.js,10.1,ojs-Cans,Severn Ojibwa (Unified Canadian Aboriginal Syllabics) -fv,fv_severn_ojibwa_rdot,ᐊᓂᔑᓂᓂᒧᐏᐣ (Severn Ojibwa right w-dot),Eastern Subarctic,fv_severn_ojibwa_kmw-9.0.js,1.1,ojs,Oji-Cree +fv,fv_severn_ojibwa,ᐊᓂᔑᓂᓂᒧᐎᐣ (Severn Ojibwa),Eastern Subarctic,fv_severn_ojibwa_kmw-9.0.js,10.1.1,ojs-Cans,Severn Ojibwa (Unified Canadian Aboriginal Syllabics) +fv,fv_severn_ojibwa_rdot,ᐊᓂᔑᓂᓂᒧᐏᐣ (Severn Ojibwa right w-dot),Eastern Subarctic,fv_severn_ojibwa_kmw-9.0.js,1.1.1,ojs,Oji-Cree fv,fv_ojibwa,ᐊᓂᔑᓇᐯᒧᐎᓐ (a-finals),Eastern Subarctic,fv_ojibwa_kmw-9.0.js,10.1,ojb-Cans,Northwestern Ojibwa (Unified Canadian Aboriginal Syllabics) -fv,fv_ojibwa_rdot,ᐁᓂᔑᓇᐯᒧᐏᓐ (a-finals right w-dot),Eastern Subarctic,fv_ojibwa_rdot_kmw-9.0.js,1.0.2,oj,Ojibwa -fv,fv_ojibwa_ifinal,ᐊᓂᔑᓇᐯᒧᐎᣙ (i-finals),Eastern Subarctic,fv_ojibwa_ifinal_kmw-9.0.js,1.0.1,oj,Ojibwa -fv,fv_ojibwa_ifinal_rdot,ᐊᓂᔑᓇᐯᒧᐏᣙ (i-finals right w-dot),Eastern Subarctic,fv_ojibwa_ifinal_rdot_kmw-9.0.js,1.0.1,oj,Ojibwa +fv,fv_ojibwa_rdot,ᐁᓂᔑᓇᐯᒧᐏᓐ (a-finals right w-dot),Eastern Subarctic,fv_ojibwa_rdot_kmw-9.0.js,1.0.3,oj,Ojibwa +fv,fv_ojibwa_ifinal,ᐊᓂᔑᓇᐯᒧᐎᣙ (i-finals),Eastern Subarctic,fv_ojibwa_ifinal_kmw-9.0.js,1.0.2,oj,Ojibwa +fv,fv_ojibwa_ifinal_rdot,ᐊᓂᔑᓇᐯᒧᐏᣙ (i-finals right w-dot),Eastern Subarctic,fv_ojibwa_ifinal_rdot_kmw-9.0.js,1.0.2,oj,Ojibwa fv,fv_naskapi,ᓇᔅᑲᐱ (Naskapi),Eastern Subarctic,fv_naskapi_kmw-9.0.js,9.3.1,nsk-Cans,Naskapi (Unified Canadian Aboriginal Syllabics) sil,sil_euro_latin,English,European,european2-1.6.js,3.0.2,en,English basic,basic_kbdcan,Français,European,canadian_french-1.0.js,1.1.1,fr-CA,French (Canada) -fv,fv_anishinaabemowin,Anishinaabemowin,Great Lakes - St. Lawrence,fv_anishinaabemowin_kmw-9.0.js,10.1,oj,Ojibwa +fv,fv_anishinaabemowin,Anishinaabemowin,Great Lakes - St. Lawrence,fv_anishinaabemowin_kmw-9.0.js,10.2,oj,Ojibwa fv,fv_bodewadminwen,Bodéwadminwen-Nishnabémwen,Great Lakes - St. Lawrence,fv_bodewadminwen_kmw-9.0.js,9.1.1,pot-Latn,Potawatomi (Latin) fv,fv_goyogohono,Goyogo̱hó:nǫ',Great Lakes - St. Lawrence,fv_goyogohono_kmw-9.0.js,9.2.1,cay-Latn,Cayuga (Latin) fv,fv_kanienkeha_e,Kanien'kéha-Kanyen'kéha,Great Lakes - St. Lawrence,fv_kanienkeha_e_kmw-9.0.js,9.1.3,moh-Latn,Mohawk (Latin) @@ -85,7 +85,7 @@ fv,fv_nakoda,Nakoda,Prairies,fv_nakoda_kmw-9.0.js,9.1.1,asb-Latn,Assiniboine (La fv,fv_tsuutina,Tsúùt'ínà,Prairies,fv_tsuutina_kmw-9.0.js,9.1.1,srs-Latn,Sarsi (Latin) fv,fv_plains_cree,ᓀᐦᐃᔭᐍᐏᐣ (Plains Cree),Prairies,fv_plains_cree_kmw-9.0.js,11.1,crk-Cans,ᓀᐦᐃᔭᐍᐏᐣ (Cree syllabics) fv,fv_dine_bizaad,Diné Bizaad,South West,fv_dine_bizaad_kmw-9.0.js,9.1.1,nv-Latn,Navajo (Latin) -fv,fv_dane_zaa_zaage,Dane-Z̲aa Z̲áágéʔ,Western Subarctic,fv_dane_zaa_zaage_kmw-9.0.js,9.4,bea,Beaver +fv,fv_dane_zaa_zaage,Dane-Z̲aa Z̲áágéʔ,Western Subarctic,fv_dane_zaa_zaage_kmw-9.0.js,9.4.1,bea,Beaver fv,fv_dene_dzage,Dene Dzage,Western Subarctic,fv_dene_dzage_kmw-9.0.js,11.0.1,kkz-Latn,Kaska (Latin) fv,fv_dene_zhatie,Dene Zhatié,Western Subarctic,fv_dene_zhatie_kmw-9.0.js,10.2.1,den,Dene Zhatıé fv,fv_denesuline_epsilon,Dënesųłıné,Western Subarctic,fv_denesuline_epsilon_kmw-9.0.js,10.0.1,chp,Chipewyan @@ -100,7 +100,7 @@ fv,fv_northern_tutchone,Northern Tutchone,Western Subarctic,fv_northern_tutchone fv,fv_sahugotine_yati,Sahtúgot'ı̨nę́ Yatı̨́,Western Subarctic,fv_sahugotine_yati_kmw-9.0.js,9.1.1,scs-Latn,North Slavey (Latin) fv,fv_shihgotine_yati,Shıhgot'ı̨nę́ Yatı̨́,Western Subarctic,fv_shihgotine_yati_kmw-9.0.js,9.1.1,scs-Latn,North Slavey (Latin) fv,fv_southern_tutchone,Southern Tutchone,Western Subarctic,fv_southern_tutchone_kmw-9.0.js,9.3,tce-Latn,Southern Tutchone (Latin) -fv,fv_tagizi_dene,Tāgizi Dene,Western Subarctic,fv_tagizi_dene_kmw-9.0.js,9.3,tgx-Latn,Tagish (Latin) +fv,fv_tagizi_dene,Tāgizi Dene,Western Subarctic,fv_tagizi_dene_kmw-9.0.js,9.4,tgx-Latn,Tagish (Latin) fv,fv_tlicho_yatii,Tłı̨chǫ Yatıı̀,Western Subarctic,fv_tlicho_yatii_kmw-9.0.js,9.1.1,dgr-Latn,Dogrib (Latin) fv,fv_dene_mb,ᑌᓀ ᔭᕠᐁ (Dene MB),Western Subarctic,fv_dene_mb_kmw-9.0.js,9.2.1,chp-Cans,Chipewyan (Unified Canadian Aboriginal Syllabics) fv,fv_dene_nt,ᑌᓀ ᔭᕱᐁ (Dene NT),Western Subarctic,fv_dene_nt_kmw-9.0.js,9.2.1,chp-Cans,Chipewyan (Unified Canadian Aboriginal Syllabics) From d0f0b68571ed264496bcd83aca9e62a21cb23ed1 Mon Sep 17 00:00:00 2001 From: Keyman Build Agent Date: Thu, 5 Sep 2024 14:03:12 -0400 Subject: [PATCH 20/22] auto: increment master version to 18.0.106 --- HISTORY.md | 8 ++++++++ VERSION.md | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index 32e21fd134..d01f122543 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,13 @@ # Keyman Version History +## 18.0.105 alpha 2024-09-05 + +* chore(common): Fix missing entries in HISTORY.md (#12352) +* docs(android): Add in-app help for adjusting longpress delay (#12359) +* fix(mac): avoid crash on startup with macOS 10.15 (Catalina) (#12354) +* chore(oem/fv): Update to fv_all 13.0 (#12362) +* feat(windows): Add two new strings for SIL Global name instead of SIL International (#12327) + ## 18.0.104 alpha 2024-09-03 * fix(mac): display package info after keyboard installation (#12326) diff --git a/VERSION.md b/VERSION.md index 65cb0d73ef..365ae78f19 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -18.0.105 \ No newline at end of file +18.0.106 \ No newline at end of file From dc66cddee541d86c34a4497eee0b8790d3663d1e Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Fri, 6 Sep 2024 09:12:16 +0200 Subject: [PATCH 21/22] docs(web): fix link to documentation page The help page for `BuildVisualKeyboard` is under `core`, not `osk`. --- web/src/app/browser/src/keymanEngine.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/app/browser/src/keymanEngine.ts b/web/src/app/browser/src/keymanEngine.ts index 324394bae2..d9d386760b 100644 --- a/web/src/app/browser/src/keymanEngine.ts +++ b/web/src/app/browser/src/keymanEngine.ts @@ -660,7 +660,7 @@ export default class KeymanEngine extends KeymanEngineBase Date: Fri, 6 Sep 2024 14:02:45 -0400 Subject: [PATCH 22/22] auto: increment master version to 18.0.107 --- HISTORY.md | 6 ++++++ VERSION.md | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index d01f122543..4f17258728 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,11 @@ # Keyman Version History +## 18.0.106 alpha 2024-09-06 + +* feat(windows): add right modifier included in hotkey optional functionality (#12259) +* fix(android): Skip language counts for lexical-model packages (#12361) +* docs(web): fix link to documentation page (#12369) + ## 18.0.105 alpha 2024-09-05 * chore(common): Fix missing entries in HISTORY.md (#12352) diff --git a/VERSION.md b/VERSION.md index 365ae78f19..f5c440f440 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -18.0.106 \ No newline at end of file +18.0.107 \ No newline at end of file