From 021c33b74b286e164bfb679e00f90fad20eabe08 Mon Sep 17 00:00:00 2001 From: fxliang Date: Wed, 28 Feb 2024 08:43:22 +0800 Subject: [PATCH] apply clang-format --- RimeWithWeasel/RimeWithWeasel.cpp | 78 +++++++++++++++---------------- WeaselServer/WeaselServerApp.h | 9 ++-- include/RimeWithWeasel.h | 22 ++++++--- 3 files changed, 60 insertions(+), 49 deletions(-) diff --git a/RimeWithWeasel/RimeWithWeasel.cpp b/RimeWithWeasel/RimeWithWeasel.cpp index 9b7beb66f..9c1ae9f30 100644 --- a/RimeWithWeasel/RimeWithWeasel.cpp +++ b/RimeWithWeasel/RimeWithWeasel.cpp @@ -30,7 +30,7 @@ using namespace weasel; WeaselSessionId _GenerateNewWeaselSessionId(SessionStatusMap sm, DWORD pid) { if (sm.empty()) - return (WeaselSessionId)(pid+1); + return (WeaselSessionId)(pid + 1); return (WeaselSessionId)(sm.rbegin()->first + 1); } @@ -48,11 +48,11 @@ RimeWithWeaselHandler::RimeWithWeaselHandler(UI* ui) _UpdateUICallback(NULL) { m_pid = GetCurrentProcessId(); uint16_t msbit = 0; - for(auto i = 31; i >= 0; i--) { - if (m_pid & (1<= 0; i--) { + if (m_pid & (1 << i)) { + msbit = i; + break; + } } m_pid = (m_pid << (31 - msbit)); _Setup(); @@ -180,9 +180,10 @@ DWORD RimeWithWeaselHandler::AddSession(LPWSTR buffer, EatLine eat) { } } - WeaselSessionId ipc_id = _GenerateNewWeaselSessionId(m_session_status_map, m_pid); - DLOG(INFO) << "Add session: created session_id = " << session_id - << ", ipc_id = " << ipc_id; + WeaselSessionId ipc_id = + _GenerateNewWeaselSessionId(m_session_status_map, m_pid); + DLOG(INFO) << "Add session: created session_id = " << session_id + << ", ipc_id = " << ipc_id; m_session_status_map[ipc_id] = SessionStatus(); m_session_status_map[ipc_id].style = m_base_style; m_session_status_map[ipc_id].session_id = session_id; @@ -313,8 +314,9 @@ void RimeWithWeaselHandler::ClearComposition(WeaselSessionId ipc_id) { m_active_session = ipc_id; } -void RimeWithWeaselHandler::SelectCandidateOnCurrentPage(size_t index, - WeaselSessionId ipc_id) { +void RimeWithWeaselHandler::SelectCandidateOnCurrentPage( + size_t index, + WeaselSessionId ipc_id) { DLOG(INFO) << "select candidate on current page, ipc_id = " << ipc_id << ", index = " << index; if (m_disabled) @@ -323,11 +325,12 @@ void RimeWithWeaselHandler::SelectCandidateOnCurrentPage(size_t index, api->select_candidate_on_current_page(_s(ipc_id), index); } -bool RimeWithWeaselHandler::HighlightCandidateOnCurrentPage(size_t index, - WeaselSessionId ipc_id, - EatLine eat) { - DLOG(INFO) << "highlight candidate on current page, ipc_id = " - << ipc_id << ", index = " << index; +bool RimeWithWeaselHandler::HighlightCandidateOnCurrentPage( + size_t index, + WeaselSessionId ipc_id, + EatLine eat) { + DLOG(INFO) << "highlight candidate on current page, ipc_id = " << ipc_id + << ", index = " << index; RimeApi* api = rime_get_api(); if (!api) return false; @@ -412,7 +415,8 @@ void RimeWithWeaselHandler::OnNotify(void* context_object, } } -void RimeWithWeaselHandler::_ReadClientInfo(WeaselSessionId ipc_id, LPWSTR buffer) { +void RimeWithWeaselHandler::_ReadClientInfo(WeaselSessionId ipc_id, + LPWSTR buffer) { std::string app_name; std::string client_type; // parse request text @@ -555,11 +559,9 @@ void RimeWithWeaselHandler::_UpdateUI(WeaselSessionId ipc_id) { return; if (RimeGetOption(_s(ipc_id), "inline_preedit")) - m_session_status_map[ipc_id].style.client_caps |= - INLINE_PREEDIT_CAPABLE; + m_session_status_map[ipc_id].style.client_caps |= INLINE_PREEDIT_CAPABLE; else - m_session_status_map[ipc_id].style.client_caps &= - ~INLINE_PREEDIT_CAPABLE; + m_session_status_map[ipc_id].style.client_caps &= ~INLINE_PREEDIT_CAPABLE; if (weasel_status.composing) { m_ui->Update(weasel_context, weasel_status); @@ -681,20 +683,20 @@ void RimeWithWeaselHandler::_LoadAppInlinePreeditSet(WeaselSessionId ipc_id, if (it != m_app_options.end()) { AppOptions& options(m_app_options[it->first]); auto pfind = std::make_shared(false); - std::for_each( - options.begin(), options.end(), - [ipc_id, pfind, inline_preedit, - this](std::pair& pair) { - if (pair.first == "inline_preedit") { - *pfind = true; - RimeSetOption(_s(ipc_id), pair.first.c_str(), Bool(pair.second)); - m_session_status_map[ipc_id].style.inline_preedit = - Bool(pair.second); - if (m_session_status_map[ipc_id].style.inline_preedit != - inline_preedit) - _UpdateInlinePreeditStatus(ipc_id); - } - }); + std::for_each(options.begin(), options.end(), + [ipc_id, pfind, inline_preedit, + this](std::pair& pair) { + if (pair.first == "inline_preedit") { + *pfind = true; + RimeSetOption(_s(ipc_id), pair.first.c_str(), + Bool(pair.second)); + m_session_status_map[ipc_id].style.inline_preedit = + Bool(pair.second); + if (m_session_status_map[ipc_id].style.inline_preedit != + inline_preedit) + _UpdateInlinePreeditStatus(ipc_id); + } + }); if (!(*pfind)) { goto load_schema_inline; } @@ -1469,12 +1471,10 @@ void RimeWithWeaselHandler::_GetStatus(Status& stat, m_session_status_map[ipc_id].__synced = false; m_last_schema_id = schema_id; if (schema_id != ".default") { // don't load for schema select menu - bool inline_preedit = - m_session_status_map[ipc_id].style.inline_preedit; + bool inline_preedit = m_session_status_map[ipc_id].style.inline_preedit; _LoadSchemaSpecificSettings(ipc_id, schema_id); _LoadAppInlinePreeditSet(ipc_id, true); - if (m_session_status_map[ipc_id].style.inline_preedit != - inline_preedit) + if (m_session_status_map[ipc_id].style.inline_preedit != inline_preedit) _UpdateInlinePreeditStatus( ipc_id); // in case of inline_preedit set in schema _RefreshTrayIcon( diff --git a/WeaselServer/WeaselServerApp.h b/WeaselServer/WeaselServerApp.h index e9ea476f9..2e6b7461b 100644 --- a/WeaselServer/WeaselServerApp.h +++ b/WeaselServer/WeaselServerApp.h @@ -18,18 +18,19 @@ class WeaselServerApp { public: static bool execute(const fs::path& cmd, const std::wstring& args) { return (uintptr_t)ShellExecuteW(NULL, NULL, cmd.c_str(), args.c_str(), NULL, - SW_SHOWNORMAL) > 32; + SW_SHOWNORMAL) > 32; } static bool explore(const fs::path& path) { std::wstring quoted_path(L"\"" + path.wstring() + L"\""); - return (uintptr_t)ShellExecuteW(NULL, L"open", L"explorer", quoted_path.c_str(), - NULL, SW_SHOWNORMAL) > 32; + return (uintptr_t)ShellExecuteW(NULL, L"open", L"explorer", + quoted_path.c_str(), NULL, + SW_SHOWNORMAL) > 32; } static bool open(const fs::path& path) { return (uintptr_t)ShellExecuteW(NULL, L"open", path.c_str(), NULL, NULL, - SW_SHOWNORMAL) > 32; + SW_SHOWNORMAL) > 32; } static bool check_update() { diff --git a/include/RimeWithWeasel.h b/include/RimeWithWeasel.h index 64bd52984..2c8459527 100644 --- a/include/RimeWithWeasel.h +++ b/include/RimeWithWeasel.h @@ -45,7 +45,8 @@ class RimeWithWeaselHandler : public weasel::RequestHandler { EatLine eat); virtual void CommitComposition(WeaselSessionId ipc_id); virtual void ClearComposition(WeaselSessionId ipc_id); - virtual void SelectCandidateOnCurrentPage(size_t index, WeaselSessionId ipc_id); + virtual void SelectCandidateOnCurrentPage(size_t index, + WeaselSessionId ipc_id); virtual bool HighlightCandidateOnCurrentPage(size_t index, WeaselSessionId ipc_id, EatLine eat); @@ -55,7 +56,9 @@ class RimeWithWeaselHandler : public weasel::RequestHandler { virtual void UpdateInputPosition(RECT const& rc, WeaselSessionId ipc_id); virtual void StartMaintenance(); virtual void EndMaintenance(); - virtual void SetOption(WeaselSessionId ipc_id, const std::string& opt, bool val); + virtual void SetOption(WeaselSessionId ipc_id, + const std::string& opt, + bool val); virtual void UpdateColorTheme(BOOL darkMode); void OnUpdateUI(std::function const& cb); @@ -66,19 +69,26 @@ class RimeWithWeaselHandler : public weasel::RequestHandler { void _UpdateUI(WeaselSessionId ipc_id); void _LoadSchemaSpecificSettings(WeaselSessionId ipc_id, const std::string& schema_id); - void _LoadAppInlinePreeditSet(WeaselSessionId ipc_id, bool ignore_app_name = false); + void _LoadAppInlinePreeditSet(WeaselSessionId ipc_id, + bool ignore_app_name = false); bool _ShowMessage(weasel::Context& ctx, weasel::Status& status); bool _Respond(WeaselSessionId ipc_id, EatLine eat); void _ReadClientInfo(WeaselSessionId ipc_id, LPWSTR buffer); void _GetCandidateInfo(weasel::CandidateInfo& cinfo, RimeContext& ctx); - void _GetStatus(weasel::Status& stat, WeaselSessionId ipc_id, weasel::Context& ctx); + void _GetStatus(weasel::Status& stat, + WeaselSessionId ipc_id, + weasel::Context& ctx); void _GetContext(weasel::Context& ctx, RimeSessionId session_id); void _UpdateShowNotifications(RimeConfig* config, bool initialize = false); bool _IsSessionTSF(RimeSessionId session_id); void _UpdateInlinePreeditStatus(WeaselSessionId ipc_id); - RimeSessionId _s(WeaselSessionId ipc_id) { return (m_session_status_map[ipc_id].session_id); } - SessionStatus& _session_status(WeaselSessionId ipc_id) { return m_session_status_map[ipc_id]; } + RimeSessionId _s(WeaselSessionId ipc_id) { + return (m_session_status_map[ipc_id].session_id); + } + SessionStatus& _session_status(WeaselSessionId ipc_id) { + return m_session_status_map[ipc_id]; + } AppOptionsByAppName m_app_options; weasel::UI* m_ui; // reference