fix(core): update core to handle reset context

- fix range check vk to use a static instead of c++17 function
keymanapp · Apr 16, 2024 · 37530ac · 37530ac
1 parent 4f8c9eb
commit 37530ac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/core/src/vkey_to_contextreset.cpp b/core/src/vkey_to_contextreset.cpp
@@ -3,7 +3,7 @@
 namespace km {
 namespace core {
 
-bool vkey_to_contextreset[256] = {
+bool vkey_to_contextreset[vkey_to_contextreset_count] = {
 	true,   //L"K_?00",				// &H0
 	true,   //L"K_LBUTTON",			// &H1
 	true,   //L"K_RBUTTON",			// &H2

diff --git a/core/src/vkey_to_contextreset.hpp b/core/src/vkey_to_contextreset.hpp
@@ -1,18 +1,18 @@
 #pragma once
 
-#include <iterator>
 #include <keyman/keyman_core_api.h>
 #include "kmx_file.h"
 
 namespace km {
 namespace core {
 
+static const auto vkey_to_contextreset_count = 256;
 /** true for any vkeys which require a context reset (such as frame keys) */
-extern bool vkey_to_contextreset[256];
+extern bool vkey_to_contextreset[vkey_to_contextreset_count];
 
 /** @return true for any vkeys which require a context reset (such as frame keys) */
 inline bool vkey_should_contextreset(km_core_virtual_key vk) {
-  return ((vk < std::size(vkey_to_contextreset)) && vkey_to_contextreset[vk]);
+  return ((vk < vkey_to_contextreset_count) && vkey_to_contextreset[vk]);
 }
 
 /** @return true for modifier states that are involved with context reset */