@@ -353,43 +353,41 @@ fn main() {
353353 std:: thread:: spawn ( move || {
354354 println ! ( "Starting keyboard listener for macOS/Windows..." ) ;
355355
356- if let Err ( e) = listen ( move |event : RdevEvent | {
357- match event. event_type {
358- EventType :: KeyPress ( key) => {
359- if let Some ( key_str) = rdev_key_to_string ( key) {
360- let state = app_handle_clone. state :: < AppState > ( ) ;
356+ if let Err ( e) = listen ( move |event : RdevEvent | match event. event_type {
357+ EventType :: KeyPress ( key) => {
358+ if let Some ( key_str) = rdev_key_to_string ( key) {
359+ let state = app_handle_clone. state :: < AppState > ( ) ;
361360
362- if is_rdev_modifier ( & key) {
363- let mut mods = state. modifiers . lock ( ) . unwrap ( ) ;
364- if !mods. contains ( & key_str) {
365- mods. push ( key_str. clone ( ) ) ;
366- }
367- } else {
368- let mods = state. modifiers . lock ( ) . unwrap ( ) . clone ( ) ;
361+ if is_rdev_modifier ( & key) {
362+ let mut mods = state. modifiers . lock ( ) . unwrap ( ) ;
363+ if !mods. contains ( & key_str) {
364+ mods. push ( key_str. clone ( ) ) ;
365+ }
366+ } else {
367+ let mods = state. modifiers . lock ( ) . unwrap ( ) . clone ( ) ;
369368
370- let key_event = KeyEvent {
371- key : key_str. clone ( ) ,
372- modifiers : mods. clone ( ) ,
373- } ;
369+ let key_event = KeyEvent {
370+ key : key_str. clone ( ) ,
371+ modifiers : mods. clone ( ) ,
372+ } ;
374373
375- println ! ( "Key pressed: {} with modifiers: {:?}" , key_str, mods) ;
376- if let Err ( e) = app_handle_clone. emit ( "key-press" , key_event) {
377- eprintln ! ( "Failed to emit event: {:?}" , e) ;
378- }
374+ println ! ( "Key pressed: {} with modifiers: {:?}" , key_str, mods) ;
375+ if let Err ( e) = app_handle_clone. emit ( "key-press" , key_event) {
376+ eprintln ! ( "Failed to emit event: {:?}" , e) ;
379377 }
380378 }
381379 }
382- EventType :: KeyRelease ( key ) => {
383- if is_rdev_modifier ( & key) {
384- if let Some ( key_str ) = rdev_key_to_string ( key) {
385- let state = app_handle_clone . state :: < AppState > ( ) ;
386- let mut mods = state . modifiers . lock ( ) . unwrap ( ) ;
387- mods. retain ( |m| m != & key_str ) ;
388- }
380+ }
381+ EventType :: KeyRelease ( key) => {
382+ if is_rdev_modifier ( & key) {
383+ if let Some ( key_str ) = rdev_key_to_string ( key ) {
384+ let state = app_handle_clone . state :: < AppState > ( ) ;
385+ let mut mods = state . modifiers . lock ( ) . unwrap ( ) ;
386+ mods . retain ( |m| m != & key_str ) ;
389387 }
390388 }
391- _ => { }
392389 }
390+ _ => { }
393391 } ) {
394392 eprintln ! ( "Error listening to keyboard events: {:?}" , e) ;
395393 }
0 commit comments