Distinguish basic from non-basic keycodes

Author: ids1024

backend/src/layout/mod.rs

@@ -1,3 +1,4 @@
+use once_cell::sync::Lazy;
 use std::{collections::HashMap, fs, path::Path};
 
 mod meta;
@@ -61,6 +62,14 @@ macro_rules! keyboards {
 // Calls the `keyboards!` macro
 include!(concat!(env!("OUT_DIR"), "/keyboards.rs"));
 
+pub fn is_qmk_basic(name: &str) -> bool {
+    static QMK_KEYMAP: Lazy<HashMap<String, u16>> =
+        Lazy::new(|| parse_keymap_json(layout_data("system76/launch_1").unwrap().2).0);
+    QMK_KEYMAP
+        .get(name)
+        .map_or(false, |scancode| *scancode <= 0xff)
+}
+
 impl Layout {
     pub fn from_data(
         meta_json: &str,

src/picker/mod.rs

@@ -13,7 +13,7 @@ use std::{
 };
 
 use crate::Keyboard;
-use backend::{DerefCell, Keycode, Mods};
+use backend::{is_qmk_basic, DerefCell, Keycode, Mods};
 
 mod picker_group;
 mod picker_group_box;
@@ -271,7 +271,6 @@ impl Picker {
         }
 
         for group_box in self.inner().group_boxes.iter() {
-            // TODO: What to allow?
             group_box.set_key_sensitivity(|name| {
                 if ["LEFT_SHIFT", "LEFT_ALT", "LEFT_CTRL", "LEFT_SUPER"].contains(&name) {
                     allow_left_mods
@@ -280,10 +279,11 @@ impl Picker {
                     allow_right_mods
                 } else if basic_keycode.as_deref() == Some(name) && !keycode_mods.is_empty() {
                     true
-                } else {
+                } else if is_qmk_basic(name) {
                     allow_basic
+                } else {
+                    allow_non_basic
                 }
-                // XXX non-basic?
             });
         }
     }

src/picker/tap_hold.rs

@@ -9,7 +9,7 @@ use once_cell::sync::Lazy;
 use std::cell::{Cell, RefCell};
 
 use super::{picker_group_box::PickerGroupBox, PickerKey, SCANCODE_LABELS};
-use backend::{DerefCell, Keycode, Mods};
+use backend::{is_qmk_basic, DerefCell, Keycode, Mods};
 
 #[derive(Clone, Copy)]
 enum Hold {
@@ -67,16 +67,14 @@ impl ObjectImpl for TapHoldInner {
     fn constructed(&self, widget: &Self::Type) {
         self.parent_constructed(widget);
 
-        let layout = backend::Layout::from_board("system76/launch_1").unwrap();
-
         let picker_group_box = cascade! {
             PickerGroupBox::new("basics");
             ..connect_key_pressed(clone!(@weak widget => move |name, _shift| {
                 *widget.inner().keycode.borrow_mut() = Some(name);
                 widget.update();
             }));
             // Correct?
-            ..set_key_visibility(|name| layout.scancode_from_name(&Keycode::Basic(Mods::empty(), name.to_string())).map_or(false, |code| code <= 0xff));
+            ..set_key_visibility(|name| is_qmk_basic(name));
         };
 
         let modifier_button_box = cascade! {