Skip to content

Commit c9722dd

Browse files
committed
Update key_event.h
1 parent 816e14b commit c9722dd

8 files changed

+10
-10
lines changed

src/rime/gear/ascii_composer.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ AsciiComposer::~AsciiComposer() {
5757

5858
ProcessResult AsciiComposer::ProcessKeyEvent(const KeyEvent& key_event) {
5959
if ((key_event.shift() && key_event.ctrl()) || key_event.alt() ||
60-
key_event.hyper() || key_event.super()) {
60+
key_event.Hyper() || key_event.super()) {
6161
shift_key_pressed_ = ctrl_key_pressed_ = false;
6262
return kNoop;
6363
}

src/rime/gear/editor.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ ProcessResult Editor::ProcessKeyEvent(const KeyEvent& key_event) {
5656
}
5757
}
5858
if (char_handler_ && !key_event.ctrl() && !key_event.alt() &&
59-
!key_event.super() && !key_event.hyper() && ch > 0x20 && ch < 0x7f) {
59+
!key_event.super() && !key_event.Hyper() && ch > 0x20 && ch < 0x7f) {
6060
DLOG(INFO) << "input char: '" << (char)ch << "', " << ch << ", '"
6161
<< key_event.repr() << "'";
6262
return RIME_THIS_CALL(char_handler_)(ctx, ch);

src/rime/gear/punctuator.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// encoding: utf-8
1+
// encoding: utf-8
22
//
33
// Copyright RIME Developers
44
// Distributed under the BSD License
@@ -60,7 +60,7 @@ static bool punctuation_is_translated(Context* ctx) {
6060

6161
ProcessResult Punctuator::ProcessKeyEvent(const KeyEvent& key_event) {
6262
if (key_event.release() || key_event.ctrl() || key_event.alt() ||
63-
key_event.hyper() || key_event.super())
63+
key_event.Hyper() || key_event.super())
6464
return kNoop;
6565
int ch = key_event.keycode();
6666
if (ch < 0x20 || ch >= 0x7f)

src/rime/gear/recognizer.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Recognizer::Recognizer(const Ticket& ticket) : Processor(ticket) {
8080

8181
ProcessResult Recognizer::ProcessKeyEvent(const KeyEvent& key_event) {
8282
if (patterns_.empty() || key_event.ctrl() || key_event.alt() ||
83-
key_event.hyper() || key_event.super() || key_event.release()) {
83+
key_event.Hyper() || key_event.super() || key_event.release()) {
8484
return kNoop;
8585
}
8686
int ch = key_event.keycode();

src/rime/gear/selector.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ inline static bool is_linear_layout(Context* ctx) {
116116
}
117117

118118
ProcessResult Selector::ProcessKeyEvent(const KeyEvent& key_event) {
119-
if (key_event.release() || key_event.alt() || key_event.hyper() ||
119+
if (key_event.release() || key_event.alt() || key_event.Hyper() ||
120120
key_event.super())
121121
return kNoop;
122122
Context* ctx = engine_->context();

src/rime/gear/shape.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ ProcessResult ShapeProcessor::ProcessKeyEvent(const KeyEvent& key_event) {
3939
if (!engine_->context()->get_option("full_shape")) {
4040
return kNoop;
4141
}
42-
if (key_event.ctrl() || key_event.alt() || key_event.hyper() ||
42+
if (key_event.ctrl() || key_event.alt() || key_event.Hyper() ||
4343
key_event.super() || key_event.release()) {
4444
return kNoop;
4545
}

src/rime/gear/speller.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ Speller::Speller(const Ticket& ticket)
9393

9494
ProcessResult Speller::ProcessKeyEvent(const KeyEvent& key_event) {
9595
if (key_event.release() || key_event.ctrl() || key_event.alt() ||
96-
key_event.hyper() || key_event.super())
96+
key_event.Hyper() || key_event.super())
9797
return kNoop;
9898
int ch = key_event.keycode();
9999
if (ch < 0x20 || ch >= 0x7f) // not a valid key for spelling

src/rime/key_event.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// encoding: utf-8
1+
// encoding: utf-8
22
//
33
// Copyright RIME Developers
44
// Distributed under the BSD License
@@ -31,7 +31,7 @@ class KeyEvent {
3131
bool alt() const { return (modifier_ & kAltMask) != 0; }
3232
bool caps() const { return (modifier_ & kLockMask) != 0; }
3333
bool super() const { return (modifier_ & kSuperMask) != 0; }
34-
bool hyper() const { return (modifier_ & kHyperMask) != 0; }
34+
bool Hyper() const { return (modifier_ & kHyperMask) != 0; }
3535
bool release() const { return (modifier_ & kReleaseMask) != 0; }
3636
// 按鍵表示為形如「狀態+鍵名」的文字
3737
// 若無鍵名,則以四位或六位十六进制数形式的文字來標識

0 commit comments

Comments
 (0)