From 7b34c0603fe5b3dbfb8a4b1f12c14b76a2ddd5cd Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 5 Mar 2024 08:00:57 +0530
Subject: [PATCH] Fix --match not working for some remote control commands

---
 docs/changelog.rst               | 3 +++
 kitty/rc/ls.py                   | 2 +-
 kitty/rc/send_key.py             | 2 +-
 kitty/rc/set_background_image.py | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 00de136d7..5b9a63eab 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -83,6 +83,9 @@ Detailed list of changes
 
 - hints kitten: Use default editor rather than hardcoding vim to open file at specific line (:iss:`7186`)
 
+- Remote control: Fix ``--match`` argument not working for @ls, @send-key,
+  @set-background-image (:iss:`7192`)
+
 
 0.32.2 [2024-02-12]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/kitty/rc/ls.py b/kitty/rc/ls.py
index d8fcee6df..94beb5131 100644
--- a/kitty/rc/ls.py
+++ b/kitty/rc/ls.py
@@ -50,7 +50,7 @@ Only list the window this command is run in.
         window_filter: Optional[Callable[[Window], bool]] = None
 
         if payload_get('match') is not None or payload_get('match_tab') is not None:
-            window_ids = frozenset(w.id for w in self.windows_for_payload(boss, window, payload_get))
+            window_ids = frozenset(w.id for w in self.windows_for_payload(boss, window, payload_get, window_match_name='match'))
             def wf(w: Window) -> bool:
                 return w.id in window_ids
             window_filter = wf
diff --git a/kitty/rc/send_key.py b/kitty/rc/send_key.py
index 257a05133..3bc6191a2 100644
--- a/kitty/rc/send_key.py
+++ b/kitty/rc/send_key.py
@@ -52,7 +52,7 @@ Do not send text to the active window, even if it is one of the matched windows.
         return ret
 
     def response_from_kitty(self, boss: Boss, window: Optional[Window], payload_get: PayloadGetType) -> ResponseType:
-        windows = self.windows_for_payload(boss, None, payload_get)
+        windows = self.windows_for_payload(boss, None, payload_get, window_match_name='match')
         keys = payload_get('keys')
         sent = False
         for w in windows:
diff --git a/kitty/rc/set_background_image.py b/kitty/rc/set_background_image.py
index 1262cb2f6..6d7691e90 100644
--- a/kitty/rc/set_background_image.py
+++ b/kitty/rc/set_background_image.py
@@ -108,7 +108,7 @@ failed, the command will exit with a success code.
 
     def response_from_kitty(self, boss: Boss, window: Optional[Window], payload_get: PayloadGetType) -> ResponseType:
         data = payload_get('data')
-        windows = self.windows_for_payload(boss, window, payload_get)
+        windows = self.windows_for_payload(boss, window, payload_get, window_match_name='match')
         os_windows = tuple({w.os_window_id for w in windows if w})
         layout = payload_get('layout')
         if data == '-':