Improve state manaagement in tap-hold

Author: ids1024

src/picker/mod.rs

@@ -74,7 +74,7 @@ impl ObjectImpl for PickerInner {
 
         let tap_hold = cascade! {
             tap_hold::TapHold::new();
-            ..connect_selected(clone!(@weak picker => move |keycode| {
+            ..connect_select(clone!(@weak picker => move |keycode| {
                 picker.set_keycode(keycode);
             }));
         };

src/picker/tap_hold.rs

@@ -56,7 +56,7 @@ impl ObjectImpl for TapHoldInner {
     fn signals() -> &'static [Signal] {
         static SIGNALS: Lazy<Vec<Signal>> = Lazy::new(|| {
             vec![Signal::builder(
-                "selected",
+                "select",
                 &[Keycode::static_type().into()],
                 glib::Type::UNIT.into(),
             )
@@ -177,18 +177,17 @@ impl TapHold {
         match self.inner().hold.get() {
             Hold::Mods(mods) => {
                 if !mods.is_empty() {
-                    self.emit_by_name::<()>("selected", &[&Keycode::MT(mods, keycode.to_string())]);
+                    self.emit_by_name::<()>("select", &[&Keycode::MT(mods, keycode.to_string())]);
                 }
             }
             Hold::Layer(layer) => {
-                self.emit_by_name::<()>("selected", &[&Keycode::LT(layer, keycode.to_string())]);
+                self.emit_by_name::<()>("select", &[&Keycode::LT(layer, keycode.to_string())]);
             }
         }
     }
 
-    // XXX naming vs set_selected
-    pub fn connect_selected<F: Fn(Keycode) + 'static>(&self, cb: F) -> glib::SignalHandlerId {
-        self.connect_local("selected", false, move |values| {
+    pub fn connect_select<F: Fn(Keycode) + 'static>(&self, cb: F) -> glib::SignalHandlerId {
+        self.connect_local("select", false, move |values| {
             cb(values[1].get::<Keycode>().unwrap());
             None
         })
@@ -206,10 +205,7 @@ impl TapHold {
             Default::default()
         };
 
-        // TODO how to deal with internal state?
-
         for i in self.inner().mod_buttons.iter() {
-            // XXX left vs right
             let mod_ = Mods::from_mod_str(i.name()).unwrap();
             i.set_selected(
                 mods.contains(mod_) && (mods.contains(Mods::RIGHT) == mod_.contains(Mods::RIGHT)),
@@ -220,14 +216,21 @@ impl TapHold {
             i.set_selected(Some(n as u8) == layer);
         }
 
-        if let Some(keycode) = keycode {
+        if let Some(keycode) = keycode.clone() {
             self.inner()
                 .picker_group_box
                 .set_selected(vec![Keycode::Basic(Mods::empty(), keycode)]);
         } else {
             self.inner().picker_group_box.set_selected(Vec::new());
         }
 
+        self.inner().hold.set(if let Some(layer) = layer {
+            Hold::Layer(layer)
+        } else {
+            Hold::Mods(mods)
+        });
+        *self.inner().keycode.borrow_mut() = keycode;
+
         self.invalidate_sensitivity();
     }