Skip to content

Commit

Permalink
refactor: notify and replace threads with tokio spawn
Browse files Browse the repository at this point in the history
  • Loading branch information
@Borber
Borber committed Sep 16, 2024
1 parent 1265300 commit 8fe901a
Show file tree
Hide file tree
Showing 3 changed files with 121 additions and 128 deletions.
1 change: 0 additions & 1 deletion src-tauri/Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src-tauri/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ fastrand = "2"
open = "5"

rdev = { git = "https://github.com/Narsil/rdev.git" }
crossbeam-channel = "0.5"


[profile.release]
Expand Down
247 changes: 121 additions & 126 deletions src-tauri/src/setup.rs
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
use std::{
sync::atomic::Ordering,
thread::{sleep, spawn},
};
use std::sync::{atomic::Ordering, Arc};

use crossbeam_channel::bounded;
use mouse_position::mouse_position::Mouse;
use rdev::{
Button,
EventType::{ButtonPress, ButtonRelease, KeyPress, KeyRelease},
};
use tauri::{App, Emitter, Listener, Manager};
use tokio::sync::Notify;

use crate::{
common::{self, OLD, PIN, SIMULATION, TMP_PIN},
Expand All @@ -31,15 +28,17 @@ pub fn handler(app: &mut App) -> Result<(), Box<dyn std::error::Error>> {
.get_webview_window("panel")
.expect("Failed to get panel window");

let (key_s, key_r) = bounded(1);
let (mouse_s, mouse_r) = bounded(1);
let key_notifier = Arc::new(Notify::new());
let mouse_notifier = Arc::new(Notify::new());

// 监听快捷键
// Listen for shortcut keys
spawn({
tokio::spawn({
let panel = panel.clone();
move || {
while let Ok(()) = key_r.recv() {
let key_notifier = key_notifier.clone();
async move {
loop {
key_notifier.notified().await;
// 防止在 panel 中再次翻译
// Prevent the translation from being repeated in the panel
if panel.is_focused().unwrap_or(false) {
Expand All @@ -60,10 +59,12 @@ pub fn handler(app: &mut App) -> Result<(), Box<dyn std::error::Error>> {

// 监听划词
// Listen for word selection
spawn({
tokio::spawn({
let panel = panel.clone();
move || {
while let Ok(()) = mouse_r.recv() {
let mouse_notifier = mouse_notifier.clone();
async move {
loop {
mouse_notifier.notified().await;
// 防止在 panel 中再次翻译
// Prevent the translation from being repeated in the panel
if panel.is_focused().unwrap_or(false) {
Expand All @@ -87,134 +88,128 @@ pub fn handler(app: &mut App) -> Result<(), Box<dyn std::error::Error>> {
});

// 监听快捷键 和 鼠标操作
spawn(move || {
// 检测是否快速按下并抬起按键
// Check if the key is quickly pressed and released
let mut fast = 0;
// 双击
// Double click
let mut double = 0;
// 划词翻译
// Selection translation
let mut selected = 0;
// 双击鼠标左键
// Double click mouse left
let mut double_click = 0;
let mut double_click_x = 0;
let mut double_click_y = 0;

// 确定按键
// Confirm the key
// let k =
// let key = Key::ShiftLeft;

rdev::listen(move |event| match event.event_type {
KeyPress(k) => {
// 如果按键不是设置的按键则忽略
// If the key is not the setting key, ignore
if k != util::key() {
return;
}
// 如果在模拟中则忽略
// If in simulation, ignore
if SIMULATION.load(Ordering::SeqCst) {
return;
}
std::thread::spawn({
let key_notifier = key_notifier.clone();
let mouse_position = mouse_notifier.clone();
move || {
// 检测是否快速按下并抬起按键
// Check if the key is quickly pressed and released
let mut fast = 0;
// 双击
// Double click
let mut double = 0;
// 划词翻译
// Selection translation
let mut selected = 0;
// 双击鼠标左键
// Double click mouse left
let mut double_click = 0;
let mut double_click_x = 0;
let mut double_click_y = 0;

// 确定按键
// Confirm the key
// let k =
// let key = Key::ShiftLeft;

rdev::listen(move |event| match event.event_type {
KeyPress(k) => {
// 如果按键不是设置的按键则忽略
// If the key is not the setting key, ignore
if k != util::key() {
return;
}
// 如果在模拟中则忽略
// If in simulation, ignore
if SIMULATION.load(Ordering::SeqCst) {
return;
}

if fast == 0 {
let now = util::now();
fast = now;
}
}
KeyRelease(k) => {
// 如果按键不是设置的按键则忽略
// If the key is not the setting key, ignore
if k != util::key() {
// 仅处理连续双击按键的情况, 时间满足但中间若有其他按键按下则忽略
// Only handle continuous double clicks
double = 0;
return;
}
// 如果在模拟中则忽略
// If in simulation, ignore
if SIMULATION.load(Ordering::SeqCst) {
return;
if fast == 0 {
let now = util::now();
fast = now;
}
}
KeyRelease(k) => {
// 如果按键不是设置的按键则忽略
// If the key is not the setting key, ignore
if k != util::key() {
// 仅处理连续双击按键的情况, 时间满足但中间若有其他按键按下则忽略
// Only handle continuous double clicks
double = 0;
return;
}
// 如果在模拟中则忽略
// If in simulation, ignore
if SIMULATION.load(Ordering::SeqCst) {
return;
}

let now = util::now();
let now = util::now();

if now > fast + 500 {
if now > fast + 500 {
fast = 0;
return;
}
fast = 0;
return;
}
fast = 0;

let old = double;
if now < old + 1000 {
key_s.send(()).expect("Channel send failed");
double = 0;
} else {
double = now;

let old = double;
if now < old + 1000 {
key_notifier.notify_waiters();
double = 0;
} else {
double = now;
}
}
}
ButtonPress(Button::Left) => {
if common::PIN.load(Ordering::SeqCst) {
let now = util::now();
selected = now;
ButtonPress(Button::Left) => {
if common::PIN.load(Ordering::SeqCst) {
let now = util::now();
selected = now;
}
}
}
ButtonRelease(Button::Left) => {
if common::PIN.load(Ordering::SeqCst) {
let now = util::now();

let old = selected;
if now >= old + 500 {
match mouse_s.send(()) {
Ok(_) => (),
Err(e) => {
println!("{:?}", e);
}
ButtonRelease(Button::Left) => {
if common::PIN.load(Ordering::SeqCst) {
let now = util::now();

let old = selected;
if now >= old + 500 {
mouse_position.notify_waiters();
return;
}
return;
}

// 检测双击
let old = double_click;
let x = double_click_x;
let y = double_click_y;

let position = Mouse::get_mouse_position();
match position {
Mouse::Position { x: x1, y: y1 } => {
// 判断双击时间间隔
// 判断双击是否在同一位置
if now < old + 500 && x == x1 && y == y1 {
match mouse_s.send(()) {
Ok(_) => (),
Err(e) => {
println!("{:?}", e);
}
// 检测双击
let old = double_click;
let x = double_click_x;
let y = double_click_y;

let position = Mouse::get_mouse_position();
match position {
Mouse::Position { x: x1, y: y1 } => {
// 判断双击时间间隔
// 判断双击是否在同一位置
if now < old + 500 && x == x1 && y == y1 {
mouse_notifier.notify_waiters();
} else {
double_click = now;
double_click_x = x1;
double_click_y = y1;
}
} else {
double_click = now;
double_click_x = x1;
double_click_y = y1;
}
}
Mouse::Error => println!("Error getting mouse position"),
};
Mouse::Error => println!("Error getting mouse position"),
};
}
}
}
_ => (),
})
_ => (),
})
}
});

// 当panel获取焦点,并移动时, 固定窗口
// Pin the window when the panel gets focus and moves
spawn({
tokio::spawn({
let panel = panel.clone();
let check = panel.clone();
move || {
async move {
panel.listen("tauri://move", move |_| {
if check.is_focused().unwrap_or(false) {
PIN.store(true, Ordering::SeqCst);
Expand All @@ -225,9 +220,9 @@ pub fn handler(app: &mut App) -> Result<(), Box<dyn std::error::Error>> {

// 检测是否应该隐藏窗口
// Check if the window should be hidden
spawn({
tokio::spawn({
let panel = panel.clone();
move || {
async move {
loop {
if !TMP_PIN.load(Ordering::SeqCst)
&& !PIN.load(Ordering::SeqCst)
Expand All @@ -239,7 +234,7 @@ pub fn handler(app: &mut App) -> Result<(), Box<dyn std::error::Error>> {
let _ = panel.emit("reset", ());
PIN.store(false, Ordering::SeqCst)
}
sleep(std::time::Duration::from_millis(100));
tokio::time::sleep(std::time::Duration::from_millis(100)).await;
}
}
});
Expand Down

0 comments on commit 8fe901a

Please sign in to comment.