From 4ef18f5e29ad21fef15e975992089cb98092de62 Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Mon, 9 Oct 2023 14:21:01 +0700 Subject: [PATCH 1/3] chore(core): rename keyboardprocessor.h to keyman_core_api.h Fixes #9721. Also tweaks some documentation references to keyboardprocessor, but does not touch those relating to debian/control. --- core/doc/hotdoc.json | 2 +- core/doc/introspection.schema | 2 +- core/doc/markdown_files/index.md | 2 +- core/doc/meson.build | 2 +- .../{keyboardprocessor.h => keyman_core_api.h} | 10 +++++----- ...rdprocessor_bits.h => keyman_core_api_bits.h} | 0 ...ocessor_consts.h => keyman_core_api_consts.h} | 0 ...processor_debug.h => keyman_core_api_debug.h} | 4 ++-- ...version.h.in => keyman_core_api_version.h.in} | 0 ...processor_vkeys.h => keyman_core_api_vkeys.h} | 2 +- core/include/keyman/meson.build | 16 ++++++++-------- core/src/context.hpp | 2 +- core/src/debug.hpp | 4 ++-- core/src/debuglog.h | 2 +- core/src/keyboard.hpp | 2 +- core/src/km_kbp_context_api.cpp | 2 +- core/src/km_kbp_debug_api.cpp | 2 +- core/src/km_kbp_keyboard_api.cpp | 2 +- core/src/km_kbp_options_api.cpp | 2 +- core/src/km_kbp_processevent_api.cpp | 2 +- core/src/km_kbp_state_api.cpp | 4 ++-- core/src/kmx/kmx_base.h | 4 ++-- core/src/kmx/kmx_capslock.cpp | 2 +- core/src/kmx/kmx_environment.cpp | 2 +- core/src/kmx/kmx_options.h | 2 +- core/src/kmx/kmx_processevent.cpp | 2 +- core/src/kmx/kmx_processevent.h | 2 +- core/src/kmx/kmx_processor.cpp | 2 +- core/src/kmx/kmx_processor.hpp | 2 +- core/src/ldml/ldml_processor.hpp | 2 +- core/src/ldml/ldml_vkeys.hpp | 2 +- core/src/mock/mock_processor.hpp | 2 +- core/src/option.hpp | 2 +- core/src/path.hpp | 2 +- core/src/processor.hpp | 4 ++-- core/src/state.cpp | 2 +- core/src/state.hpp | 2 +- core/src/version.rc | 2 +- core/tests/unit/kmnkbd/action_items.hpp | 2 +- core/tests/unit/kmnkbd/context_api.cpp | 2 +- core/tests/unit/kmnkbd/debug_api.cpp | 6 +++--- core/tests/unit/kmnkbd/debug_items.hpp | 4 ++-- core/tests/unit/kmnkbd/keyboard_api.cpp | 2 +- core/tests/unit/kmnkbd/options_api.cpp | 2 +- core/tests/unit/kmnkbd/state_api.cpp | 6 +++--- core/tests/unit/ldml/ldml_test_utils.hpp | 2 +- .../src/tike/main/Keyman.System.KeymanCore.pas | 6 +++--- .../tike/main/Keyman.System.KeymanCoreDebug.pas | 6 +++--- docs/settings/linux/settings.json | 2 +- linux/debian/tests/test-build | 4 ++-- linux/ibus-keyman/src/engine.c | 4 ++-- linux/ibus-keyman/src/keycodes.h | 2 +- linux/ibus-keyman/src/keymanutil.c | 2 +- linux/ibus-keyman/src/keymanutil.h | 2 +- linux/ibus-keyman/tests/testfixture.cpp | 2 +- windows/src/engine/keyman32/keymanengine.h | 8 ++++---- 56 files changed, 83 insertions(+), 83 deletions(-) rename core/include/keyman/{keyboardprocessor.h => keyman_core_api.h} (99%) rename core/include/keyman/{keyboardprocessor_bits.h => keyman_core_api_bits.h} (100%) rename core/include/keyman/{keyboardprocessor_consts.h => keyman_core_api_consts.h} (100%) rename core/include/keyman/{keyboardprocessor_debug.h => keyman_core_api_debug.h} (98%) rename core/include/keyman/{keyboardprocessor_version.h.in => keyman_core_api_version.h.in} (100%) rename core/include/keyman/{keyboardprocessor_vkeys.h => keyman_core_api_vkeys.h} (99%) diff --git a/core/doc/hotdoc.json b/core/doc/hotdoc.json index 4ece50d0f52..946c62beac0 100644 --- a/core/doc/hotdoc.json +++ b/core/doc/hotdoc.json @@ -4,7 +4,7 @@ "sitemap": "@doc_dir@/sitemap.txt", "index": "@doc_dir@/markdown_files/index.md", "c_sources": [ - "@include_dir@/keyman/keyboardprocessor.h" + "@include_dir@/keyman/keyman_core_api.h" ], "c_include_directories": [ "@include_dir@", diff --git a/core/doc/introspection.schema b/core/doc/introspection.schema index ff10c7c9695..3b7684e0e9d 100644 --- a/core/doc/introspection.schema +++ b/core/doc/introspection.schema @@ -47,7 +47,7 @@ } }, "properties": { - "$schema": { "const": "keyman/keyboardprocessor/doc/introspection.schema" }, + "$schema": { "const": "keyman/core/doc/introspection.schema" }, "keyboard": { "$ref": "#/definitions/keyboard" }, "options": { "type": "object", diff --git a/core/doc/markdown_files/index.md b/core/doc/markdown_files/index.md index 98870c356dc..bc196a0a0cb 100644 --- a/core/doc/markdown_files/index.md +++ b/core/doc/markdown_files/index.md @@ -46,7 +46,7 @@ A virtual key board event and modifier map recevied from the Platform layer to b processed with the state object for this Client application. - __Virtual Key:__ A code based on the US English layout, with values matching the Windows -virtual key codes. See `keyboardprocessor_vkeys.h` for definitions. +virtual key codes. See `keyman_core_api_vkeys.h` for definitions. - __Modifier Key:__ The set of Control, Shift, Alt, Caps Lock keys. On some platforms these may have other names (e.g. Alt is called Option on macOS); other platform-specific diff --git a/core/doc/meson.build b/core/doc/meson.build index 01fcb5c98ad..6039e2e2dda 100644 --- a/core/doc/meson.build +++ b/core/doc/meson.build @@ -18,7 +18,7 @@ if hotdoc.found() output: 'hotdoc.json', configuration: cfg) deps = files( - '../include/keyman/keyboardprocessor.h', + '../include/keyman/keyman_core_api.h', '../src/jsonpp.hpp', '../src/utfcodec.hpp' ) diff --git a/core/include/keyman/keyboardprocessor.h b/core/include/keyman/keyman_core_api.h similarity index 99% rename from core/include/keyman/keyboardprocessor.h rename to core/include/keyman/keyman_core_api.h index 429a8ae6cbf..b32be630731 100644 --- a/core/include/keyman/keyboardprocessor.h +++ b/core/include/keyman/keyman_core_api.h @@ -57,7 +57,7 @@ A virtual key event and modifier map received from the Platform layer to be processed with the state object for this Client application. - __Virtual Key:__ A code based on the US English layout, with values matching the Windows -virtual key codes. See `keyboardprocessor_vkeys.h` for definitions. +virtual key codes. See `keyman_core_api_vkeys.h` for definitions. - __Modifier Key:__ The set of Control, Shift, Alt, Caps Lock keys. On some platforms these may have other names (e.g. Alt is called Option on macOS); other platform-specific @@ -100,9 +100,9 @@ nothing in that event. */ #include #include -#include -#include -#include +#include +#include +#include #if defined(__cplusplus) extern "C" @@ -989,7 +989,7 @@ used in IMX callbacks called during `km_kbp_process_event`. In the event the `state` or `action_items` pointer are null. ##### Parameters: - __state__: A pointer to the opaque `km_kbp_state` object to be queried. -- __action_items__: The action items to be added to the keyboardprocessor +- __action_items__: The action items to be added to the core queue. Must be terminated with a `KM_KBP_IT_END` entry. ```c diff --git a/core/include/keyman/keyboardprocessor_bits.h b/core/include/keyman/keyman_core_api_bits.h similarity index 100% rename from core/include/keyman/keyboardprocessor_bits.h rename to core/include/keyman/keyman_core_api_bits.h diff --git a/core/include/keyman/keyboardprocessor_consts.h b/core/include/keyman/keyman_core_api_consts.h similarity index 100% rename from core/include/keyman/keyboardprocessor_consts.h rename to core/include/keyman/keyman_core_api_consts.h diff --git a/core/include/keyman/keyboardprocessor_debug.h b/core/include/keyman/keyman_core_api_debug.h similarity index 98% rename from core/include/keyman/keyboardprocessor_debug.h rename to core/include/keyman/keyman_core_api_debug.h index 380b8ee3012..f038e2cd819 100644 --- a/core/include/keyman/keyboardprocessor_debug.h +++ b/core/include/keyman/keyman_core_api_debug.h @@ -15,8 +15,8 @@ #include #include -#include -#include +#include +#include #if defined(__cplusplus) extern "C" diff --git a/core/include/keyman/keyboardprocessor_version.h.in b/core/include/keyman/keyman_core_api_version.h.in similarity index 100% rename from core/include/keyman/keyboardprocessor_version.h.in rename to core/include/keyman/keyman_core_api_version.h.in diff --git a/core/include/keyman/keyboardprocessor_vkeys.h b/core/include/keyman/keyman_core_api_vkeys.h similarity index 99% rename from core/include/keyman/keyboardprocessor_vkeys.h rename to core/include/keyman/keyman_core_api_vkeys.h index e8d8122bda2..a1e580df28b 100644 --- a/core/include/keyman/keyboardprocessor_vkeys.h +++ b/core/include/keyman/keyman_core_api_vkeys.h @@ -7,7 +7,7 @@ Create Date: 17 Oct 2018 Authors: Tim Eves (TSE) History: 17 Oct 2018 - TSE - Moved & refactored km_kbp_modifier_state - from keyboardprocessor.h. + from keyman_core_api.h. - Added VKey and mask definitions. 6 Oct 2018 - TSE - Move into keyman folder. diff --git a/core/include/keyman/meson.build b/core/include/keyman/meson.build index 7da255502de..6be28e49799 100644 --- a/core/include/keyman/meson.build +++ b/core/include/keyman/meson.build @@ -19,16 +19,16 @@ cfg.set('patchver', project_ver[2]) configure_file( configuration: cfg, - input: 'keyboardprocessor_version.h.in', - output: 'keyboardprocessor_version.h', + input: 'keyman_core_api_version.h.in', + output: 'keyman_core_api_version.h', ) -install_headers('keyboardprocessor.h', - 'keyboardprocessor_bits.h', - 'keyboardprocessor_consts.h', - 'keyboardprocessor_debug.h', - 'keyboardprocessor_vkeys.h', - join_paths(meson.current_build_dir(), 'keyboardprocessor_version.h'), +install_headers('keyman_core_api.h', + 'keyman_core_api_bits.h', + 'keyman_core_api_consts.h.h', + 'keyman_core_api_debug.h.h', + 'keyman_core_api_vkeys.h', + join_paths(meson.current_build_dir(), 'keyman_core_api_version.h'), '../../../common/include/km_types.h', '../../../common/include/kmx_file.h', subdir: 'keyman') diff --git a/core/src/context.hpp b/core/src/context.hpp index b344e0657cd..03d4aeb2d79 100644 --- a/core/src/context.hpp +++ b/core/src/context.hpp @@ -9,7 +9,7 @@ #pragma once #include #include -#include +#include // Forward declarations class json; diff --git a/core/src/debug.hpp b/core/src/debug.hpp index 8069cfbc532..a910c03a288 100644 --- a/core/src/debug.hpp +++ b/core/src/debug.hpp @@ -9,8 +9,8 @@ #include #include -#include -#include +#include +#include namespace km { namespace kbp diff --git a/core/src/debuglog.h b/core/src/debuglog.h index 16fba464285..1ecbaca6124 100644 --- a/core/src/debuglog.h +++ b/core/src/debuglog.h @@ -1,6 +1,6 @@ /* Debugging */ -#include +#include namespace km { namespace kbp { diff --git a/core/src/keyboard.hpp b/core/src/keyboard.hpp index 57f8128c781..6c8b93263c4 100644 --- a/core/src/keyboard.hpp +++ b/core/src/keyboard.hpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include "option.hpp" #include "path.hpp" diff --git a/core/src/km_kbp_context_api.cpp b/core/src/km_kbp_context_api.cpp index a9111f66c45..a0845618b4f 100644 --- a/core/src/km_kbp_context_api.cpp +++ b/core/src/km_kbp_context_api.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include "context.hpp" #include "jsonpp.hpp" diff --git a/core/src/km_kbp_debug_api.cpp b/core/src/km_kbp_debug_api.cpp index 0871df17ae5..ff7ad03044b 100644 --- a/core/src/km_kbp_debug_api.cpp +++ b/core/src/km_kbp_debug_api.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include "processor.hpp" #include "state.hpp" diff --git a/core/src/km_kbp_keyboard_api.cpp b/core/src/km_kbp_keyboard_api.cpp index 13f3cafc45c..b12ae3a9cb8 100644 --- a/core/src/km_kbp_keyboard_api.cpp +++ b/core/src/km_kbp_keyboard_api.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include "keyboard.hpp" #include "processor.hpp" #include "kmx/kmx_processor.hpp" diff --git a/core/src/km_kbp_options_api.cpp b/core/src/km_kbp_options_api.cpp index 7dc48790987..0f522d6ffeb 100644 --- a/core/src/km_kbp_options_api.cpp +++ b/core/src/km_kbp_options_api.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include "processor.hpp" #include "jsonpp.hpp" diff --git a/core/src/km_kbp_processevent_api.cpp b/core/src/km_kbp_processevent_api.cpp index 69eba06a41c..8e818ea42d2 100644 --- a/core/src/km_kbp_processevent_api.cpp +++ b/core/src/km_kbp_processevent_api.cpp @@ -8,7 +8,7 @@ History: 17 Oct 2018 - TSE - Initial implementation. */ -#include +#include #include "processor.hpp" #include "state.hpp" diff --git a/core/src/km_kbp_state_api.cpp b/core/src/km_kbp_state_api.cpp index b966688950f..168288423df 100644 --- a/core/src/km_kbp_state_api.cpp +++ b/core/src/km_kbp_state_api.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include "jsonpp.hpp" #include "processor.hpp" @@ -212,7 +212,7 @@ km_kbp_status km_kbp_state_to_json(km_kbp_state const *state, { // Pretty print the document. jo << json::object - << "$schema" << "keyman/keyboardprocessor/doc/introspection.schema" + << "$schema" << "keyman/core/doc/introspection.schema" << "keyboard" << state->processor().keyboard() // << "options" << state->options() TODO: Fix << "context" << state->context() diff --git a/core/src/kmx/kmx_base.h b/core/src/kmx/kmx_base.h index 7fc335cfc46..77cf53c209b 100644 --- a/core/src/kmx/kmx_base.h +++ b/core/src/kmx/kmx_base.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #if defined(_WIN32) || defined(_WIN64) #define snprintf _snprintf diff --git a/core/src/kmx/kmx_capslock.cpp b/core/src/kmx/kmx_capslock.cpp index e125ccd4cf1..ca324778830 100644 --- a/core/src/kmx/kmx_capslock.cpp +++ b/core/src/kmx/kmx_capslock.cpp @@ -2,7 +2,7 @@ Copyright: Copyright (C) 2003-2018 SIL International. Authors: mcdurdin */ -#include +#include #include using namespace km::kbp; diff --git a/core/src/kmx/kmx_environment.cpp b/core/src/kmx/kmx_environment.cpp index 4d3d3c54903..b77971a4036 100644 --- a/core/src/kmx/kmx_environment.cpp +++ b/core/src/kmx/kmx_environment.cpp @@ -3,7 +3,7 @@ Authors: mcdurdin */ #include -#include +#include #include #include diff --git a/core/src/kmx/kmx_options.h b/core/src/kmx/kmx_options.h index 76af7dc4057..500dc7474ea 100644 --- a/core/src/kmx/kmx_options.h +++ b/core/src/kmx/kmx_options.h @@ -4,7 +4,7 @@ #include #include -#include +#include #include "option.hpp" #include "kmx_base.h" diff --git a/core/src/kmx/kmx_processevent.cpp b/core/src/kmx/kmx_processevent.cpp index c6fec0e468f..94015ef2c8b 100644 --- a/core/src/kmx/kmx_processevent.cpp +++ b/core/src/kmx/kmx_processevent.cpp @@ -4,7 +4,7 @@ */ #include "kmx_processevent.h" #include "state.hpp" -#include +#include using namespace km::kbp; using namespace kmx; diff --git a/core/src/kmx/kmx_processevent.h b/core/src/kmx/kmx_processevent.h index 5dfdfc71903..13b6f0d6bb3 100644 --- a/core/src/kmx/kmx_processevent.h +++ b/core/src/kmx/kmx_processevent.h @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include "debuglog.h" #include "kmx_base.h" #include "kmx_file.h" diff --git a/core/src/kmx/kmx_processor.cpp b/core/src/kmx/kmx_processor.cpp index 30b3ce7691f..3bf136f1a20 100644 --- a/core/src/kmx/kmx_processor.cpp +++ b/core/src/kmx/kmx_processor.cpp @@ -1,4 +1,4 @@ -#include +#include #include "state.hpp" #include "kmx/kmx_processor.hpp" #include diff --git a/core/src/kmx/kmx_processor.hpp b/core/src/kmx/kmx_processor.hpp index c58743aff88..e279eb8f62b 100644 --- a/core/src/kmx/kmx_processor.hpp +++ b/core/src/kmx/kmx_processor.hpp @@ -9,7 +9,7 @@ #pragma once #include -#include +#include #include "kmx/kmx_processevent.h" #include "keyboard.hpp" #include "processor.hpp" diff --git a/core/src/ldml/ldml_processor.hpp b/core/src/ldml/ldml_processor.hpp index 09c743d4d16..d2016e5c9f8 100644 --- a/core/src/ldml/ldml_processor.hpp +++ b/core/src/ldml/ldml_processor.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include "processor.hpp" #include "option.hpp" #include "ldml_vkeys.hpp" diff --git a/core/src/ldml/ldml_vkeys.hpp b/core/src/ldml/ldml_vkeys.hpp index bfab902b0fa..0b632f670c2 100644 --- a/core/src/ldml/ldml_vkeys.hpp +++ b/core/src/ldml/ldml_vkeys.hpp @@ -13,7 +13,7 @@ #include #include -#include +#include namespace km { namespace kbp { diff --git a/core/src/mock/mock_processor.hpp b/core/src/mock/mock_processor.hpp index e5a72cba4a9..5e8857fb46b 100644 --- a/core/src/mock/mock_processor.hpp +++ b/core/src/mock/mock_processor.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include "processor.hpp" #include "option.hpp" diff --git a/core/src/option.hpp b/core/src/option.hpp index 70627bfb8f2..979cc80b961 100644 --- a/core/src/option.hpp +++ b/core/src/option.hpp @@ -12,7 +12,7 @@ #include -#include +#include // Forward declarations class json; diff --git a/core/src/path.hpp b/core/src/path.hpp index 9bb8145d741..ec08c064f45 100644 --- a/core/src/path.hpp +++ b/core/src/path.hpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include "jsonpp.hpp" #include "utfcodec.hpp" diff --git a/core/src/processor.hpp b/core/src/processor.hpp index 39edb120d2d..7fc6a543181 100644 --- a/core/src/processor.hpp +++ b/core/src/processor.hpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include "keyboard.hpp" @@ -96,7 +96,7 @@ namespace kbp ) = 0; /** - * Returns the keyboardprocessor context as an array of + * Returns the core context as an array of * km_kbp_context_items. Caller is responsible for freeing * the memory * @return km_kbp_context_item* diff --git a/core/src/state.cpp b/core/src/state.cpp index d0e07573dd5..e873af8287e 100644 --- a/core/src/state.cpp +++ b/core/src/state.cpp @@ -7,7 +7,7 @@ #include "state.hpp" #include "processor.hpp" -#include +#include using namespace km::kbp; diff --git a/core/src/state.hpp b/core/src/state.hpp index c11f503cbe6..0b5b2ad6ca2 100644 --- a/core/src/state.hpp +++ b/core/src/state.hpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include "context.hpp" #include "option.hpp" diff --git a/core/src/version.rc b/core/src/version.rc index cd852f01546..fddda79e286 100644 --- a/core/src/version.rc +++ b/core/src/version.rc @@ -1,5 +1,5 @@ #include -#include "include/keyman/keyboardprocessor_version.h" +#include "include/keyman/keyman_core_api_version.h" // Encoding: UTF8 (compile with rc /c65001) // Use rc /n to append null to all strings diff --git a/core/tests/unit/kmnkbd/action_items.hpp b/core/tests/unit/kmnkbd/action_items.hpp index d7eabf20d31..da485589ef1 100644 --- a/core/tests/unit/kmnkbd/action_items.hpp +++ b/core/tests/unit/kmnkbd/action_items.hpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/core/tests/unit/kmnkbd/context_api.cpp b/core/tests/unit/kmnkbd/context_api.cpp index 728a21924c5..c8a6fc51eda 100644 --- a/core/tests/unit/kmnkbd/context_api.cpp +++ b/core/tests/unit/kmnkbd/context_api.cpp @@ -10,7 +10,7 @@ mutation functions. */ #include -#include +#include #include "context.hpp" #include "utfcodec.hpp" diff --git a/core/tests/unit/kmnkbd/debug_api.cpp b/core/tests/unit/kmnkbd/debug_api.cpp index b4cfae6ab39..57f63666971 100644 --- a/core/tests/unit/kmnkbd/debug_api.cpp +++ b/core/tests/unit/kmnkbd/debug_api.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include "path.hpp" #include "state.hpp" #include "kmx/kmx_base.h" @@ -462,14 +462,14 @@ int error_args() { int print_sizeof() { std::cout << std::endl; - std::cout << "keyboardprocessor.h:" << std::endl; + std::cout << "keyman_core_api.h:" << std::endl; std::cout << "sizeof(km_kbp_context_item): " << sizeof(km_kbp_context_item) << std::endl; std::cout << "sizeof(km_kbp_action_item): " << sizeof(km_kbp_action_item) << std::endl; std::cout << "sizeof(km_kbp_option_item): " << sizeof(km_kbp_option_item) << std::endl; std::cout << "sizeof(km_kbp_keyboard_attrs): " << sizeof(km_kbp_keyboard_attrs) << std::endl; std::cout << "sizeof(km_kbp_attr): " << sizeof(km_kbp_attr) << std::endl; std::cout << std::endl; - std::cout << "keyboardprocessor_debug.h:" << std::endl; + std::cout << "keyman_core_api_debug.h.h:" << std::endl; std::cout << "sizeof(km_kbp_state_debug_item): " << sizeof(km_kbp_state_debug_item) << std::endl; std::cout << "sizeof(km_kbp_state_debug_key_info): " << sizeof(km_kbp_state_debug_key_info) << std::endl; std::cout << "sizeof(km_kbp_state_debug_kmx_info): " << sizeof(km_kbp_state_debug_kmx_info) << std::endl; diff --git a/core/tests/unit/kmnkbd/debug_items.hpp b/core/tests/unit/kmnkbd/debug_items.hpp index 95703005c45..3ac2ff1f68d 100644 --- a/core/tests/unit/kmnkbd/debug_items.hpp +++ b/core/tests/unit/kmnkbd/debug_items.hpp @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include #include "kmx/kmx_base.h" #include "kmx/kmx_xstring.h" diff --git a/core/tests/unit/kmnkbd/keyboard_api.cpp b/core/tests/unit/kmnkbd/keyboard_api.cpp index cefba0d47c5..48e36197ce1 100644 --- a/core/tests/unit/kmnkbd/keyboard_api.cpp +++ b/core/tests/unit/kmnkbd/keyboard_api.cpp @@ -6,7 +6,7 @@ */ #include -#include +#include #include "path.hpp" //#include "keyboard.hpp" diff --git a/core/tests/unit/kmnkbd/options_api.cpp b/core/tests/unit/kmnkbd/options_api.cpp index 5fa64cffc68..9612195847e 100644 --- a/core/tests/unit/kmnkbd/options_api.cpp +++ b/core/tests/unit/kmnkbd/options_api.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include "option.hpp" #include "state.hpp" diff --git a/core/tests/unit/kmnkbd/state_api.cpp b/core/tests/unit/kmnkbd/state_api.cpp index 3ae446541c0..866ebe49a42 100644 --- a/core/tests/unit/kmnkbd/state_api.cpp +++ b/core/tests/unit/kmnkbd/state_api.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include "path.hpp" #include "state.hpp" @@ -49,7 +49,7 @@ namespace constexpr char const *doc1_expected = u8"\ {\n\ - \"$schema\" : \"keyman/keyboardprocessor/doc/introspection.schema\",\n\ + \"$schema\" : \"keyman/core/doc/introspection.schema\",\n\ \"keyboard\" : {\n\ \"id\" : \"dummy\",\n\ \"folder\" : \"\",\n\ @@ -75,7 +75,7 @@ constexpr char const *doc1_expected = u8"\ constexpr char const *doc2_expected = u8"\ {\n\ - \"$schema\" : \"keyman/keyboardprocessor/doc/introspection.schema\",\n\ + \"$schema\" : \"keyman/core/doc/introspection.schema\",\n\ \"keyboard\" : {\n\ \"id\" : \"dummy\",\n\ \"folder\" : \"\",\n\ diff --git a/core/tests/unit/ldml/ldml_test_utils.hpp b/core/tests/unit/ldml/ldml_test_utils.hpp index 8b19edf8d33..146afef3899 100644 --- a/core/tests/unit/ldml/ldml_test_utils.hpp +++ b/core/tests/unit/ldml/ldml_test_utils.hpp @@ -13,7 +13,7 @@ #include // for char to vk mapping tables #include // for surrogate pair macros #include -#include +#include namespace km { namespace tests { diff --git a/developer/src/tike/main/Keyman.System.KeymanCore.pas b/developer/src/tike/main/Keyman.System.KeymanCore.pas index 29a2341b182..159b3e66934 100644 --- a/developer/src/tike/main/Keyman.System.KeymanCore.pas +++ b/developer/src/tike/main/Keyman.System.KeymanCore.pas @@ -1,7 +1,7 @@ { * Keyman is copyright (C) SIL International. MIT License. * - * Interface for Keyman Core, matches keyboardprocessor.h + * Interface for Keyman Core, matches keyman_core_api.h } unit Keyman.System.KeymanCore; @@ -321,7 +321,7 @@ function KM_KBP_EVENT_FLAG_TOUCH = 1; // set if the event is touch, otherwise hardware -// keyboardprocessor_vkeys.h +// keyman_core_api_vkeys.h const // enum km_kbp_modifier_state - matches Keyman32 shift states @@ -620,7 +620,7 @@ function KM_KBP_VKEY__FE = $FE; KM_KBP_VKEY__FF = $FF; -// keyboardprocessor_consts.h +// keyman_core_api_consts.h.h const // Defined environment options for KMX processor KM_KBP_KMX_ENV_PLATFORM = 'platform'; diff --git a/developer/src/tike/main/Keyman.System.KeymanCoreDebug.pas b/developer/src/tike/main/Keyman.System.KeymanCoreDebug.pas index a1f63e3b38e..bca7395088f 100644 --- a/developer/src/tike/main/Keyman.System.KeymanCoreDebug.pas +++ b/developer/src/tike/main/Keyman.System.KeymanCoreDebug.pas @@ -1,7 +1,7 @@ { * Keyman is copyright (C) SIL International. MIT License. * - * Debug interface for Keyman Core, matches keyboardprocessor_debug.h + * Debug interface for Keyman Core, matches keyman_core_api_debug.h.h } unit Keyman.System.KeymanCoreDebug; @@ -181,7 +181,7 @@ initialization // Assertions generated by debug_api.cpp for win32 x86. // Usage: debug-api.exe --print-sizeof - //keyboardprocessor.h: + //keyman_core_api.h: Assert(sizeof(km_kbp_context_item) = 8); Assert(sizeof(km_kbp_context_item) = 8); Assert(sizeof(km_kbp_action_item) = 12); @@ -189,7 +189,7 @@ initialization Assert(sizeof(km_kbp_keyboard_attrs) = 16); Assert(sizeof(km_kbp_attr) = 16); - //keyboardprocessor_debug.h: + //keyman_core_api_debug.h.h: Assert(sizeof(km_kbp_state_debug_item) = 432); Assert(sizeof(km_kbp_state_debug_key_info) = 6); Assert(sizeof(km_kbp_state_debug_kmx_info) = 416); diff --git a/docs/settings/linux/settings.json b/docs/settings/linux/settings.json index 891507dd2ec..f17739ece29 100644 --- a/docs/settings/linux/settings.json +++ b/docs/settings/linux/settings.json @@ -16,7 +16,7 @@ "python.pythonPath": "/usr/bin/python3", "files.associations": { "*.tcc": "cpp", - "keyboardprocessor.h": "c", + "keyman_core_api.h": "c", "engine.h": "c", "keyman-service.h": "c", "keymanutil.h": "c", diff --git a/linux/debian/tests/test-build b/linux/debian/tests/test-build index db0a343849c..9fd3b6f077c 100644 --- a/linux/debian/tests/test-build +++ b/linux/debian/tests/test-build @@ -11,7 +11,7 @@ cd "$WORKDIR" # Test all include files are available cat < keymantest.c -#include +#include km_kbp_context* c; EOF @@ -21,7 +21,7 @@ echo "build 1: OK" # Test pkg-config file - include without path cat < keymantest.c -#include +#include km_kbp_context* c; EOF diff --git a/linux/ibus-keyman/src/engine.c b/linux/ibus-keyman/src/engine.c index 49b9161f9a3..2fb17c4ff73 100644 --- a/linux/ibus-keyman/src/engine.c +++ b/linux/ibus-keyman/src/engine.c @@ -28,8 +28,8 @@ #include #include -#include -#include +#include +#include #include "config.h" #include "keymanutil.h" diff --git a/linux/ibus-keyman/src/keycodes.h b/linux/ibus-keyman/src/keycodes.h index 2735da48cb2..b563f11ad2c 100644 --- a/linux/ibus-keyman/src/keycodes.h +++ b/linux/ibus-keyman/src/keycodes.h @@ -1,7 +1,7 @@ #ifndef __KEYCODES_H__ #define __KEYCODES_H__ -#include +#include // from android/KMEA/app/src/main/java/com/tavultesoft/kmea/KMScanCodeMap.java // uses kernel keycodes which are (X11 keycode - 8) diff --git a/linux/ibus-keyman/src/keymanutil.c b/linux/ibus-keyman/src/keymanutil.c index 7ae92e2a2d9..bcb92ee4d9e 100644 --- a/linux/ibus-keyman/src/keymanutil.c +++ b/linux/ibus-keyman/src/keymanutil.c @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include "bcp47util.h" #include "kmpdetails.h" diff --git a/linux/ibus-keyman/src/keymanutil.h b/linux/ibus-keyman/src/keymanutil.h index 4b358c02ead..e76fc6253c5 100644 --- a/linux/ibus-keyman/src/keymanutil.h +++ b/linux/ibus-keyman/src/keymanutil.h @@ -55,7 +55,7 @@ #include #include -#include +#include // Number of default Keyboard processor environment options for: "platform", "baseLayout", and "baseLayoutAlt" #define KEYMAN_ENVIRONMENT_OPTIONS 3 diff --git a/linux/ibus-keyman/tests/testfixture.cpp b/linux/ibus-keyman/tests/testfixture.cpp index 84aab933c83..6092407b1b7 100644 --- a/linux/ibus-keyman/tests/testfixture.cpp +++ b/linux/ibus-keyman/tests/testfixture.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/windows/src/engine/keyman32/keymanengine.h b/windows/src/engine/keyman32/keymanengine.h index f40aeaf3728..1bb8762ed7f 100644 --- a/windows/src/engine/keyman32/keymanengine.h +++ b/windows/src/engine/keyman32/keymanengine.h @@ -18,11 +18,11 @@ #define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT 1 #endif -// For keyboardprocessor_bits.h +// For keyman_core_api_bits.h #ifndef KMN_KBP_STATIC #define KMN_KBP_STATIC #endif -// For keyboardprocessor_bits.h +// For keyman_core_api_bits.h #ifndef _WIN32 #define _WIN32 1 #endif @@ -39,8 +39,8 @@ #include #include #include "../../../../common/windows/cpp/include/legacy_kmx_file.h" -#include -#include +#include +#include /***************************************************************************/ From 906a0a2ed7a8bead56fa0e682a6b0b32fdcd5a53 Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Mon, 9 Oct 2023 14:41:01 +0700 Subject: [PATCH 2/3] chore: fix typo --- core/include/keyman/meson.build | 2 +- core/src/kmx/kmx_capslock.cpp | 2 +- core/src/kmx/kmx_environment.cpp | 2 +- core/src/kmx/kmx_processevent.cpp | 2 +- core/src/state.cpp | 2 +- developer/src/tike/main/Keyman.System.KeymanCore.pas | 2 +- linux/ibus-keyman/src/engine.c | 2 +- windows/src/engine/keyman32/keymanengine.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/include/keyman/meson.build b/core/include/keyman/meson.build index 6be28e49799..b807ac69a25 100644 --- a/core/include/keyman/meson.build +++ b/core/include/keyman/meson.build @@ -25,7 +25,7 @@ configure_file( install_headers('keyman_core_api.h', 'keyman_core_api_bits.h', - 'keyman_core_api_consts.h.h', + 'keyman_core_api_consts.h', 'keyman_core_api_debug.h.h', 'keyman_core_api_vkeys.h', join_paths(meson.current_build_dir(), 'keyman_core_api_version.h'), diff --git a/core/src/kmx/kmx_capslock.cpp b/core/src/kmx/kmx_capslock.cpp index ca324778830..f14745bf326 100644 --- a/core/src/kmx/kmx_capslock.cpp +++ b/core/src/kmx/kmx_capslock.cpp @@ -2,7 +2,7 @@ Copyright: Copyright (C) 2003-2018 SIL International. Authors: mcdurdin */ -#include +#include #include using namespace km::kbp; diff --git a/core/src/kmx/kmx_environment.cpp b/core/src/kmx/kmx_environment.cpp index b77971a4036..eb5691c29d4 100644 --- a/core/src/kmx/kmx_environment.cpp +++ b/core/src/kmx/kmx_environment.cpp @@ -3,7 +3,7 @@ Authors: mcdurdin */ #include -#include +#include #include #include diff --git a/core/src/kmx/kmx_processevent.cpp b/core/src/kmx/kmx_processevent.cpp index 94015ef2c8b..2a4439f23f7 100644 --- a/core/src/kmx/kmx_processevent.cpp +++ b/core/src/kmx/kmx_processevent.cpp @@ -4,7 +4,7 @@ */ #include "kmx_processevent.h" #include "state.hpp" -#include +#include using namespace km::kbp; using namespace kmx; diff --git a/core/src/state.cpp b/core/src/state.cpp index e873af8287e..b8b0a44f8e4 100644 --- a/core/src/state.cpp +++ b/core/src/state.cpp @@ -7,7 +7,7 @@ #include "state.hpp" #include "processor.hpp" -#include +#include using namespace km::kbp; diff --git a/developer/src/tike/main/Keyman.System.KeymanCore.pas b/developer/src/tike/main/Keyman.System.KeymanCore.pas index 159b3e66934..fb0410acc14 100644 --- a/developer/src/tike/main/Keyman.System.KeymanCore.pas +++ b/developer/src/tike/main/Keyman.System.KeymanCore.pas @@ -620,7 +620,7 @@ function KM_KBP_VKEY__FE = $FE; KM_KBP_VKEY__FF = $FF; -// keyman_core_api_consts.h.h +// keyman_core_api_consts.h const // Defined environment options for KMX processor KM_KBP_KMX_ENV_PLATFORM = 'platform'; diff --git a/linux/ibus-keyman/src/engine.c b/linux/ibus-keyman/src/engine.c index 2fb17c4ff73..889f78ee294 100644 --- a/linux/ibus-keyman/src/engine.c +++ b/linux/ibus-keyman/src/engine.c @@ -29,7 +29,7 @@ #include #include -#include +#include #include "config.h" #include "keymanutil.h" diff --git a/windows/src/engine/keyman32/keymanengine.h b/windows/src/engine/keyman32/keymanengine.h index 1bb8762ed7f..d6e0370a71c 100644 --- a/windows/src/engine/keyman32/keymanengine.h +++ b/windows/src/engine/keyman32/keymanengine.h @@ -40,7 +40,7 @@ #include #include "../../../../common/windows/cpp/include/legacy_kmx_file.h" #include -#include +#include /***************************************************************************/ From 4e5cbc3b9680be3c697881ec19351f613f5fd9b1 Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Mon, 9 Oct 2023 14:51:51 +0700 Subject: [PATCH 3/3] chore: fix typo --- core/include/keyman/meson.build | 2 +- core/src/debug.hpp | 2 +- core/tests/unit/kmnkbd/debug_api.cpp | 2 +- core/tests/unit/kmnkbd/debug_items.hpp | 2 +- developer/src/tike/main/Keyman.System.KeymanCoreDebug.pas | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/include/keyman/meson.build b/core/include/keyman/meson.build index b807ac69a25..8ef7d1a9f26 100644 --- a/core/include/keyman/meson.build +++ b/core/include/keyman/meson.build @@ -26,7 +26,7 @@ configure_file( install_headers('keyman_core_api.h', 'keyman_core_api_bits.h', 'keyman_core_api_consts.h', - 'keyman_core_api_debug.h.h', + 'keyman_core_api_debug.h', 'keyman_core_api_vkeys.h', join_paths(meson.current_build_dir(), 'keyman_core_api_version.h'), '../../../common/include/km_types.h', diff --git a/core/src/debug.hpp b/core/src/debug.hpp index a910c03a288..cee5e37c521 100644 --- a/core/src/debug.hpp +++ b/core/src/debug.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include namespace km { namespace kbp diff --git a/core/tests/unit/kmnkbd/debug_api.cpp b/core/tests/unit/kmnkbd/debug_api.cpp index 57f63666971..ae59fd35aca 100644 --- a/core/tests/unit/kmnkbd/debug_api.cpp +++ b/core/tests/unit/kmnkbd/debug_api.cpp @@ -469,7 +469,7 @@ int print_sizeof() { std::cout << "sizeof(km_kbp_keyboard_attrs): " << sizeof(km_kbp_keyboard_attrs) << std::endl; std::cout << "sizeof(km_kbp_attr): " << sizeof(km_kbp_attr) << std::endl; std::cout << std::endl; - std::cout << "keyman_core_api_debug.h.h:" << std::endl; + std::cout << "keyman_core_api_debug.h:" << std::endl; std::cout << "sizeof(km_kbp_state_debug_item): " << sizeof(km_kbp_state_debug_item) << std::endl; std::cout << "sizeof(km_kbp_state_debug_key_info): " << sizeof(km_kbp_state_debug_key_info) << std::endl; std::cout << "sizeof(km_kbp_state_debug_kmx_info): " << sizeof(km_kbp_state_debug_kmx_info) << std::endl; diff --git a/core/tests/unit/kmnkbd/debug_items.hpp b/core/tests/unit/kmnkbd/debug_items.hpp index 3ac2ff1f68d..880ceaaf736 100644 --- a/core/tests/unit/kmnkbd/debug_items.hpp +++ b/core/tests/unit/kmnkbd/debug_items.hpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include "kmx/kmx_base.h" #include "kmx/kmx_xstring.h" diff --git a/developer/src/tike/main/Keyman.System.KeymanCoreDebug.pas b/developer/src/tike/main/Keyman.System.KeymanCoreDebug.pas index bca7395088f..9b190c82824 100644 --- a/developer/src/tike/main/Keyman.System.KeymanCoreDebug.pas +++ b/developer/src/tike/main/Keyman.System.KeymanCoreDebug.pas @@ -1,7 +1,7 @@ { * Keyman is copyright (C) SIL International. MIT License. * - * Debug interface for Keyman Core, matches keyman_core_api_debug.h.h + * Debug interface for Keyman Core, matches keyman_core_api_debug.h } unit Keyman.System.KeymanCoreDebug; @@ -189,7 +189,7 @@ initialization Assert(sizeof(km_kbp_keyboard_attrs) = 16); Assert(sizeof(km_kbp_attr) = 16); - //keyman_core_api_debug.h.h: + //keyman_core_api_debug.h: Assert(sizeof(km_kbp_state_debug_item) = 432); Assert(sizeof(km_kbp_state_debug_key_info) = 6); Assert(sizeof(km_kbp_state_debug_kmx_info) = 416);