Skip to content

Commit

Permalink
apply clang-format
Browse files Browse the repository at this point in the history
  • Loading branch information
@fxliang
fxliang committed Feb 28, 2024
1 parent baec5f4 commit b98de07
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 49 deletions.
78 changes: 39 additions & 39 deletions RimeWithWeasel/RimeWithWeasel.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand All @@ -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<<i)){
msbit = i;
break;
}
for (auto i = 31; i >= 0; i--) {
if (m_pid & (1 << i)) {
msbit = i;
break;
}
}
m_pid = (m_pid << (31 - msbit));
_Setup();
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand All @@ -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;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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<bool>(false);
std::for_each(
options.begin(), options.end(),
[ipc_id, pfind, inline_preedit,
this](std::pair<const std::string, bool>& 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<const std::string, bool>& 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;
}
Expand Down Expand Up @@ -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(
Expand Down
9 changes: 5 additions & 4 deletions WeaselServer/WeaselServerApp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
22 changes: 16 additions & 6 deletions include/RimeWithWeasel.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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<void()> const& cb);
Expand All @@ -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
Expand Down

0 comments on commit b98de07

Please sign in to comment.