allow using keypad to select candidate in scroll mode (#275)

Author: eagleoflqj

assets/po/zh_CN.po

@@ -111,7 +111,7 @@ msgstr "闪烁"
 msgid "Static"
 msgstr "静止"
 
-#: webpanel/webpanel.h:30 webpanel/webpanel.h:34 webpanel/webpanel.h:289
+#: webpanel/webpanel.h:30 webpanel/webpanel.h:34 webpanel/webpanel.h:290
 msgid "Text"
 msgstr "文本"
 
@@ -291,210 +291,218 @@ msgstr "下一页"
 msgid "Commit"
 msgstr "提交"
 
-#: webpanel/webpanel.h:228
+#: webpanel/webpanel.h:226
 msgid "Select candidate"
 msgstr "选词"
 
-#: webpanel/webpanel.h:233
+#: webpanel/webpanel.h:229
+msgid "Use main keyboard number keys to select candidate"
+msgstr "用主键盘数字键选词"
+
+#: webpanel/webpanel.h:232
+msgid "Use keypad number keys to select candidate"
+msgstr "用小键盘数字键选词"
+
+#: webpanel/webpanel.h:234
 msgid "Optimize for Hyper key"
 msgstr "针对 Hyper 键优化"
 
-#: webpanel/webpanel.h:239
+#: webpanel/webpanel.h:240
 msgid "Layout"
 msgstr "布局"
 
-#: webpanel/webpanel.h:243
+#: webpanel/webpanel.h:244
 msgid "Writing mode"
 msgstr "书写模式"
 
-#: webpanel/webpanel.h:246
+#: webpanel/webpanel.h:247
 msgid "Typography awareness for IM"
 msgstr "输入法感知版式"
 
-#: webpanel/webpanel.h:250
+#: webpanel/webpanel.h:251
 msgid "Paging buttons style"
 msgstr "翻页按钮样式"
 
-#: webpanel/webpanel.h:255
+#: webpanel/webpanel.h:256
 msgid "Image"
 msgstr "图片"
 
-#: webpanel/webpanel.h:256
+#: webpanel/webpanel.h:257
 msgid "Blur"
 msgstr "模糊"
 
-#: webpanel/webpanel.h:257
+#: webpanel/webpanel.h:258
 msgid "Shadow"
 msgstr "阴影"
 
-#: webpanel/webpanel.h:265
+#: webpanel/webpanel.h:266
 msgid "Text font family"
 msgstr "文本字体族"
 
-#: webpanel/webpanel.h:267
+#: webpanel/webpanel.h:268
 msgid "Text font size"
 msgstr "文本字号"
 
-#: webpanel/webpanel.h:269
+#: webpanel/webpanel.h:270
 msgid "Label font family"
 msgstr "标签字体族"
 
-#: webpanel/webpanel.h:271
+#: webpanel/webpanel.h:272
 msgid "Label font size"
 msgstr "标签字号"
 
-#: webpanel/webpanel.h:273
+#: webpanel/webpanel.h:274
 msgid "Comment font family"
 msgstr "注释字体族"
 
-#: webpanel/webpanel.h:275
+#: webpanel/webpanel.h:276
 msgid "Comment font size"
 msgstr "注释字号"
 
-#: webpanel/webpanel.h:278
+#: webpanel/webpanel.h:279
 msgid "Preedit font family"
 msgstr "预编辑字体族"
 
-#: webpanel/webpanel.h:280
+#: webpanel/webpanel.h:281
 msgid "Preedit font size"
 msgstr "预编辑字号"
 
-#: webpanel/webpanel.h:282
+#: webpanel/webpanel.h:283
 msgid "User font dir"
 msgstr "用户字体目录"
 
-#: webpanel/webpanel.h:283
+#: webpanel/webpanel.h:284
 msgid "System font dir"
 msgstr "系统字体目录"
 
-#: webpanel/webpanel.h:288
+#: webpanel/webpanel.h:289
 msgid "Style"
 msgstr "样式"
 
-#: webpanel/webpanel.h:294
+#: webpanel/webpanel.h:295
 msgid "Mark style"
 msgstr "标记样式"
 
-#: webpanel/webpanel.h:295
+#: webpanel/webpanel.h:296
 msgid "Mark text"
 msgstr "标记文本"
 
-#: webpanel/webpanel.h:297
+#: webpanel/webpanel.h:298
 msgid "Hover behavior"
 msgstr "悬停行为"
 
-#: webpanel/webpanel.h:303
+#: webpanel/webpanel.h:304
 msgid "Border width (px)"
 msgstr "边框宽度（px）"
 
-#: webpanel/webpanel.h:306
+#: webpanel/webpanel.h:307
 msgid "Border radius (px)"
 msgstr "边框半径（px）"
 
-#: webpanel/webpanel.h:307
+#: webpanel/webpanel.h:308
 msgid "Margin (px)"
 msgstr "外边距（px）"
 
-#: webpanel/webpanel.h:310
+#: webpanel/webpanel.h:311
 msgid "Highlight radius (px)"
 msgstr "高亮半径（px）"
 
-#: webpanel/webpanel.h:313
+#: webpanel/webpanel.h:314
 msgid "Top padding (px)"
 msgstr "顶填充（px）"
 
-#: webpanel/webpanel.h:315
+#: webpanel/webpanel.h:316
 msgid "Right padding (px)"
 msgstr "右填充（px）"
 
-#: webpanel/webpanel.h:317
+#: webpanel/webpanel.h:318
 msgid "Bottom padding (px)"
 msgstr "底填充（px）"
 
-#: webpanel/webpanel.h:320
+#: webpanel/webpanel.h:321
 msgid "Left padding (px)"
 msgstr "左填充（px）"
 
-#: webpanel/webpanel.h:322
+#: webpanel/webpanel.h:323
 msgid "Gap between label, text and comment (px)"
 msgstr "标签、文本、注释间隔（px）"
 
-#: webpanel/webpanel.h:325
+#: webpanel/webpanel.h:326
 msgid "Vertical minimum width (px)"
 msgstr "垂直时最小宽度（px）"
 
-#: webpanel/webpanel.h:328
+#: webpanel/webpanel.h:329
 msgid "Scroll cell width (px)"
 msgstr "卷轴单元格宽度 (px)"
 
-#: webpanel/webpanel.h:331
+#: webpanel/webpanel.h:332
 msgid "Horizontal divider width (px)"
 msgstr "水平分隔线宽度（px）"
 
-#: webpanel/webpanel.h:340
+#: webpanel/webpanel.h:341
 msgid "User CSS"
 msgstr "用户 CSS"
 
-#: webpanel/webpanel.h:341
+#: webpanel/webpanel.h:342
 msgid "Copy HTML"
 msgstr "复制 HTML"
 
-#: webpanel/webpanel.h:342
+#: webpanel/webpanel.h:343
 msgid "Plugin dir"
 msgstr "插件目录"
 
-#: webpanel/webpanel.h:344
+#: webpanel/webpanel.h:345
 msgid "I know there may be risks for using plugins"
 msgstr "我知道使用插件可能有风险"
 
-#: webpanel/webpanel.h:347
+#: webpanel/webpanel.h:348
 msgid "Plugins"
 msgstr "插件"
 
-#: webpanel/webpanel.h:349
+#: webpanel/webpanel.h:350
 msgid "Dangerous API for JavaScript plugins"
 msgstr "用于 JavaScript 插件的危险 API"
 
-#: webpanel/webpanel.h:352
+#: webpanel/webpanel.h:353
 msgid "Basic"
 msgstr "基础"
 
-#: webpanel/webpanel.h:353
+#: webpanel/webpanel.h:354
 msgid "Light mode"
 msgstr "浅色模式"
 
-#: webpanel/webpanel.h:354
+#: webpanel/webpanel.h:355
 msgid "Dark mode"
 msgstr "深色模式"
 
-#: webpanel/webpanel.h:355
+#: webpanel/webpanel.h:356
 msgid "Typography"
 msgstr "版式"
 
-#: webpanel/webpanel.h:356
+#: webpanel/webpanel.h:357
 msgid "Scroll mode"
 msgstr "卷轴模式"
 
-#: webpanel/webpanel.h:357
+#: webpanel/webpanel.h:358
 msgid "Background"
 msgstr "背景"
 
-#: webpanel/webpanel.h:358
+#: webpanel/webpanel.h:359
 msgid "Font"
 msgstr "字体"
 
-#: webpanel/webpanel.h:359
+#: webpanel/webpanel.h:360
 msgid "Caret"
 msgstr "光标"
 
-#: webpanel/webpanel.h:360
+#: webpanel/webpanel.h:361
 msgid "Highlight"
 msgstr "高亮"
 
-#: webpanel/webpanel.h:361
+#: webpanel/webpanel.h:362
 msgid "Size"
 msgstr "尺寸"
 
-#: webpanel/webpanel.h:362
+#: webpanel/webpanel.h:363
 msgid "Advanced"
 msgstr "高级"

webpanel/webpanel.cpp

@@ -176,13 +176,40 @@ WebPanel::WebPanel(Instance *instance)
                         candidate_window::scroll_key_action_t::nine,
                         candidate_window::scroll_key_action_t::zero,
                     };
+                static const KeyList mainKeyboardNumberKeys = {
+                    Key(FcitxKey_1), Key(FcitxKey_2), Key(FcitxKey_3),
+                    Key(FcitxKey_4), Key(FcitxKey_5), Key(FcitxKey_6),
+                    Key(FcitxKey_7), Key(FcitxKey_8), Key(FcitxKey_9),
+                    Key(FcitxKey_0)};
+                static const KeyList keypadNumberKeys = {
+                    Key(FcitxKey_KP_1), Key(FcitxKey_KP_2), Key(FcitxKey_KP_3),
+                    Key(FcitxKey_KP_4), Key(FcitxKey_KP_5), Key(FcitxKey_KP_6),
+                    Key(FcitxKey_KP_7), Key(FcitxKey_KP_8), Key(FcitxKey_KP_9),
+                    Key(FcitxKey_KP_0)};
+                int keyIndex = -1;
                 if (int i =
                         key.keyListIndex(*config_.scrollMode->selectCandidate);
-                    i >= 0 && i < selectActions.size()) {
+                    i >= 0 && i < 10) {
+                    keyIndex = i;
+                }
+                if (keyIndex < 0 &&
+                    *config_.scrollMode->useMainKeyboardNumberKeys) {
+                    int i = key.keyListIndex(mainKeyboardNumberKeys);
+                    if (i >= 0 && i < 10) {
+                        keyIndex = i;
+                    }
+                }
+                if (keyIndex < 0 && *config_.scrollMode->useKeypadNumberKeys) {
+                    int i = key.keyListIndex(keypadNumberKeys);
+                    if (i >= 0 && i < 10) {
+                        keyIndex = i;
+                    }
+                }
+                if (keyIndex >= 0) {
                     if (keyEvent.isRelease()) {
                         return;
                     }
-                    window_->scroll_key_action(selectActions[i]);
+                    window_->scroll_key_action(selectActions[keyIndex]);
                     return keyEvent.filterAndAccept();
                 }
                 const std::vector<std::pair<

webpanel/webpanel.h

@@ -223,12 +223,13 @@ FCITX_CONFIGURATION(
         this, "PageDown", _("Page down"), {Key(FcitxKey_Page_Down)}};
     Option<KeyList> commit{this, "Commit", _("Commit"), {Key(FcitxKey_space)}};
     Option<KeyList> selectCandidate{
-        this,
-        "SelectCandidate",
-        _("Select candidate"),
-        {Key(FcitxKey_1), Key(FcitxKey_2), Key(FcitxKey_3), Key(FcitxKey_4),
-         Key(FcitxKey_5), Key(FcitxKey_6), Key(FcitxKey_7), Key(FcitxKey_8),
-         Key(FcitxKey_9), Key(FcitxKey_0)}};
+        this, "SelectCandidate", _("Select candidate"), {}};
+    Option<bool> useMainKeyboardNumberKeys{
+        this, "UseMainKeyboardNumberKeys",
+        _("Use main keyboard number keys to select candidate"), true};
+    Option<bool> useKeypadNumberKeys{
+        this, "UseKeypadNumberKeys",
+        _("Use keypad number keys to select candidate"), false};
     Option<bool> optimizeForHyperKey{this, "OptimizeForHyperKey",
                                      _("Optimize for Hyper key"), true};);