erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-10-08 06:57:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge pull request #7107 from keymanapp/fix/windows/cherry-pick/remove-save-context

Browse source 
fix(windows): remove saving and restoring context kbd options 🍒
This commit is contained in:
rc-swag 2022-08-24 21:42:53 +10:00 • committed by GitHub
commit 3c7baee98e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
windows/src/engine/keyman32/appint/aiTIP.cpp
View file

@ -258,15 +258,12 @@ extern "C" __declspec(dllexport) BOOL WINAPI TIPProcessKey(WPARAM wParam, LPARAM
_td->TIPGetContext = ctfunc;
AppContextWithStores *savedContext = NULL; // I4370 // I4978
AppContext *savedContextUsingCore = NULL; // used for common core
km_kbp_option_item *SavedKBDOptions = NULL; // used for common core
if (!Updateable) {
if (isUsingCoreProcessor) {
savedContextUsingCore = new AppContext();
_td->app->CopyContext(savedContextUsingCore);
SavedKBDOptions = SaveKeyboardOptionsCore(_td->lpActiveKeyboard);
} else { // I4370
savedContext = new AppContextWithStores(_td->lpActiveKeyboard->Keyboard->cxStoreArray); // I4978
// The core processor km_kbp_process_event is only called once per key stroke
// therefore there is no need to preserve context and keyboard actions
if (!isUsingCoreProcessor) {
savedContext = new AppContextWithStores(_td->lpActiveKeyboard->Keyboard->cxStoreArray); // I4370 // I4978
_td->app->SaveContext(savedContext);
}
}
@ -274,17 +271,8 @@ extern "C" __declspec(dllexport) BOOL WINAPI TIPProcessKey(WPARAM wParam, LPARAM
BOOL res = ProcessHook();
if (!Updateable) {
if (isUsingCoreProcessor) {
if (res) {
// Reset the context if match found
_td->app->RestoreContextOnly(savedContextUsingCore);
RestoreKeyboardOptionsCore(_td->lpActiveKeyboard->lpCoreKeyboardState, SavedKBDOptions);
DisposeKeyboardOptionsCore(&SavedKBDOptions);
delete savedContextUsingCore;
savedContextUsingCore = NULL;
}
} else { // I4370
if (res) { // I4585
if (!isUsingCoreProcessor) {
if (res) { // I4585 // I4370
// Reset the context if match found
_td->app->RestoreContext(savedContext);
delete savedContext;