Skip to content

Auto-label gestures from recordings and generalize plugin list expansion in binding picker #824

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
multiplex55 merged 2 commits into from
Feb 12, 2026
Merged

Auto-label gestures from recordings and generalize plugin list expansion in binding picker #824

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3efa62f
Improve gesture auto-labeling and action source expansion
multiplex55 Feb 12, 2026
c06b07c
Fix mouse gesture dialog borrow and edition compatibility
multiplex55 Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
297 changes: 226 additions & 71 deletions src/gui/mouse_gestures_dialog.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ use crate::mouse_gestures::db::{
};
use crate::mouse_gestures::engine::{DirMode, GestureTracker};
use crate::mouse_gestures::service::MouseGestureConfig;
use crate::plugin::Plugin;
use eframe::egui;

#[derive(Debug, Clone, Copy)]
Expand Down Expand Up @@ -122,6 +123,125 @@ fn stroke_points_in_rect(stroke: &[[i16; 2]], rect: egui::Rect) -> Vec<egui::Pos
.collect()
}

const AUTO_LABEL_PREFIX: &str = "Gesture";
const AUTO_LABEL_TOKEN_MAX: usize = 24;

fn normalize_recorded_tokens_for_label(tokens: &str) -> String {
tokens
.chars()
.filter(|c| c.is_ascii_alphanumeric())
.map(|c| c.to_ascii_uppercase())
.take(AUTO_LABEL_TOKEN_MAX)
.collect()
}

fn label_from_recorded_tokens(tokens: &str) -> Option<String> {
let normalized = normalize_recorded_tokens_for_label(tokens);
if normalized.is_empty() {
None
} else {
Some(format!("{AUTO_LABEL_PREFIX} {normalized}"))
}
}

fn is_default_generated_label(label: &str) -> bool {
let trimmed = label.trim();
if trimmed.is_empty() {
return true;
}

let Some(rest) = trimmed.strip_prefix(AUTO_LABEL_PREFIX) else {
return false;
};
let rest = rest.trim();
if rest.is_empty() {
return true;
}

rest.chars().all(|c| c.is_ascii_digit()) || rest == normalize_recorded_tokens_for_label(rest)
}

fn list_query_prefix_for_plugin(plugin_name: &str) -> Option<&'static str> {
match plugin_name {
"folders" => Some("f list"),
"bookmarks" => Some("bm list"),
"clipboard" => Some("cb list"),
"emoji" => Some("emoji list"),
"notes" => Some("note list"),
_ => None,
}
}

fn resolve_action_source(plugin: &dyn Plugin, filter: &str) -> Vec<crate::actions::Action> {
if let Some(prefix) = list_query_prefix_for_plugin(plugin.name()) {
let query = if filter.trim().is_empty() {
prefix.to_string()
} else {
format!("{prefix} {}", filter.trim())
};
let actions = plugin.search(&query);
if !actions.is_empty() {
return actions;
}
}
plugin.commands()
}

fn append_query_args(query: &str, add_args: &str) -> String {
let extra = add_args.trim();
if extra.is_empty() {
return query.to_string();
}
if query.ends_with(' ') {
format!("{query}{extra}")
} else {
format!("{query} {extra}")
}
}

fn apply_recording_to_entry(
entry: &mut GestureEntry,
token_buffer: &mut String,
recorded_tokens: &str,
normalized_stroke: Vec<[i16; 2]>,
) {
entry.tokens = recorded_tokens.to_string();
*token_buffer = entry.tokens.clone();
entry.stroke = normalized_stroke;

if is_default_generated_label(&entry.label) {
if let Some(auto_label) = label_from_recorded_tokens(recorded_tokens) {
entry.label = auto_label;
}
}
}

fn apply_action_pick(editor: &mut BindingEditor, act: &crate::actions::Action, add_args: &str) {
if let Some(query) = act.action.strip_prefix("query:") {
editor.kind = match editor.kind {
BindingKind::SetQueryAndShow => BindingKind::SetQueryAndShow,
BindingKind::SetQueryAndExecute => BindingKind::SetQueryAndExecute,
_ => BindingKind::SetQuery,
};
editor.action = append_query_args(query, add_args);
editor.args.clear();
} else if act.action == "launcher:toggle" {
editor.kind = BindingKind::ToggleLauncher;
editor.action.clear();
editor.args.clear();
} else {
editor.kind = BindingKind::Execute;
editor.action = act.action.clone();
editor.args = if add_args.trim().is_empty() {
act.args.clone().unwrap_or_default()
} else {
add_args.trim().to_string()
};
}
editor.label = act.label.clone();
editor.add_args.clear();
}

pub struct GestureRecorder {
config: RecorderConfig,
tracker: GestureTracker,
Expand Down Expand Up @@ -691,43 +811,16 @@ impl MgGesturesDialog {
}
if ui.button(format!("{} - {}", act.label, act.desc)).clicked()
{
editor.label = act.label.clone();
if let Some(query) = act.action.strip_prefix("query:") {
editor.kind = match editor.kind {
BindingKind::SetQueryAndShow => {
BindingKind::SetQueryAndShow
}
BindingKind::SetQueryAndExecute => {
BindingKind::SetQueryAndExecute
}
_ => BindingKind::SetQuery,
};
editor.action = query.to_string();
editor.args.clear();
} else if act.action == "launcher:toggle" {
editor.kind = BindingKind::ToggleLauncher;
editor.action.clear();
editor.args.clear();
} else {
editor.kind = BindingKind::Execute;
editor.action = act.action.clone();
editor.args = act.args.clone().unwrap_or_default();
}
editor.add_args.clear();
apply_action_pick(editor, act, "");
}
}
});
} else if let Some(plugin) =
app.plugins.iter().find(|p| p.name() == editor.add_plugin)
{
let filter = editor.add_filter.trim().to_lowercase();
let mut actions = if plugin.name() == "folders" {
plugin.search(&format!("f list {}", editor.add_filter))
} else if plugin.name() == "bookmarks" {
plugin.search(&format!("bm list {}", editor.add_filter))
} else {
plugin.commands()
};
let mut actions =
resolve_action_source(plugin.as_ref(), &editor.add_filter);
egui::ScrollArea::vertical()
.id_source("mg_binding_action_list")
.max_height(160.0)
Expand All @@ -742,41 +835,8 @@ impl MgGesturesDialog {
}
if ui.button(format!("{} - {}", act.label, act.desc)).clicked()
{
let args = if editor.add_args.trim().is_empty() {
None
} else {
Some(editor.add_args.clone())
};

if let Some(query) = act.action.strip_prefix("query:") {
let mut query = query.to_string();
if let Some(ref a) = args {
query.push_str(a);
}
editor.kind = match editor.kind {
BindingKind::SetQueryAndShow => {
BindingKind::SetQueryAndShow
}
BindingKind::SetQueryAndExecute => {
BindingKind::SetQueryAndExecute
}
_ => BindingKind::SetQuery,
};
editor.action = query;
editor.args.clear();
} else if act.action == "launcher:toggle" {
editor.kind = BindingKind::ToggleLauncher;
editor.action.clear();
editor.args.clear();
} else {
editor.kind = BindingKind::Execute;
editor.action = act.action.clone();
editor.args = args.unwrap_or_else(|| {
act.args.clone().unwrap_or_default()
});
}
editor.label = act.label.clone();
editor.add_args.clear();
let add_args = editor.add_args.clone();
apply_action_pick(editor, &act, &add_args);
}
}
});
Expand Down Expand Up @@ -1022,9 +1082,14 @@ impl MgGesturesDialog {
));
ui.horizontal(|ui| {
if ui.button("Use Recording").clicked() {
entry.tokens = recorded_tokens.clone();
self.token_buffer = entry.tokens.clone();
entry.stroke = self.recorder.normalized_stroke();
let normalized_stroke =
self.recorder.normalized_stroke();
apply_recording_to_entry(
entry,
&mut self.token_buffer,
&recorded_tokens,
normalized_stroke,
);
self.recorder.reset();
save_now = true;
}
Expand Down Expand Up @@ -1067,9 +1132,14 @@ impl MgGesturesDialog {
if response.drag_stopped() {
let recorded_tokens = self.recorder.tokens_string();
if !recorded_tokens.is_empty() {
entry.tokens = recorded_tokens.clone();
self.token_buffer = entry.tokens.clone();
entry.stroke = self.recorder.normalized_stroke();
let normalized_stroke =
self.recorder.normalized_stroke();
apply_recording_to_entry(
entry,
&mut self.token_buffer,
&recorded_tokens,
normalized_stroke,
);
save_now = true;
}
//Clear the live drawing so the saved preview is shown
Expand Down Expand Up @@ -1207,4 +1277,89 @@ mod tests {
assert_eq!(dlg.selected_idx, Some(1));
assert_eq!(dlg.rename_idx, Some(1));
}

#[derive(Clone)]
struct MockPlugin {
name: String,
search_results: Vec<crate::actions::Action>,
command_results: Vec<crate::actions::Action>,
}

impl crate::plugin::Plugin for MockPlugin {
fn search(&self, _query: &str) -> Vec<crate::actions::Action> {
self.search_results.clone()
}

fn name(&self) -> &str {
&self.name
}

fn description(&self) -> &str {
"mock"
}

fn capabilities(&self) -> &[&str] {
&[]
}

fn commands(&self) -> Vec<crate::actions::Action> {
self.command_results.clone()
}
}

#[test]
fn auto_label_is_applied_only_for_default_generated_labels() {
let mut entry = gesture("Gesture 3", "");

let mut token_buffer = String::new();
apply_recording_to_entry(&mut entry, &mut token_buffer, "udlr", Vec::new());

assert_eq!(entry.tokens, "udlr");
assert_eq!(entry.label, "Gesture UDLR");
}

#[test]
fn customized_label_is_preserved_when_new_recording_is_applied() {
let mut entry = gesture("My Favorite Gesture", "UD");

let mut token_buffer = String::new();
apply_recording_to_entry(&mut entry, &mut token_buffer, "LR", Vec::new());

assert_eq!(entry.tokens, "LR");
assert_eq!(entry.label, "My Favorite Gesture");
}

#[test]
fn resolve_action_source_prefers_mapped_list_search_and_falls_back_to_commands() {
let list_action = crate::actions::Action {
label: "Clipboard Entry".into(),
desc: "Clipboard".into(),
action: "clipboard:copy:1".into(),
args: None,
};
let command_action = crate::actions::Action {
label: "cb list".into(),
desc: "Clipboard".into(),
action: "query:cb list".into(),
args: None,
};

let mapped_plugin = MockPlugin {
name: "clipboard".into(),
search_results: vec![list_action.clone()],
command_results: vec![command_action.clone()],
};
let mapped_actions = resolve_action_source(&mapped_plugin, "abc");
assert_eq!(mapped_actions.len(), 1);
assert_eq!(mapped_actions[0].action, "clipboard:copy:1");

let fallback_plugin = MockPlugin {
name: "custom".into(),
search_results: vec![list_action],
command_results: vec![command_action.clone()],
};
let fallback_actions = resolve_action_source(&fallback_plugin, "abc");
assert_eq!(fallback_actions.len(), 1);
assert_eq!(fallback_actions[0].action, command_action.action);
}
}