erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-10-07 22:47:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'master' into fix/core/10582-km_core_state_get_actions-idempotency

Browse source
This commit is contained in:
Marc Durdin 2024-02-07 12:32:41 +11:00 • committed by GitHub
commit 07c7a0659f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 19 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
HISTORY.md
View file

@ -1,5 +1,10 @@
# Keyman Version History
## 17.0.261 alpha 2024-02-06
* fix(web): app/webview sourcemap inlining (#10631)
* fix(android/app): Cleanup AndroidManifest handling of *.kmp (#10624)
## 17.0.260 alpha 2024-02-03
* chore(oem/fv): Update versions in keyboards.csv (#10606)

2
VERSION.md
View file

@ -1 +1 @@
17.0.261
17.0.262

35
android/KMAPro/kMAPro/src/main/AndroidManifest.xml
View file

@ -103,6 +103,9 @@
<data
android:mimeType="application/octet-stream"
android:scheme="content" />
<data
android:mimeType="application/x-keyman-package"
android:scheme="content" />
</intent-filter>
<!--
@ -121,19 +124,7 @@
<data android:scheme="file" />
<data android:host="*" />
<!--
Work around Android's ugly primitive PatternMatcher
implementation that can't cope with finding a . early in
the path unless it's explicitly matched.
-->
<data android:pathPattern=".*\\.kmp" />
<data android:pathPattern=".*\\..*\\.kmp" />
<data android:pathPattern=".*\\..*\\..*\\.kmp" />
<data android:pathPattern=".*\\..*\\..*\\..*\\.kmp" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kmp" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.kmp" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.kmp" />
<data android:pathPattern="/.*\\.kmp" />
</intent-filter>
<!--
@ -154,19 +145,7 @@
<data android:scheme="file" />
<data android:host="*" />
<data android:mimeType="*/*" />
<!--
Work around Android's ugly primitive PatternMatcher
implementation that can't cope with finding a . early in
the path unless it's explicitly matched.
-->
<data android:pathPattern=".*\\.kmp" />
<data android:pathPattern=".*\\..*\\.kmp" />
<data android:pathPattern=".*\\..*\\..*\\.kmp" />
<data android:pathPattern=".*\\..*\\..*\\..*\\.kmp" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kmp" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.kmp" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.kmp" />
<data android:pathPattern="/.*\\.kmp" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
@ -177,11 +156,11 @@
<!-- http:// and https:// protocols -->
<data
android:host="*"
android:pathPattern=".*\\.kmp"
android:pathPattern="/.*\\.kmp"
android:scheme="http" />
<data
android:host="*"
android:pathPattern=".*\\.kmp"
android:pathPattern="/.*\\.kmp"
android:scheme="https" />
</intent-filter>

2
web/src/tools/building/sourcemap-root/index.ts
View file

@ -99,7 +99,7 @@ if(sourceRoot) {
srcMap.toFile(mapFile);
if(shouldInline) {
const mapToInline = SourcemapRemapper.fromFile(mapFile).sourceRoot;
const mapToInline = SourcemapRemapper.fromFile(mapFile).sourceMap;
const inlineableComment = convertSourceMap.fromObject(mapToInline).toComment();
fs.appendFileSync(scriptFile, `\n${inlineableComment}`);

12
windows/src/engine/keyman32/kmprocessactions.cpp
View file

@ -29,9 +29,8 @@ processBack(AITIP* app, const unsigned int code_points_to_delete, const km_core_
for (unsigned int i = 0; i < code_points_to_delete; i++) {
app->QueueAction(QIT_BACK, BK_DEFAULT);
}
return;
}
if (!app->IsLegacy()) {
else {
km_core_usv const* delete_context_ptr = delete_context;
while (*delete_context_ptr) {
delete_context_ptr++;
@ -45,7 +44,6 @@ processBack(AITIP* app, const unsigned int code_points_to_delete, const km_core_
app->QueueAction(QIT_BACK, BK_DEFAULT);
}
}
return;
}
}
@ -99,7 +97,7 @@ static void processCapsLock(const km_core_caps_state caps_lock_state, BOOL isUp,
}
}
BOOL ProcessActions(BOOL* emitKeyStroke)
BOOL ProcessActions(BOOL* emitKeystroke)
{
PKEYMAN64THREADDATA _td = ThreadGlobals();
if (!_td) return FALSE;
@ -117,7 +115,7 @@ BOOL ProcessActions(BOOL* emitKeyStroke)
processAlert(_td->app);
}
if (core_actions->emit_keystroke) {
*emitKeyStroke = TRUE;
*emitKeystroke = TRUE;
}
processCapsLock(core_actions->new_caps_lock_state, !_td->state.isDown, _td->TIPFUpdateable, FALSE);
@ -125,7 +123,7 @@ BOOL ProcessActions(BOOL* emitKeyStroke)
}
BOOL
ProcessActionsNonUpdatableParse(BOOL* emitKeyStroke) {
ProcessActionsNonUpdatableParse(BOOL* emitKeystroke) {
PKEYMAN64THREADDATA _td = ThreadGlobals();
if (!_td) {
return FALSE;
@ -140,7 +138,7 @@ ProcessActionsNonUpdatableParse(BOOL* emitKeyStroke) {
processCapsLock(core_actions->new_caps_lock_state, !_td->state.isDown, _td->TIPFUpdateable, FALSE);
if (core_actions->emit_keystroke) {
*emitKeyStroke = TRUE;
*emitKeystroke = TRUE;
SendDebugMessageFormat(0, sdmGlobal, 0, "ProcessActionsNonUpdatableParse EMIT_KEYSTROKE");
_td->CoreProcessEventRun = FALSE; // If we emit the key stroke on this parse we don't need the second parse
}