From e7f132f795d1726d8b991f4dcb84f0183c4ba49b Mon Sep 17 00:00:00 2001 From: zhouyongfei Date: Tue, 25 Jan 2022 21:20:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AF=B9=E7=89=A9=E7=90=86=E6=8C=89?= =?UTF-8?q?=E9=94=AE=E8=BF=9B=E8=A1=8C=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhouyongfei --- .../include/input_method_controller.h | 1 + .../src/input_method_controller.cpp | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/frameworks/inputmethod_controller/include/input_method_controller.h b/frameworks/inputmethod_controller/include/input_method_controller.h index 4557fdf..39c870b 100644 --- a/frameworks/inputmethod_controller/include/input_method_controller.h +++ b/frameworks/inputmethod_controller/include/input_method_controller.h @@ -91,6 +91,7 @@ namespace MiscServices { int mSelectOldEnd = 0; int mSelectNewBegin = 0; int mSelectNewEnd = 0; + int mSpecialKeyPress = 0; static std::mutex instanceLock_; static sptr instance_; diff --git a/frameworks/inputmethod_controller/src/input_method_controller.cpp b/frameworks/inputmethod_controller/src/input_method_controller.cpp index b9da9cf..4ee90a7 100644 --- a/frameworks/inputmethod_controller/src/input_method_controller.cpp +++ b/frameworks/inputmethod_controller/src/input_method_controller.cpp @@ -357,6 +357,18 @@ using namespace MessageID; if (mImms == nullptr) { return false; } + int32_t code = keyEvent->GetKeyCode(); + int32_t status = keyEvent->GetKeyAction(); + if (mSpecialKeyPress != 0) { + if ((code == MMI::KeyEvent::KEYCODE_CTRL_LEFT || code == MMI::KeyEvent::KEYCODE_CTRL_RIGHT) && status == MMI::KeyEvent::KEY_ACTION_UP) { + mSpecailKeyPress--; + } + return false; + } + if ((code == MMI::KeyEvent::KEYCODE_CTRL_LEFT || code == MMI::KeyEvent::KEYCODE_CTRL_RIGHT) && status == MMI::KeyEvent::KEY_ACTION_DOWN) { + mSpecialKeyPress++; + return false; + } MessageParcel data; if (!(data.WriteInterfaceToken(mImms->GetDescriptor()) && data.WriteRemoteObject(mClient->AsObject().GetRefPtr()) From c486fd2a07a4fcfb90623d192821e70a65c95095 Mon Sep 17 00:00:00 2001 From: zhouyongfei Date: Tue, 25 Jan 2022 22:16:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhouyongfei --- .../inputmethod_controller/include/input_method_controller.h | 2 +- .../inputmethod_controller/src/input_method_controller.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/inputmethod_controller/include/input_method_controller.h b/frameworks/inputmethod_controller/include/input_method_controller.h index 39c870b..0a6ec3b 100644 --- a/frameworks/inputmethod_controller/include/input_method_controller.h +++ b/frameworks/inputmethod_controller/include/input_method_controller.h @@ -91,7 +91,7 @@ namespace MiscServices { int mSelectOldEnd = 0; int mSelectNewBegin = 0; int mSelectNewEnd = 0; - int mSpecialKeyPress = 0; + int32_t mSpecialKeyPress = 0; static std::mutex instanceLock_; static sptr instance_; diff --git a/frameworks/inputmethod_controller/src/input_method_controller.cpp b/frameworks/inputmethod_controller/src/input_method_controller.cpp index 4ee90a7..b9f1094 100644 --- a/frameworks/inputmethod_controller/src/input_method_controller.cpp +++ b/frameworks/inputmethod_controller/src/input_method_controller.cpp @@ -361,7 +361,7 @@ using namespace MessageID; int32_t status = keyEvent->GetKeyAction(); if (mSpecialKeyPress != 0) { if ((code == MMI::KeyEvent::KEYCODE_CTRL_LEFT || code == MMI::KeyEvent::KEYCODE_CTRL_RIGHT) && status == MMI::KeyEvent::KEY_ACTION_UP) { - mSpecailKeyPress--; + mSpecialKeyPress--; } return false; }