From be406a359700653f28420b0e531dfc4df5a4e14c Mon Sep 17 00:00:00 2001 From: ksqsf Date: Tue, 6 Feb 2024 15:05:43 +0800 Subject: [PATCH 1/2] fix: chord_composer should reject super and caps by default --- src/rime/gear/chord_composer.cc | 7 +++++-- src/rime/gear/chord_composer.h | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/rime/gear/chord_composer.cc b/src/rime/gear/chord_composer.cc index 639fcbde44..1a1a6eaec6 100644 --- a/src/rime/gear/chord_composer.cc +++ b/src/rime/gear/chord_composer.cc @@ -25,6 +25,8 @@ ChordComposer::ChordComposer(const Ticket& ticket) : Processor(ticket) { config->GetBool("chord_composer/use_control", &use_control_); config->GetBool("chord_composer/use_alt", &use_alt_); config->GetBool("chord_composer/use_shift", &use_shift_); + config->GetBool("chord_composer/use_super", &use_super_); + config->GetBool("chord_composer/use_caps", &use_caps_); config->GetString("speller/delimiter", &delimiter_); algebra_.Load(config->GetList("chord_composer/algebra")); output_format_.Load(config->GetList("chord_composer/output_format")); @@ -81,11 +83,12 @@ inline static int get_base_layer_key_code(const KeyEvent& key_event) { } ProcessResult ChordComposer::ProcessChordingKey(const KeyEvent& key_event) { - if (key_event.ctrl() || key_event.alt()) { + if (key_event.ctrl() || key_event.alt() || key_event.super() || key_event.caps()) { raw_sequence_.clear(); } if ((key_event.ctrl() && !use_control_) || (key_event.alt() && !use_alt_) || - (key_event.shift() && !use_shift_)) { + (key_event.shift() && !use_shift_) || (key_event.super() && !use_super_) || + (key_event.caps() && !use_caps_)) { ClearChord(); return kNoop; } diff --git a/src/rime/gear/chord_composer.h b/src/rime/gear/chord_composer.h index 4afa20c036..31259edb32 100644 --- a/src/rime/gear/chord_composer.h +++ b/src/rime/gear/chord_composer.h @@ -41,6 +41,8 @@ class ChordComposer : public Processor { bool use_control_ = false; bool use_alt_ = false; bool use_shift_ = false; + bool use_super_ = false; + bool use_caps_ = false; set pressed_; set chord_; From b441aa00acd20248303f460506e260839ccaa645 Mon Sep 17 00:00:00 2001 From: ksqsf Date: Tue, 6 Feb 2024 15:45:31 +0800 Subject: [PATCH 2/2] fix: lint --- src/rime/gear/chord_composer.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/rime/gear/chord_composer.cc b/src/rime/gear/chord_composer.cc index 1a1a6eaec6..6ace5adf02 100644 --- a/src/rime/gear/chord_composer.cc +++ b/src/rime/gear/chord_composer.cc @@ -83,12 +83,13 @@ inline static int get_base_layer_key_code(const KeyEvent& key_event) { } ProcessResult ChordComposer::ProcessChordingKey(const KeyEvent& key_event) { - if (key_event.ctrl() || key_event.alt() || key_event.super() || key_event.caps()) { + if (key_event.ctrl() || key_event.alt() || key_event.super() || + key_event.caps()) { raw_sequence_.clear(); } if ((key_event.ctrl() && !use_control_) || (key_event.alt() && !use_alt_) || - (key_event.shift() && !use_shift_) || (key_event.super() && !use_super_) || - (key_event.caps() && !use_caps_)) { + (key_event.shift() && !use_shift_) || + (key_event.super() && !use_super_) || (key_event.caps() && !use_caps_)) { ClearChord(); return kNoop; }