keymanapp · mcdurdin · Aug 23, 2022 · Jul 29, 2022 · Aug 3, 2022 · Aug 3, 2022
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,5 +1,35 @@
 # Keyman Version History
 
+## 16.0.49 alpha 2022-08-22
+
+* fix: remove saving and restoring context kbd options (#7077)
+* chore(deps): bump @actions/core from 1.8.2 to 1.9.1 (#7087)
+
+## 16.0.48 alpha 2022-08-16
+
+* fix(web): button, float init timer cleanup (#7036)
+
+## 16.0.47 alpha 2022-08-15
+
+* chore(core): refactor kmx_file.h to common (#7062)
+* fix(developer): stack overflow when compiling non-web keyboard (#7031)
+* fix(developer): prevent crash attempting to compile ansi keyboard (#7033)
+* chore(linux): Refactor `jenkins.sh` (#7060)
+* fix(developer): compiler emitting garbage for readonly groups (#7013)
+
+## 16.0.46 alpha 2022-08-12
+
+* docs(core): cleanup in keyboardprocessor.h (#7065)
+
+## 16.0.45 alpha 2022-08-09
+
+* feat(linux): Replace deprecated distutils (#7051)
+* chore(linux): Adjust Linux source package to restructured code (#7056)
+
+## 16.0.44 alpha 2022-08-08
+
+* chore(linux): Update debian changelog (#7041)
+
 ## 16.0.43 alpha 2022-08-05
 
 * chore(web): centralizes web-based modules' CI unit test configurations (#7024)

diff --git a/VERSION.md b/VERSION.md
@@ -1 +1 @@
-16.0.44
+16.0.50
diff --git a/common/include/km_types.h b/common/include/km_types.h
@@ -0,0 +1,65 @@
+#pragma once
+
+/*
+#if defined(_WIN32) || defined(_WIN64)
+#define snprintf _snprintf
+#define vsnprintf _vsnprintf
+#define strcasecmp _stricmp
+#define strncasecmp _strnicmp
+#endif
+*/
+
+#if defined(__LP64__) || defined(_LP64)
+/* 64-bit, g++ */
+#define KMX_64BIT
+#endif
+
+#if defined(_WIN64) && !defined(USE_64)
+/* 64-bit, Windows */
+#define KMX_64BIT
+#endif
+
+typedef uint32_t            KMX_DWORD;
+typedef int32_t             KMX_BOOL;
+typedef uint8_t             KMX_BYTE;
+typedef uint16_t            KMX_WORD;
+
+#if defined(__cplusplus)
+typedef char16_t   km_kbp_cp;
+typedef char32_t   km_kbp_usv;
+#else
+typedef uint16_t    km_kbp_cp;          // code point
+typedef uint32_t    km_kbp_usv;         // Unicode Scalar Value
+#endif
+
+typedef km_kbp_cp KMX_WCHAR;    // wc,   16-bit UNICODE character
+typedef KMX_WCHAR *PKMX_WCHAR;
+
+typedef char KMX_CHAR;
+typedef KMX_CHAR *PKMX_CHAR;
+
+typedef uint32_t             KMX_UINT;
+
+typedef KMX_BYTE *PKMX_BYTE;
+typedef KMX_WORD *PKMX_WORD;
+typedef KMX_DWORD *PKMX_DWORD;
+
+#ifndef FALSE
+#define FALSE               0
+#endif
+
+#ifndef TRUE
+#define TRUE                1
+#endif
+
+// Macros and types to support char16_t vs wchar_t depending on project
+
+#ifdef USE_CHAR16_T
+#define lpuch(x) u ## x
+typedef  km_kbp_cp KMX_UCHAR;
+#else
+#define lpuch(x) L ## x
+typedef  wchar_t KMX_UCHAR;
+#endif
+
+typedef KMX_UCHAR* KMX_PUCHAR;
diff --git a/core/src/kmx/kmx_file.h → common/include/kmx_file.h b/core/src/kmx/kmx_file.h → common/include/kmx_file.h
@@ -5,11 +5,14 @@
 
 #pragma once
 
-#include "kmx_base.h"
+#include <km_types.h>
 
+#ifdef KMN_KBP
+// TODO: move this to a common namespace keyman::common::kmx_file or similar in the future
 namespace km {
 namespace kbp {
 namespace kmx {
+#endif
 
 #define KMX_MAX_ALLOWED_FILE_SIZE (128 * 1024 * 1024)  /* 128MB */
 /* */
@@ -371,6 +374,8 @@ static_assert(sizeof(COMP_KEY) == KEYBOARDFILEKEY_SIZE, "COMP_KEY must be KEYBOA
 static_assert(sizeof(COMP_GROUP) == KEYBOARDFILEGROUP_SIZE, "COMP_GROUP must be KEYBOARDFILEGROUP_SIZE bytes");
 static_assert(sizeof(COMP_KEYBOARD) == KEYBOARDFILEHEADER_SIZE, "COMP_KEYBOARD must be KEYBOARDFILEHEADER_SIZE bytes");
 
+#ifdef KMN_KBP
 } // namespace kmx
 } // namespace kbp
 } // namespace km
+#endif
diff --git a/common/web/keyboard-processor/src/text/codes.ts b/common/web/keyboard-processor/src/text/codes.ts
@@ -1,7 +1,7 @@
 namespace com.keyman.text {
   export var Codes = {
     // Define Keyman Developer modifier bit-flags (exposed for use by other modules)
-    // Compare against /core/src/kmx/kmx_file.h.  CTRL+F "#define LCTRLFLAG" to find the secton.
+    // Compare against /common/include/kmx_file.h.  CTRL+F "#define LCTRLFLAG" to find the secton.
     modifierCodes: {
       "LCTRL":0x0001,           // LCTRLFLAG
       "RCTRL":0x0002,           // RCTRLFLAG

diff --git a/common/windows/cpp/include/legacy_kmx_file.h b/common/windows/cpp/include/legacy_kmx_file.h
@@ -4,7 +4,7 @@
   Name:             legacy_kmx_file
   Copyright:        Copyright (C) SIL International.
   Documentation:
-  Description:      Describes .kmx binary format. To be replaced with Core's kmx_file.h
+  Description:      Describes .kmx binary format. To be replaced with common/include/kmx_file.h
   Create Date:      4 Jan 2007
 
   Modified Date:    24 Aug 2015

diff --git a/core/include/keyman/keyboardprocessor.h b/core/include/keyman/keyboardprocessor.h
@@ -110,13 +110,6 @@ extern "C"
 #endif
 // Basic types
 //
-#if defined(__cplusplus)
-typedef char16_t   km_kbp_cp;
-typedef char32_t   km_kbp_usv;
-#else
-typedef uint16_t    km_kbp_cp;          // code point
-typedef uint32_t    km_kbp_usv;         // Unicode Scalar Value
-#endif
 typedef uint16_t    km_kbp_virtual_key; // A virtual key code.
 typedef uint32_t    km_kbp_status;      // Status return code.
 
@@ -650,7 +643,7 @@ undefined. The returned buffer uses UTF-8 encoding.
 - `KM_KBP_STATUS_INVALID_ARGUMENT`: If non-optional parameters are null.
 - `KM_KBP_STATUS_NO_MEM`: In the event an internal memory allocation fails.
 ##### Parameters:
-- __opts__: An opaque pointer to a state object.
+- __state__: An opaque pointer to a state object.
 - __buf__: A pointer to the buffer to place the C string containing the JSON
 document into, can be null.
 - __space__: A pointer to a size_t variable. This variable must contain the
@@ -793,7 +786,7 @@ km_kbp_keyboard_get_key_list(km_kbp_keyboard const *keyboard,
 Free the allocated memory belonging to a keyboard key list previously
 returned by `km_kbp_keyboard_get_key_list`.
 ##### Parameters:
-- __keyboard__: A pointer to the keyboard key list to be
+- __key_list__: A pointer to the keyboard key list to be
     disposed of.
 
 ```c
@@ -1127,10 +1120,6 @@ In the event the `state` pointer is null
 
 ##### Parameters:
 - __state__: A pointer to the opaque state object.
-- __vk__: A virtual key to be processed.
-- __modifier_state__:
-The combinations of modifier keys set at the time key `vk` was pressed, bitmask
-from the `km_kbp_modifier_state` enum.
 
 ```c
 */

diff --git a/core/include/keyman/keyboardprocessor_bits.h b/core/include/keyman/keyboardprocessor_bits.h
@@ -58,3 +58,12 @@
   #define KMN_API             _kmn_tag_fn(_kmn_import_flag)
   #define KMN_DEPRECATED_API  _kmn_tag_fn(_kmn_deprecated_flag _kmn_and _kmn_import_flag)
 #endif
+
+#ifndef KMN_KBP
+#define KMN_KBP
+#endif
+#ifndef USE_CHAR16_T
+#define USE_CHAR16_T
+#endif
+
+#include <km_types.h>
diff --git a/core/include/meson.build b/core/include/meson.build
@@ -6,5 +6,5 @@
 # History:     6 Oct 2018 - TSE - Move into keyman folder.
 #
 
-inc = include_directories('.', is_system: true)
+inc = include_directories('.', '../../common/include', is_system: true)
 subdir('keyman')
diff --git a/core/meson.build b/core/meson.build
@@ -37,6 +37,10 @@ message('compiler.get_id(): ' + compiler.get_id())
 
 cc = meson.get_compiler('c')
 
+# TODO: Shared includes may use namespaces, etc which need future tidyup.
+# For now, we use KMN_KBP to inject the km::kbp::kmx namespace
+defns = ['-DKMN_KBP']
+
 subdir('doc')
 subdir('include')
 subdir('src')