Skip to content

Commit cb6a299

Browse files
groverlynngroverlynn
committed
capitalization modifiers
to bypass naming conflict (hyper) in Win
1 parent 816e14b commit cb6a299

File tree

12 files changed

+49
-49
lines changed

12 files changed

+49
-49
lines changed

‎src/rime/gear/ascii_composer.cc‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ AsciiComposer::~AsciiComposer() {
5656
}
5757

5858
ProcessResult AsciiComposer::ProcessKeyEvent(const KeyEvent& key_event) {
59-
if ((key_event.shift() && key_event.ctrl()) || key_event.alt() ||
60-
key_event.hyper() || key_event.super()) {
59+
if ((key_event.Shift() && key_event.Ctrl()) || key_event.Alt() ||
60+
key_event.Hyper() || key_event.Super()) {
6161
shift_key_pressed_ = ctrl_key_pressed_ = false;
6262
return kNoop;
6363
}
@@ -103,7 +103,7 @@ ProcessResult AsciiComposer::ProcessKeyEvent(const KeyEvent& key_event) {
103103
// other keys
104104
shift_key_pressed_ = ctrl_key_pressed_ = false;
105105
// possible key binding: Control+x, Shift+space
106-
if (key_event.ctrl() || (key_event.shift() && ch == XK_space)) {
106+
if (key_event.Ctrl() || (key_event.Shift() && ch == XK_space)) {
107107
return kNoop;
108108
}
109109
Context* ctx = engine_->context();
@@ -135,19 +135,19 @@ ProcessResult AsciiComposer::ProcessCapsLock(const KeyEvent& key_event) {
135135
return kRejected;
136136
}
137137
}
138-
toggle_with_caps_ = !key_event.caps();
138+
toggle_with_caps_ = !key_event.Caps();
139139
// NOTE: for Linux, Caps Lock modifier is clear when we are about to
140140
// turn it on; for Windows it is the opposite:
141141
// Caps Lock modifier has been set before we process VK_CAPITAL.
142142
// here we assume IBus' behavior and invert caps with ! operation.
143-
SwitchAsciiMode(!key_event.caps(), caps_lock_switch_style_);
143+
SwitchAsciiMode(!key_event.Caps(), caps_lock_switch_style_);
144144
return kAccepted;
145145
} else {
146146
return kRejected;
147147
}
148148
}
149-
if (key_event.caps()) {
150-
if (!good_old_caps_lock_ && !key_event.release() && !key_event.ctrl() &&
149+
if (key_event.Caps()) {
150+
if (!good_old_caps_lock_ && !key_event.release() && !key_event.Ctrl() &&
151151
isascii(ch) && isalpha(ch)) {
152152
// output ascii characters ignoring Caps Lock
153153
if (islower(ch))

‎src/rime/gear/chord_composer.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,17 @@ static const char map_to_base_layer[] = {
7575

7676
inline static int get_base_layer_key_code(const KeyEvent& key_event) {
7777
int ch = key_event.keycode();
78-
bool is_shift = key_event.shift();
78+
bool is_shift = key_event.Shift();
7979
return (is_shift && ch >= 0x20 && ch <= 0x7e) ? map_to_base_layer[ch - 0x20]
8080
: ch;
8181
}
8282

8383
ProcessResult ChordComposer::ProcessChordingKey(const KeyEvent& key_event) {
84-
if (key_event.ctrl() || key_event.alt()) {
84+
if (key_event.Ctrl() || key_event.Alt()) {
8585
raw_sequence_.clear();
8686
}
87-
if ((key_event.ctrl() && !use_control_) || (key_event.alt() && !use_alt_) ||
88-
(key_event.shift() && !use_shift_)) {
87+
if ((key_event.Ctrl() && !use_control_) || (key_event.Alt() && !use_alt_) ||
88+
(key_event.Shift() && !use_shift_)) {
8989
ClearChord();
9090
return kNoop;
9191
}

‎src/rime/gear/editor.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ ProcessResult Editor::ProcessKeyEvent(const KeyEvent& key_event) {
5555
return result;
5656
}
5757
}
58-
if (char_handler_ && !key_event.ctrl() && !key_event.alt() &&
59-
!key_event.super() && !key_event.hyper() && ch > 0x20 && ch < 0x7f) {
58+
if (char_handler_ && !key_event.Ctrl() && !key_event.Alt() &&
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/key_binding_processor_impl.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ ProcessResult KeyBindingProcessor<T, N>::ProcessKeyEvent(
2121
return kAccepted;
2222
}
2323
// try to match the fallback options
24-
if (key_event.ctrl() || key_event.alt()) {
24+
if (key_event.Ctrl() || key_event.Alt()) {
2525
return kNoop;
2626
}
27-
if (key_event.shift()) {
27+
if (key_event.Shift()) {
2828
if ((fallback_options & ShiftAsControl) != 0) {
2929
KeyEvent shift_as_control{
3030
key_event.keycode(),

‎src/rime/gear/punctuator.cc‎

Lines changed: 3 additions & 3 deletions
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
@@ -59,8 +59,8 @@ static bool punctuation_is_translated(Context* ctx) {
5959
}
6060

6161
ProcessResult Punctuator::ProcessKeyEvent(const KeyEvent& key_event) {
62-
if (key_event.release() || key_event.ctrl() || key_event.alt() ||
63-
key_event.hyper() || key_event.super())
62+
if (key_event.release() || key_event.Ctrl() || key_event.Alt() ||
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‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ Recognizer::Recognizer(const Ticket& ticket) : Processor(ticket) {
7979
}
8080

8181
ProcessResult Recognizer::ProcessKeyEvent(const KeyEvent& key_event) {
82-
if (patterns_.empty() || key_event.ctrl() || key_event.alt() ||
83-
key_event.hyper() || key_event.super() || key_event.release()) {
82+
if (patterns_.empty() || key_event.Ctrl() || key_event.Alt() ||
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‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ 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() ||
120-
key_event.super())
119+
if (key_event.release() || key_event.Alt() || key_event.Hyper() ||
120+
key_event.Super())
121121
return kNoop;
122122
Context* ctx = engine_->context();
123123
if (ctx->composition().empty())
@@ -140,7 +140,7 @@ ProcessResult Selector::ProcessKeyEvent(const KeyEvent& key_event) {
140140
int ch = key_event.keycode();
141141
int index = -1;
142142
const string& select_keys(engine_->schema()->select_keys());
143-
if (!select_keys.empty() && !key_event.ctrl() && ch >= 0x20 && ch < 0x7f) {
143+
if (!select_keys.empty() && !key_event.Ctrl() && ch >= 0x20 && ch < 0x7f) {
144144
size_t pos = select_keys.find((char)ch);
145145
if (pos != string::npos) {
146146
index = static_cast<int>(pos);

‎src/rime/gear/shape.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ 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() ||
43-
key_event.super() || key_event.release()) {
42+
if (key_event.Ctrl() || key_event.Alt() || key_event.Hyper() ||
43+
key_event.Super() || key_event.release()) {
4444
return kNoop;
4545
}
4646
int ch = key_event.keycode();

‎src/rime/gear/speller.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,13 @@ Speller::Speller(const Ticket& ticket)
9292
}
9393

9494
ProcessResult Speller::ProcessKeyEvent(const KeyEvent& key_event) {
95-
if (key_event.release() || key_event.ctrl() || key_event.alt() ||
96-
key_event.hyper() || key_event.super())
95+
if (key_event.release() || key_event.Ctrl() || key_event.Alt() ||
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
100100
return kNoop;
101-
if (ch == XK_space && (!use_space_ || key_event.shift()))
101+
if (ch == XK_space && (!use_space_ || key_event.Shift()))
102102
return kNoop;
103103
if (!belongs_to(ch, alphabet_) && !belongs_to(ch, delimiters_))
104104
return kNoop;

‎src/rime/key_event.h‎

Lines changed: 7 additions & 7 deletions
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
@@ -26,12 +26,12 @@ class KeyEvent {
2626
int modifier() const { return modifier_; }
2727
void modifier(int value) { modifier_ = value; }
2828

29-
bool shift() const { return (modifier_ & kShiftMask) != 0; }
30-
bool ctrl() const { return (modifier_ & kControlMask) != 0; }
31-
bool alt() const { return (modifier_ & kAltMask) != 0; }
32-
bool caps() const { return (modifier_ & kLockMask) != 0; }
33-
bool super() const { return (modifier_ & kSuperMask) != 0; }
34-
bool hyper() const { return (modifier_ & kHyperMask) != 0; }
29+
bool Shift() const { return (modifier_ & kShiftMask) != 0; }
30+
bool Ctrl() const { return (modifier_ & kControlMask) != 0; }
31+
bool Alt() const { return (modifier_ & kAltMask) != 0; }
32+
bool Caps() const { return (modifier_ & kLockMask) != 0; }
33+
bool Super() const { return (modifier_ & kSuperMask) != 0; }
34+
bool Hyper() const { return (modifier_ & kHyperMask) != 0; }
3535
bool release() const { return (modifier_ & kReleaseMask) != 0; }
3636
// 按鍵表示為形如「狀態+鍵名」的文字
3737
// 若無鍵名，則以四位或六位十六进制数形式的文字來標識

0 commit comments

Comments
 (0)