File tree 8 files changed +10
-10
lines changed
8 files changed +10
-10
lines changed Original file line number Diff line number Diff line change @@ -57,7 +57,7 @@ AsciiComposer::~AsciiComposer() {
57
57
58
58
ProcessResult AsciiComposer::ProcessKeyEvent (const KeyEvent& key_event) {
59
59
if ((key_event.shift () && key_event.ctrl ()) || key_event.alt () ||
60
- key_event.hyper () || key_event.super ()) {
60
+ key_event.Hyper () || key_event.super ()) {
61
61
shift_key_pressed_ = ctrl_key_pressed_ = false ;
62
62
return kNoop ;
63
63
}
Original file line number Diff line number Diff line change @@ -56,7 +56,7 @@ ProcessResult Editor::ProcessKeyEvent(const KeyEvent& key_event) {
56
56
}
57
57
}
58
58
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 ) {
60
60
DLOG (INFO) << " input char: '" << (char )ch << " ', " << ch << " , '"
61
61
<< key_event.repr () << " '" ;
62
62
return RIME_THIS_CALL (char_handler_)(ctx, ch);
Original file line number Diff line number Diff line change 1
- // encoding: utf-8
1
+ // encoding: utf-8
2
2
//
3
3
// Copyright RIME Developers
4
4
// Distributed under the BSD License
@@ -60,7 +60,7 @@ static bool punctuation_is_translated(Context* ctx) {
60
60
61
61
ProcessResult Punctuator::ProcessKeyEvent (const KeyEvent& key_event) {
62
62
if (key_event.release () || key_event.ctrl () || key_event.alt () ||
63
- key_event.hyper () || key_event.super ())
63
+ key_event.Hyper () || key_event.super ())
64
64
return kNoop ;
65
65
int ch = key_event.keycode ();
66
66
if (ch < 0x20 || ch >= 0x7f )
Original file line number Diff line number Diff line change @@ -80,7 +80,7 @@ Recognizer::Recognizer(const Ticket& ticket) : Processor(ticket) {
80
80
81
81
ProcessResult Recognizer::ProcessKeyEvent (const KeyEvent& key_event) {
82
82
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 ()) {
84
84
return kNoop ;
85
85
}
86
86
int ch = key_event.keycode ();
Original file line number Diff line number Diff line change @@ -116,7 +116,7 @@ inline static bool is_linear_layout(Context* ctx) {
116
116
}
117
117
118
118
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 () ||
120
120
key_event.super ())
121
121
return kNoop ;
122
122
Context* ctx = engine_->context ();
Original file line number Diff line number Diff line change @@ -39,7 +39,7 @@ ProcessResult ShapeProcessor::ProcessKeyEvent(const KeyEvent& key_event) {
39
39
if (!engine_->context ()->get_option (" full_shape" )) {
40
40
return kNoop ;
41
41
}
42
- if (key_event.ctrl () || key_event.alt () || key_event.hyper () ||
42
+ if (key_event.ctrl () || key_event.alt () || key_event.Hyper () ||
43
43
key_event.super () || key_event.release ()) {
44
44
return kNoop ;
45
45
}
Original file line number Diff line number Diff line change @@ -93,7 +93,7 @@ Speller::Speller(const Ticket& ticket)
93
93
94
94
ProcessResult Speller::ProcessKeyEvent (const KeyEvent& key_event) {
95
95
if (key_event.release () || key_event.ctrl () || key_event.alt () ||
96
- key_event.hyper () || key_event.super ())
96
+ key_event.Hyper () || key_event.super ())
97
97
return kNoop ;
98
98
int ch = key_event.keycode ();
99
99
if (ch < 0x20 || ch >= 0x7f ) // not a valid key for spelling
Original file line number Diff line number Diff line change 1
- // encoding: utf-8
1
+ // encoding: utf-8
2
2
//
3
3
// Copyright RIME Developers
4
4
// Distributed under the BSD License
@@ -31,7 +31,7 @@ class KeyEvent {
31
31
bool alt () const { return (modifier_ & kAltMask ) != 0 ; }
32
32
bool caps () const { return (modifier_ & kLockMask ) != 0 ; }
33
33
bool super () const { return (modifier_ & kSuperMask ) != 0 ; }
34
- bool hyper () const { return (modifier_ & kHyperMask ) != 0 ; }
34
+ bool Hyper () const { return (modifier_ & kHyperMask ) != 0 ; }
35
35
bool release () const { return (modifier_ & kReleaseMask ) != 0 ; }
36
36
// 按鍵表示為形如「狀態+鍵名」的文字
37
37
// 若無鍵名,則以四位或六位十六进制数形式的文字來標識
You can’t perform that action at this time.
0 commit comments