openharmony/inputmethod_imf
1
0
Fork 0
mirror of https://gitee.com/openharmony/inputmethod_imf synced 2024-11-27 17:01:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

modify code

Browse Source 
Signed-off-by: zhaolinglan <zhaolinglan@huawei.com>
This commit is contained in:
zhaolinglan 2023-12-02 20:06:17 +08:00
parent 91b6ad569a
commit bf4ba58306
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frameworks/native/inputmethod_ability/src/input_method_ability.cpp
View File

@ -948,7 +948,9 @@ void InputMethodAbility::OnClientInactive(const sptr<IRemoteObject> &channel)
IMSA_HILOGI("client inactive");
ClearDataChannel(channel);
panels_.ForEach([](const PanelType &panelType, const std::shared_ptr<InputMethodPanel> &panel) {
panel->HidePanel();
if (panelType != PanelType::SOFT_KEYBOARD || panel->GetPanelFlag() != PanelFlag::FLG_FIXED) {
panel->HidePanel();
}
return false;
});
}

12
frameworks/native/inputmethod_controller/src/input_method_controller.cpp
View File

@ -291,6 +291,7 @@ int32_t InputMethodController::ShowTextInput()
int32_t InputMethodController::HideTextInput()
{
if (!IsBound()) {
IMSA_HILOGE("not bound");
return ErrorCode::ERROR_CLIENT_NOT_BOUND;
}
IMSA_HILOGI("run in");
@ -303,6 +304,7 @@ int32_t InputMethodController::HideCurrentInput()
{
IMSA_HILOGD("InputMethodController::HideCurrentInput");
if (!IsEditable()) {
IMSA_HILOGD("not editable");
return ErrorCode::ERROR_CLIENT_NOT_EDITABLE;
}
auto proxy = GetSystemAbilityProxy();
@ -318,7 +320,7 @@ int32_t InputMethodController::HideCurrentInput()
int32_t InputMethodController::ShowCurrentInput()
{
if (!IsEditable()) {
IMSA_HILOGE("not in editable state");
IMSA_HILOGD("not editable");
return ErrorCode::ERROR_CLIENT_NOT_EDITABLE;
}
auto proxy = GetSystemAbilityProxy();
@ -547,6 +549,7 @@ void InputMethodController::RestoreListenInfoInSaDied()
void InputMethodController::RestoreAttachInfoInSaDied()
{
if (!IsEditable()) {
IMSA_HILOGD("not editable");
return;
}
auto attach = [=]() -> bool {
@ -581,6 +584,7 @@ void InputMethodController::RestoreAttachInfoInSaDied()
int32_t InputMethodController::OnCursorUpdate(CursorInfo cursorInfo)
{
if (!IsEditable()) {
IMSA_HILOGD("not editable");
return ErrorCode::ERROR_CLIENT_NOT_EDITABLE;
}
{
@ -609,6 +613,7 @@ int32_t InputMethodController::OnCursorUpdate(CursorInfo cursorInfo)
int32_t InputMethodController::OnSelectionChange(std::u16string text, int start, int end)
{
if (!IsEditable()) {
IMSA_HILOGD("not editable");
return ErrorCode::ERROR_CLIENT_NOT_EDITABLE;
}
{
@ -642,6 +647,7 @@ int32_t InputMethodController::OnConfigurationChange(Configuration info)
textConfig_.inputAttribute.inputPattern = static_cast<uint32_t>(info.GetTextInputType());
}
if (!IsEditable()) {
IMSA_HILOGD("not editable");
return ErrorCode::ERROR_CLIENT_NOT_EDITABLE;
}
IMSA_HILOGI("IMC enterKeyType: %{public}d, textInputType: %{public}d",
@ -695,6 +701,7 @@ bool InputMethodController::DispatchKeyEvent(std::shared_ptr<MMI::KeyEvent> keyE
{
InputMethodSyncTrace tracer("DispatchKeyEvent trace");
if (!IsEditable()) {
IMSA_HILOGD("not editable");
return false;
}
if (keyEvent == nullptr) {
@ -754,6 +761,7 @@ int32_t InputMethodController::GetTextConfig(TextTotalConfig &config)
int32_t InputMethodController::SetCallingWindow(uint32_t windowId)
{
if (!IsEditable()) {
IMSA_HILOGD("not editable");
return ErrorCode::ERROR_CLIENT_NOT_EDITABLE;
}
{
@ -773,6 +781,7 @@ int32_t InputMethodController::SetCallingWindow(uint32_t windowId)
int32_t InputMethodController::ShowSoftKeyboard()
{
if (!IsEditable()) {
IMSA_HILOGD("not editable");
return ErrorCode::ERROR_CLIENT_NOT_EDITABLE;
}
auto proxy = GetSystemAbilityProxy();
@ -789,6 +798,7 @@ int32_t InputMethodController::ShowSoftKeyboard()
int32_t InputMethodController::HideSoftKeyboard()
{
if (!IsEditable()) {
IMSA_HILOGD("not editable");
return ErrorCode::ERROR_CLIENT_NOT_EDITABLE;
}
auto proxy = GetSystemAbilityProxy();

2
services/src/peruser_session.cpp
View File

@ -423,6 +423,7 @@ void PerUserSession::DeactivateClient(const sptr<IInputClient> &client)
if (clientInfo == nullptr) {
return;
}
IMSA_HILOGI("deactive client[%{public}d]", clientInfo->pid);
UpdateClientInfo(client->AsObject(), { { UpdateFlag::STATE, ClientState::INACTIVE } });
if (IsCurrentClient(client)) {
SetCurrentClient(nullptr);
@ -682,7 +683,6 @@ void PerUserSession::SetCurrentClient(sptr<IInputClient> client)
sptr<IInputClient> PerUserSession::GetCurrentClient()
{
std::lock_guard<std::mutex> lock(clientLock_);
IMSA_HILOGD("get current client");
return currentClient_;
}