openharmony/inputmethod_imf
1
0
Fork 0
mirror of https://gitee.com/openharmony/inputmethod_imf synced 2024-12-18 04:10:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!542 【BUG修复】修复组合键切换机制

Browse Source 
Merge pull request !542 from 赵凌岚/master
This commit is contained in:
openharmony_ci 2023-01-08 02:40:56 +00:00 committed by Gitee
commit 7656b27db3
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
8 changed files with 113 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
services/adapter/keyboard/BUILD.gn
View File

@ -24,6 +24,7 @@ config("inputmethod_adapter_native_config") {
ohos_static_library("keboard_event_static") {
sources = [
"src/combination_key.cpp",
"src/input_event_callback.cpp",
"src/keyboard_event.cpp",
]

32
services/adapter/keyboard/include/combination_key.h Normal file
View File

@ -0,0 +1,32 @@
/*
* Copyright (c) 2022 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef INPUTMETHOD_IMF_COMBINATION_KEY_H
#define INPUTMETHOD_IMF_COMBINATION_KEY_H
#include <cstdint>
namespace OHOS {
namespace MiscServices {
enum class CombinationKeyFunction { SWITCH_LANGUAGE = 0, SWITCH_MODE, SWITCH_IME };
class CombinationKey {
public:
static bool IsMatch(CombinationKeyFunction combinationKey, uint32_t state);
};
} // namespace MiscServices
} // namespace OHOS
#endif // INPUTMETHOD_IMF_COMBINATION_KEY_H

1
services/adapter/keyboard/include/input_event_callback.h
View File

@ -36,6 +36,7 @@ public:
private:
KeyHandle keyHandler_ = nullptr;
static uint32_t keyState_;
static bool isKeyHandled_;
};
} // namespace MiscServices
} // namespace OHOS

5
services/adapter/keyboard/include/keyboard_event.h
View File

@ -18,7 +18,6 @@
#include <cstdint>
#include <functional>
#include <set>
#include "global.h"
#include "key_event.h"
@ -36,10 +35,6 @@ public:
static constexpr uint8_t CTRL_LEFT_MASK = 0X1 << 2;
static constexpr uint8_t CTRL_RIGHT_MASK = 0X1 << 3;
static constexpr uint8_t CAPS_MASK = 0X1 << 4;
static constexpr bool IS_KEYS_DOWN(uint32_t state, uint8_t mask)
{
return state == mask;
}
private:
static constexpr int32_t PRESS_KEY_DELAY_MS = 200;

48
services/adapter/keyboard/src/combination_key.cpp Normal file
View File

@ -0,0 +1,48 @@
/*
* Copyright (c) 2022 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "combination_key.h"
#include <map>
#include <set>
#include "keyboard_event.h"
namespace OHOS {
namespace MiscServices {
const std::map<CombinationKeyFunction, std::set<uint8_t>> COMBINATION_KEY_MAP{
{ CombinationKeyFunction::SWITCH_LANGUAGE, { KeyboardEvent::SHIFT_LEFT_MASK, KeyboardEvent::SHIFT_RIGHT_MASK } },
{ CombinationKeyFunction::SWITCH_IME,
{
KeyboardEvent::SHIFT_LEFT_MASK | KeyboardEvent::CTRL_LEFT_MASK,
KeyboardEvent::SHIFT_RIGHT_MASK | KeyboardEvent::CTRL_RIGHT_MASK,
KeyboardEvent::SHIFT_LEFT_MASK | KeyboardEvent::CTRL_RIGHT_MASK,
KeyboardEvent::SHIFT_RIGHT_MASK | KeyboardEvent::CTRL_LEFT_MASK,
} },
{ CombinationKeyFunction::SWITCH_MODE, { KeyboardEvent::CAPS_MASK } },
};
bool CombinationKey::IsMatch(CombinationKeyFunction combinationKey, uint32_t state)
{
IMSA_HILOGD("combinationKey: %{public}d, state: %{public}d", combinationKey, state);
auto expectedKeys = COMBINATION_KEY_MAP.find(combinationKey);
if (expectedKeys == COMBINATION_KEY_MAP.end()) {
IMSA_HILOGD("known key function");
return false;
}
return expectedKeys->second.find(state) != expectedKeys->second.end();
}
} // namespace MiscServices
} // namespace OHOS

14
services/adapter/keyboard/src/input_event_callback.cpp
View File

@ -20,6 +20,7 @@
namespace OHOS {
namespace MiscServices {
uint32_t InputEventCallback::keyState_ = static_cast<uint32_t>(0);
bool InputEventCallback::isKeyHandled_ = false;
const std::map<int32_t, uint8_t> MASK_MAP{
{ MMI::KeyEvent::KEYCODE_SHIFT_LEFT, KeyboardEvent::SHIFT_LEFT_MASK },
{ MMI::KeyEvent::KEYCODE_SHIFT_RIGHT, KeyboardEvent::SHIFT_RIGHT_MASK },
@ -35,6 +36,7 @@ void InputEventCallback::OnInputEvent(std::shared_ptr<MMI::KeyEvent> keyEvent) c
auto currKey = MASK_MAP.find(keyCode);
if (currKey == MASK_MAP.end()) {
IMSA_HILOGD("key code unknown");
keyState_ = 0;
return;
}
IMSA_HILOGD("keyCode: %{public}d, keyAction: %{public}d", keyCode, keyAction);
@ -42,14 +44,24 @@ void InputEventCallback::OnInputEvent(std::shared_ptr<MMI::KeyEvent> keyEvent) c
if (keyAction == MMI::KeyEvent::KEY_ACTION_DOWN) {
IMSA_HILOGD("key %{public}d pressed down", keyCode);
keyState_ = static_cast<uint32_t>(keyState_ | currKey->second);
if (keyCode == MMI::KeyEvent::KEYCODE_CAPS_LOCK) {
if (keyHandler_ != nullptr) {
int32_t ret = keyHandler_(keyState_);
IMSA_HILOGI("handle key event ret: %{public}d", ret);
}
isKeyHandled_ = true;
return;
}
isKeyHandled_ = false;
return;
}
if (keyAction == MMI::KeyEvent::KEY_ACTION_UP) {
if (keyHandler_ != nullptr) {
if (keyHandler_ != nullptr && !isKeyHandled_) {
int32_t ret = keyHandler_(keyState_);
IMSA_HILOGI("handle key event ret: %{public}d", ret);
}
isKeyHandled_ = true;
keyState_ = static_cast<uint32_t>(keyState_ & ~currKey->second);
}
}

1
services/include/input_method_system_ability.h
View File

@ -28,7 +28,6 @@
#include "input_method_system_ability_stub.h"
#include "inputmethod_dump.h"
#include "inputmethod_trace.h"
#include "keyboard_event.h"
#include "peruser_session.h"
#include "system_ability.h"

39
services/src/input_method_system_ability.cpp
View File

@ -23,6 +23,7 @@
#include "ability_manager_interface.h"
#include "application_info.h"
#include "bundle_mgr_proxy.h"
#include "combination_key.h"
#include "common_event_support.h"
#include "errors.h"
#include "global.h"
@ -431,7 +432,7 @@ int32_t InputMethodSystemAbility::ListDisabledInputMethod(int32_t userId, std::v
return ErrorCode::ERROR_NULL_POINTER;
}
for (auto iter = props.begin(); iter != props.end();) {
if (iter->name == filter->name && iter->id == filter->id) {
if (iter->name == filter->name) {
iter = props.erase(iter);
continue;
}
@ -996,30 +997,26 @@ int32_t InputMethodSystemAbility::SwitchByCombinationKey(uint32_t state)
IMSA_HILOGE("GetCurrentInputMethodSubtype failed");
return ErrorCode::ERROR_EX_NULL_POINTER;
}
if (KeyboardEvent::IS_KEYS_DOWN(state, KeyboardEvent::CAPS_MASK)) {
IMSA_HILOGI("CAPS press");
auto target = current->mode == "upper" ?
FindSubPropertyByCompare(current->id,
[&current](const SubProperty &property) { return property.mode == "lower"; }) :
FindSubPropertyByCompare(current->id,
[&current](const SubProperty &property) { return property.mode == "upper"; });
if (CombinationKey::IsMatch(CombinationKeyFunction::SWITCH_MODE, state)) {
IMSA_HILOGI("switch mode");
auto target = current->mode == "upper"
? FindSubPropertyByCompare(current->id,
[&current](const SubProperty &property) { return property.mode == "lower"; })
: FindSubPropertyByCompare(current->id,
[&current](const SubProperty &property) { return property.mode == "upper"; });
return SwitchInputMethod(target.id, target.label);
}
if (KeyboardEvent::IS_KEYS_DOWN(state, KeyboardEvent::SHIFT_LEFT_MASK) ||
KeyboardEvent::IS_KEYS_DOWN(state, KeyboardEvent::SHIFT_RIGHT_MASK)) {
IMSA_HILOGI("SHIFT press");
auto target = current->language == "chinese" ?
FindSubPropertyByCompare(current->id,
[&current](const SubProperty &property) { return property.language == "english"; }) :
FindSubPropertyByCompare(current->id,
[&current](const SubProperty &property) { return property.language == "chinese"; });
if (CombinationKey::IsMatch(CombinationKeyFunction::SWITCH_LANGUAGE, state)) {
IMSA_HILOGI("switch language");
auto target = current->language == "chinese"
? FindSubPropertyByCompare(current->id,
[&current](const SubProperty &property) { return property.language == "english"; })
: FindSubPropertyByCompare(current->id,
[&current](const SubProperty &property) { return property.language == "chinese"; });
return SwitchInputMethod(target.id, target.label);
}
if (KeyboardEvent::IS_KEYS_DOWN(state, KeyboardEvent::CTRL_LEFT_MASK | KeyboardEvent::SHIFT_LEFT_MASK) ||
KeyboardEvent::IS_KEYS_DOWN(state, KeyboardEvent::CTRL_LEFT_MASK | KeyboardEvent::SHIFT_RIGHT_MASK) ||
KeyboardEvent::IS_KEYS_DOWN(state, KeyboardEvent::CTRL_RIGHT_MASK | KeyboardEvent::SHIFT_LEFT_MASK) ||
KeyboardEvent::IS_KEYS_DOWN(state, KeyboardEvent::CTRL_RIGHT_MASK | KeyboardEvent::SHIFT_RIGHT_MASK)) {
IMSA_HILOGI("CTRL_SHIFT press");
if (CombinationKey::IsMatch(CombinationKeyFunction::SWITCH_IME, state)) {
IMSA_HILOGI("switch ime");
std::vector<Property> props = {};
auto ret = ListProperty(MAIN_USER_ID, props);
if (ret != ErrorCode::NO_ERROR) {