only update count prefix after command/action is handled

Fixes #753 
Fixes #764

This PR updates the logic to only update `count_prefix` if the pressed digit key is not handled as bind command or action

---------

Co-authored-by: Thang Pham <[email protected]>

Author: markgandolfo

spotify_player/src/event/mod.rs

@@ -100,26 +100,6 @@ fn handle_key_event(
     let key: Key = event.into();
     let mut ui = state.ui.lock();
 
-    // Check if the key is a digit and handle count prefix
-    if let Key::None(KeyCode::Char(c)) = key {
-        if c.is_ascii_digit() {
-            let digit = c.to_digit(10).unwrap() as usize;
-            // If we have an existing count prefix, append the digit
-            // Otherwise, start a new count (but ignore leading zeros)
-            ui.count_prefix = match ui.count_prefix {
-                Some(count) => Some(count * 10 + digit),
-                None => {
-                    if digit > 0 {
-                        Some(digit)
-                    } else {
-                        None
-                    }
-                }
-            };
-            return Ok(());
-        }
-    }
-
     let mut key_sequence = ui.input_key_sequence.clone();
     key_sequence.keys.push(key);
 
@@ -163,10 +143,26 @@ fn handle_key_event(
         ui.input_key_sequence.keys = vec![];
         ui.count_prefix = None;
     } else {
-        ui.input_key_sequence = key_sequence;
-        // If we didn't handle the key and it wasn't a digit, clear the count prefix
-        if !matches!(key, Key::None(KeyCode::Char(c)) if c.is_ascii_digit()) {
-            ui.count_prefix = None;
+        // update the count prefix if the key is a digit
+        match key {
+            Key::None(KeyCode::Char(c)) if c.is_ascii_digit() => {
+                let digit = c.to_digit(10).unwrap() as usize;
+                ui.input_key_sequence.keys = vec![];
+                ui.count_prefix = match ui.count_prefix {
+                    Some(count) => Some(count * 10 + digit),
+                    None => {
+                        if digit > 0 {
+                            Some(digit)
+                        } else {
+                            None
+                        }
+                    }
+                };
+            }
+            _ => {
+                ui.input_key_sequence = key_sequence;
+                ui.count_prefix = None;
+            }
         }
     }
     Ok(())

spotify_player/src/media_control.rs

@@ -192,7 +192,7 @@ mod windows {
                     ..Default::default()
                 };
 
-                if RegisterClassExW(&wnd_class) == 0 {
+                if RegisterClassExW(&raw const wnd_class) == 0 {
                     return Err(format!(
                         "Registering class failed: {}",
                         Error::last_os_error()
@@ -246,14 +246,14 @@ mod windows {
     pub fn pump_event_queue() -> bool {
         unsafe {
             let mut msg: MSG = std::mem::zeroed();
-            let mut has_message = PeekMessageW(&mut msg, None, 0, 0, PM_REMOVE).as_bool();
+            let mut has_message = PeekMessageW(&raw mut msg, None, 0, 0, PM_REMOVE).as_bool();
             while msg.message != WM_QUIT && has_message {
-                if !IsDialogMessageW(GetAncestor(msg.hwnd, GA_ROOT), &msg).as_bool() {
-                    let _ = TranslateMessage(&msg);
-                    let _ = DispatchMessageW(&msg);
+                if !IsDialogMessageW(GetAncestor(msg.hwnd, GA_ROOT), &raw const msg).as_bool() {
+                    let _ = TranslateMessage(&raw const msg);
+                    let _ = DispatchMessageW(&raw const msg);
                 }
 
-                has_message = PeekMessageW(&mut msg, None, 0, 0, PM_REMOVE).as_bool();
+                has_message = PeekMessageW(&raw mut msg, None, 0, 0, PM_REMOVE).as_bool();
             }
 
             msg.message == WM_QUIT