Add mouse action and binds instead

Author: Fixerer

anyrun/src/config.rs

@@ -40,6 +40,10 @@ pub struct Config {
     #[config_args(skip)]
     #[serde(default = "Config::default_keybinds")]
     pub keybinds: Vec<Keybind>,
+
+    #[config_args(skip)]
+    #[serde(default = "Config::default_mousebinds")]
+    pub mousebinds: Vec<Mousebind>,
 }
 impl Config {
     fn default_x() -> RelativeNum {
@@ -103,6 +107,19 @@ impl Config {
             },
         ]
     }
+
+    fn default_mousebinds() -> Vec<Mousebind> {
+        vec![
+            Mousebind {
+                button: MouseButton::Primary,
+                action: Action::Select,
+            },
+            Mousebind {
+                button: MouseButton::Secondary,
+                action: Action::Nop,
+            },
+        ]
+    }
 }
 impl Default for Config {
     fn default() -> Self {
@@ -121,6 +138,7 @@ impl Default for Config {
             layer: Self::default_layer(),
             keyboard_mode: Self::default_keyboard_mode(),
             keybinds: Self::default_keybinds(),
+            mousebinds: Self::default_mousebinds(),
         }
     }
 }
@@ -173,6 +191,21 @@ pub enum Action {
     Select,
     Up,
     Down,
+    Nop,
+}
+
+#[derive(Deserialize, Debug, Clone, Copy, PartialEq)]
+pub enum MouseButton {
+    Primary,
+    Secondary,
+    Middle,
+    Unknown,
+}
+
+#[derive(Deserialize, Debug, Clone, Copy)]
+pub struct Mousebind {
+    pub button: MouseButton,
+    pub action: Action,
 }
 
 #[derive(Deserialize, Clone)]

anyrun/src/main.rs

@@ -16,7 +16,7 @@ use relm4::prelude::*;
 use wl_clipboard_rs::copy;
 
 use crate::{
-    config::{Action, Config, ConfigArgs, Keybind},
+    config::{Action, Config, ConfigArgs, Keybind, Mousebind},
     plugin_box::{PluginBox, PluginBoxInput, PluginBoxOutput, PluginMatch},
 };
 
@@ -106,6 +106,22 @@ impl App {
                 (i, plugin, plugin_match)
             })
     }
+
+    fn select_row(&self, plugin_ind: DynamicIndex, match_ind: DynamicIndex) {
+        // Select match row
+        for (i, plugin) in self.plugins.iter().enumerate() {
+            if i == plugin_ind.current_index() {
+                for (j, plugin_match) in plugin.matches.iter().enumerate() {
+                    if j == match_ind.current_index() {
+                        plugin
+                            .matches
+                            .widget()
+                            .select_row(Option::<&gtk::ListBoxRow>::Some(&plugin_match.row));
+                    }
+                }
+            }
+        }
+    }
 }
 
 #[relm4::component]
@@ -377,6 +393,7 @@ impl Component for App {
                 }
             }
             AppMsg::Action(action) => match action {
+                Action::Nop => {}
                 Action::Close => {
                     root.close();
                     relm4::main_application().quit();
@@ -472,8 +489,25 @@ impl Component for App {
                     }
                 }
             }
-            AppMsg::PluginOutput(PluginBoxOutput::MatchClicked) => {
-                sender.input(AppMsg::Action(Action::Select));
+            AppMsg::PluginOutput(PluginBoxOutput::MouseAction(button, match_ind, plugin_ind)) => {
+                // Handle binding
+                if let Some(Mousebind { action, .. }) = self
+                    .config
+                    .mousebinds
+                    .iter()
+                    .find(|mousebind| mousebind.button == button)
+                {
+                    // Potentially select row
+                    match action {
+                        Action::Select | Action::Nop => self.select_row(plugin_ind, match_ind),
+                        _ => {
+                            // Don't select row for other actions
+                        }
+                    };
+
+                    // Perform action
+                    sender.input(AppMsg::Action(*action));
+                }
             }
         }
         self.update_view(widgets, sender);

anyrun/src/plugin_box.rs

@@ -6,7 +6,7 @@ use gtk::{glib, pango, prelude::*};
 use gtk4 as gtk;
 use relm4::prelude::*;
 
-use crate::Config;
+use crate::{config::MouseButton, Config};
 
 pub struct PluginMatch {
     pub content: Match,
@@ -16,7 +16,7 @@ pub struct PluginMatch {
 
 #[derive(Debug)]
 pub enum MatchOutput {
-    Clicked,
+    MouseAction(MouseButton, <PluginMatch as FactoryComponent>::Index),
 }
 
 #[relm4::factory(pub)]
@@ -31,15 +31,18 @@ impl FactoryComponent for PluginMatch {
             set_css_classes: &["match"],
             set_height_request: 32,
             gtk::Box {
+
                 add_controller = gtk::GestureClick {
-                    connect_pressed[sender, root] => move |gesture, _, _, _| {
-                        if let Some(binding) = root.parent() {
-                            if let Some(list_box) = binding.downcast_ref::<gtk::ListBox>() {
-                                list_box.select_row(Some(&root));
-                            }
-                        }
+                    set_button: 0,
+                    connect_pressed[sender, index] => move |gesture, _, _, _| {
                         gesture.set_state(gtk::EventSequenceState::Claimed);
-                        sender.output(MatchOutput::Clicked).unwrap();
+                        let button: MouseButton = match gesture.current_button() {
+                          gtk::gdk::BUTTON_PRIMARY => MouseButton::Primary,
+                          gtk::gdk::BUTTON_SECONDARY => MouseButton::Secondary,
+                          gtk::gdk::BUTTON_MIDDLE => MouseButton::Middle,
+                          _ => MouseButton::Unknown,
+                        };
+                        sender.output(MatchOutput::MouseAction(button, index.clone())).unwrap();
                     }
                 },
 
@@ -91,7 +94,7 @@ impl FactoryComponent for PluginMatch {
 
     fn init_widgets(
         &mut self,
-        _index: &Self::Index,
+        index: &Self::Index,
         root: Self::Root,
         _returned_widget: &<Self::ParentWidget as relm4::factory::FactoryView>::ReturnedWidget,
         sender: FactorySender<Self>,
@@ -157,7 +160,11 @@ pub enum PluginBoxInput {
 pub enum PluginBoxOutput {
     MatchesLoaded,
     RowSelected(<PluginBox as FactoryComponent>::Index),
-    MatchClicked,
+    MouseAction(
+        MouseButton,
+        <PluginMatch as FactoryComponent>::Index,
+        <PluginBox as FactoryComponent>::Index,
+    ),
 }
 
 #[relm4::factory(pub)]
@@ -230,13 +237,16 @@ impl FactoryComponent for PluginBox {
 
     fn init_model(
         (plugin, config): Self::Init,
-        _index: &Self::Index,
+        index: &Self::Index,
         sender: FactorySender<Self>,
     ) -> Self {
+        let ind = index.clone();
         let matches = FactoryVecDeque::<PluginMatch>::builder()
             .launch(gtk::ListBox::default())
-            .forward(sender.output_sender(), |output| match output {
-                MatchOutput::Clicked => PluginBoxOutput::MatchClicked,
+            .forward(sender.output_sender(), move |output| match output {
+                MatchOutput::MouseAction(button, row) => {
+                    PluginBoxOutput::MouseAction(button, row, ind.clone())
+                }
             });
 
         Self {

examples/config.ron

@@ -2,7 +2,7 @@ Config(
   // Position/size fields use an enum for the value, it can be either:
   // Absolute(n): The absolute value in pixels
   // Fraction(n): A fraction of the width or height of the full screen (depends on exclusive zones and the settings related to them) window respectively
-  
+
   // The horizontal position, adjusted so that Relative(0.5) always centers the runner
   x: Fraction(0.5),
 
@@ -15,18 +15,18 @@ Config(
   // The minimum height of the runner, the runner will expand to fit all the entries
   // NOTE: If this is set to 0, the window will never shrink after being expanded
   height: Absolute(1),
- 
-  // Hide match and plugin info icons  
-  hide_icons: false, 
 
-  // ignore exclusive zones, f.e. Waybar  
-  ignore_exclusive_zones: false, 
+  // Hide match and plugin info icons
+  hide_icons: false,
+
+  // ignore exclusive zones, f.e. Waybar
+  ignore_exclusive_zones: false,
+
+  // Layer shell layer: Background, Bottom, Top, Overlay
+  layer: Overlay,
 
-  // Layer shell layer: Background, Bottom, Top, Overlay  
-  layer: Overlay, 
-  
   // Hide the plugin info panel
-  hide_plugin_info: false, 
+  hide_plugin_info: false,
 
   // Close window when a click outside the main box is received
   close_on_click: false,
@@ -36,7 +36,7 @@ Config(
 
   // Limit amount of entries shown in total
   max_entries: None,
-  
+
   // List of plugins to be loaded by default, can be specified with a relative path to be loaded from the
   // `<anyrun config dir>/plugins` directory or with an absolute path to just load the file the path points to.
   //
@@ -52,19 +52,30 @@ Config(
   keybinds: [
     Keybind(
       key: "Return",
-      action: Select, 
+      action: Select,
     ),
     Keybind(
       key: "Up",
-      action: Up, 
+      action: Up,
     ),
     Keybind(
       key: "Down",
-      action: Down, 
+      action: Down,
     ),
     Keybind(
       key: "Escape",
-      action: Close, 
+      action: Close,
+    ),
+  ],
+
+  mousebinds: [
+    Mousebind(
+      button: Primary,
+      action: Select,
+    ),
+    Mousebind(
+      button: Secondary,
+      action: Nop,
     ),
   ],
 )