Merge branch 'main' into csi-i

docs/docs/releases.md

@@ -19,6 +19,8 @@ language: 'en'
 - Allow `Renderer` to be configured cross-platform by `Platform` property.
 - Add `ToggleFullscreen` to configurable actions.
 - Support for `CSI n I` (Cursor Forward Tabulation) to move the cursor forward by a specified number of tabs.
+- Always emit `1` for the first parameter when having modifiers in kitty keyboard protocol.
+- Microsoft Windows: fix the event loop not waking on accessibility requests.
 
 ## 0.2.2
 

frontends/rioterm/src/bindings/kitty_keyboard.rs

@@ -56,7 +56,7 @@ pub fn build_key_sequence(key: &KeyEvent, mods: ModifiersState, mode: Mode) -> V
     let sequence_base = context
         .try_build_numpad(key)
         .or_else(|| context.try_build_named_kitty(key))
-        .or_else(|| context.try_build_named_normal(key))
+        .or_else(|| context.try_build_named_normal(key, associated_text.is_some()))
         .or_else(|| context.try_build_control_char_or_mod(key, &mut modifiers))
         .or_else(|| context.try_build_textual(key, associated_text));
 
@@ -263,14 +263,21 @@ impl SequenceBuilder {
     }
 
     /// Try building from [`NamedKey`].
-    fn try_build_named_normal(&self, key: &KeyEvent) -> Option<SequenceBase> {
+    fn try_build_named_normal(
+        &self,
+        key: &KeyEvent,
+        has_associated_text: bool,
+    ) -> Option<SequenceBase> {
         let named = match key.logical_key {
             Key::Named(named) => named,
             _ => return None,
         };
 
         // The default parameter is 1, so we can omit it.
-        let one_based = if self.modifiers.is_empty() && !self.kitty_event_type {
+        let one_based = if self.modifiers.is_empty()
+            && !self.kitty_event_type
+            && !has_associated_text
+        {
             ""
         } else {
             "1"

rio-window/src/platform_impl/windows/event_loop.rs

@@ -52,7 +52,7 @@ use windows_sys::Win32::UI::WindowsAndMessaging::{
     PostMessageW, RegisterClassExW, RegisterWindowMessageA, SetCursor, SetWindowPos,
     TranslateMessage, CREATESTRUCTW, GIDC_ARRIVAL, GIDC_REMOVAL, GWL_STYLE, GWL_USERDATA,
     HTCAPTION, HTCLIENT, MINMAXINFO, MNC_CLOSE, MSG, MWMO_INPUTAVAILABLE,
-    NCCALCSIZE_PARAMS, PM_REMOVE, PT_PEN, PT_TOUCH, QS_ALLEVENTS, RI_MOUSE_HWHEEL,
+    NCCALCSIZE_PARAMS, PM_REMOVE, PT_PEN, PT_TOUCH, QS_ALLINPUT, RI_MOUSE_HWHEEL,
     RI_MOUSE_WHEEL, SC_MINIMIZE, SC_RESTORE, SIZE_MAXIMIZED, SWP_NOACTIVATE, SWP_NOMOVE,
     SWP_NOSIZE, SWP_NOZORDER, WHEEL_DELTA, WINDOWPOS, WMSZ_BOTTOM, WMSZ_BOTTOMLEFT,
     WMSZ_BOTTOMRIGHT, WMSZ_LEFT, WMSZ_RIGHT, WMSZ_TOP, WMSZ_TOPLEFT, WMSZ_TOPRIGHT,
@@ -788,11 +788,12 @@ fn wait_for_messages_impl(
             (0, [ptr::null_mut()])
         };
 
+        // We must use `QS_ALLINPUT` to wake on accessibility messages.
         let result = MsgWaitForMultipleObjectsEx(
             num_handles,
             raw_handles.as_ptr() as *const _,
             wait_duration_ms,
-            QS_ALLEVENTS,
+            QS_ALLINPUT,
             MWMO_INPUTAVAILABLE,
         );
         if result == WAIT_FAILED {