From 34bd86b7064730752e129dcb2fb22f8b47ff9c6c Mon Sep 17 00:00:00 2001 From: Sabine Date: Thu, 11 Aug 2022 08:59:52 +0200 Subject: [PATCH] chore(developer): remove some comments --- core/src/kmx/kmx_debugger.h | 2 +- core/src/kmx/kmx_environment.h | 2 +- core/src/kmx/kmx_options.h | 2 +- core/src/kmx/kmx_processevent.cpp | 2 - core/src/kmx/kmx_processor.cpp | 203 ------------------------------ core/src/kmx/kmx_processor.hpp | 53 -------- core/src/kmx/kmx_xstring.h | 4 +- 7 files changed, 5 insertions(+), 263 deletions(-) diff --git a/core/src/kmx/kmx_debugger.h b/core/src/kmx/kmx_debugger.h index 5c5087636c..20006e291c 100644 --- a/core/src/kmx/kmx_debugger.h +++ b/core/src/kmx/kmx_debugger.h @@ -11,7 +11,7 @@ #pragma once #include "kmx_base.h" -#include "../debug.hpp" // _S2 #include +#include namespace km { namespace kbp { diff --git a/core/src/kmx/kmx_environment.h b/core/src/kmx/kmx_environment.h index 25a139662a..0b8d3d0acc 100644 --- a/core/src/kmx/kmx_environment.h +++ b/core/src/kmx/kmx_environment.h @@ -2,7 +2,7 @@ #include -#include "../option.hpp" // _S2 #include "option.hpp" +#include "option.hpp" #include "kmx_base.h" namespace km { diff --git a/core/src/kmx/kmx_options.h b/core/src/kmx/kmx_options.h index 0d384b3d37..b32a84e851 100644 --- a/core/src/kmx/kmx_options.h +++ b/core/src/kmx/kmx_options.h @@ -5,7 +5,7 @@ #include #include -#include "../option.hpp" +#include "option.hpp" #include "kmx_base.h" #include "kmx_debugger.h" diff --git a/core/src/kmx/kmx_processevent.cpp b/core/src/kmx/kmx_processevent.cpp index f34397763f..8502e8e195 100644 --- a/core/src/kmx/kmx_processevent.cpp +++ b/core/src/kmx/kmx_processevent.cpp @@ -489,8 +489,6 @@ int KMX_ProcessEvent::PostString(PKMX_WCHAR str, LPKEYBOARD lpkb, PKMX_WCHAR end case CODE_CALL: p++; m_kbp_state->imx_callback(*p-1); - // _S2 m_kbp_state->imx_callback(*p-1); // _S2 DebugLog("CallDLL not supported [store=%d].\n", *p-1); - FoundUse = TRUE; break; case CODE_USE: // use another group diff --git a/core/src/kmx/kmx_processor.cpp b/core/src/kmx/kmx_processor.cpp index c3fb833d8c..3b55899086 100644 --- a/core/src/kmx/kmx_processor.cpp +++ b/core/src/kmx/kmx_processor.cpp @@ -378,206 +378,3 @@ km_kbp_keyboard_imx * kmx_processor::get_imx_list() const { imx_list[fn_idx] = KM_KBP_KEYBOARD_IMX_END; return imx_list; } - - - -//*********** _S2 old ****************** -/* - -#include -#include "state.hpp" -#include "kmx/kmx_processor.hpp" - -using namespace km::kbp; -using namespace kmx; - -km_kbp_status kmx_processor::validate() const { - return _valid ? KM_KBP_STATUS_OK : KM_KBP_STATUS_INVALID_KEYBOARD; -} - -kmx_processor::kmx_processor(kbp::path p) { - p.replace_extension(".kmx"); - _valid = bool(_kmx.Load(p.c_str())); - - if (!_valid) - return; - - keyboard_attributes::options_store defaults; - _kmx.GetOptions()->Init(defaults); - - for (auto const & opt: defaults) - { - if (!opt.empty() && opt.scope == KM_KBP_OPT_KEYBOARD ) - persisted_store()[opt.key] = opt.value; - } - // Fill out attributes - auto v = _kmx.GetKeyboard()->Keyboard->version; - auto vs = std::to_string(v >> 16) + "." + std::to_string(v & 0xffff); - - _attributes = keyboard_attributes(static_cast(p.stem()), - std::u16string(vs.begin(), vs.end()), p.parent(), defaults); -} - -char16_t const * -kmx_processor::lookup_option( - km_kbp_option_scope scope, - std::u16string const &key -) const { - char16_t const *pValue = nullptr; - switch (scope) { - case KM_KBP_OPT_KEYBOARD: - pValue = _kmx.GetOptions()->LookUp(key); - break; - case KM_KBP_OPT_ENVIRONMENT: - pValue = _kmx.GetEnvironment()->LookUp(key); - break; - default: - break; - } - - return pValue ? pValue : nullptr; -} - -option -kmx_processor::update_option( - km_kbp_option_scope scope, - std::u16string const &key, - std::u16string const &value -) { - switch (scope) { - case KM_KBP_OPT_KEYBOARD: - _kmx.GetOptions()->Set(key, value); - persisted_store()[key] = value; - break; - case KM_KBP_OPT_ENVIRONMENT: - _kmx.GetEnvironment()->Set(key, value); - break; - default: - return option(); - break; - } - - return option(scope, key, value); -} - -km_kbp_status -kmx_processor::process_event( - km_kbp_state *state, - km_kbp_virtual_key vk, - uint16_t modifier_state, - uint8_t is_key_down -) { - // Construct a context buffer from the items - - std::u16string ctxt; - auto cp = state->context(); - for (auto c = cp.begin(); c != cp.end(); c++) { - switch (c->type) { - case KM_KBP_CT_CHAR: - if (Uni_IsSMP(c->character)) { - ctxt += Uni_UTF32ToSurrogate1(c->character); - ctxt += Uni_UTF32ToSurrogate2(c->character); - } else { - ctxt += (km_kbp_cp)c->character; - } - break; - case KM_KBP_CT_MARKER: - assert(c->marker > 0); - ctxt += UC_SENTINEL; - ctxt += CODE_DEADKEY; - ctxt += c->marker; - break; - } - } - - _kmx.GetContext()->Set(ctxt.c_str()); - _kmx.GetActions()->ResetQueue(); - state->actions().clear(); - - if (!_kmx.ProcessEvent(state, vk, modifier_state, is_key_down)) { - // We need to output the default keystroke - state->actions().push_emit_keystroke(); - } - - for (auto i = 0; i < _kmx.GetActions()->Length(); i++) { - auto a = _kmx.GetActions()->Get(i); - switch (a.ItemType) { - case QIT_CAPSLOCK: - state->actions().push_capslock(a.dwData); - break; - case QIT_VKEYDOWN: - case QIT_VKEYUP: - case QIT_VSHIFTDOWN: - case QIT_VSHIFTUP: - // TODO: eliminate?? - break; - case QIT_CHAR: - state->context().push_character(a.dwData); - state->actions().push_character(a.dwData); - break; - case QIT_DEADKEY: - state->context().push_marker(a.dwData); - state->actions().push_marker(a.dwData); - break; - case QIT_BELL: - state->actions().push_alert(); - break; - case QIT_BACK: - switch (a.dwData) { - case BK_DEFAULT: - // This only happens if we know we have context to delete. Last item must be a character - assert(!state->context().empty()); - assert(state->context().back().type != KM_KBP_IT_MARKER); - if(!state->context().empty()) { - auto item = state->context().back(); - state->context().pop_back(); - state->actions().push_backspace(KM_KBP_BT_CHAR, item.character); - } else { - // Note: only runs on non-debug build, fail safe - state->actions().push_backspace(KM_KBP_BT_UNKNOWN); - } - break; - case BK_DEADKEY: - // This only happens if we know we have context to delete. Last item must be a deadkey - assert(!state->context().empty()); - assert(state->context().back().type == KM_KBP_IT_MARKER); - if(!state->context().empty()) { - auto item = state->context().back(); - state->context().pop_back(); - state->actions().push_backspace(KM_KBP_BT_MARKER, item.marker); - } else { - // Note: only runs on non-debug build, fail safe - state->actions().push_backspace(KM_KBP_BT_UNKNOWN); - } - break; - default: - assert(false); - } - break; - case QIT_INVALIDATECONTEXT: - state->actions().push_invalidate_context(); - break; - default: - // std::cout << "Unexpected item type " << a.ItemType << ", " << a.dwData << std::endl; - assert(false); - } - } - - state->actions().commit(); - - return KM_KBP_STATUS_OK; -} - -constexpr km_kbp_attr const engine_attrs = { - 256, - KM_KBP_LIB_CURRENT, - KM_KBP_LIB_AGE, - KM_KBP_LIB_REVISION, - KM_KBP_TECH_KMX, - "SIL International" -}; - -km_kbp_attr const & kmx_processor::attributes() const { - return engine_attrs; -} -*/ diff --git a/core/src/kmx/kmx_processor.hpp b/core/src/kmx/kmx_processor.hpp index 21852f8dcf..0107d45f85 100644 --- a/core/src/kmx/kmx_processor.hpp +++ b/core/src/kmx/kmx_processor.hpp @@ -76,56 +76,3 @@ namespace kbp } // namespace kbp } // namespace km - - -//***** _S2 old ********************************** -/* -#pragma once - -#include -#include -#include "kmx/kmx_processevent.h" -#include "keyboard.hpp" -#include "processor.hpp" - -namespace km { -namespace kbp -{ - class kmx_processor : public abstract_processor - { - private: - bool _valid; - kmx::KMX_ProcessEvent _kmx; - public: - kmx_processor(path); - - km_kbp_status - process_event( - km_kbp_state *state, - km_kbp_virtual_key vk, - uint16_t modifier_state, - uint8_t is_key_down - ) override; - - km_kbp_attr const & attributes() const override; - km_kbp_status validate() const override; - - char16_t const * - lookup_option( - km_kbp_option_scope, - std::u16string const & key - ) const override; - - option - update_option( - km_kbp_option_scope scope, - std::u16string const & key, - std::u16string const & value - ) override; - }; - -} // namespace kbp -} // namespace km - -*/ - diff --git a/core/src/kmx/kmx_xstring.h b/core/src/kmx/kmx_xstring.h index 69d70f8d36..cc85c934f2 100644 --- a/core/src/kmx/kmx_xstring.h +++ b/core/src/kmx/kmx_xstring.h @@ -11,10 +11,10 @@ namespace kmx { #define Uni_IsSMP(ch) ((ch) >= 0x10000) #define Uni_SurrogateToUTF32(ch, cl) (((ch) - 0xD800) * 0x400 + ((cl) - 0xDC00) + 0x10000) -/* _ S2 + #define Uni_UTF32ToSurrogate1(ch) (char16_t)(((ch) - 0x10000) / 0x400 + 0xD800) #define Uni_UTF32ToSurrogate2(ch) (char16_t)(((ch) - 0x10000) % 0x400 + 0xDC00) -*/ + PKMX_WCHAR incxstr(PKMX_WCHAR p); PKMX_WCHAR decxstr(PKMX_WCHAR p, PKMX_WCHAR pStart); int xstrlen(PKMX_WCHAR p);