From 572df007df46db3fe57780bf60d7aff28e9d6709 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 11 Oct 2021 20:28:58 +0530
Subject: [PATCH] Add a default shortcut for visually focusing windows

Fixes #4110
---
 docs/basic.rst              | 1 +
 docs/changelog.rst          | 4 ++++
 kitty/options/definition.py | 2 ++
 kitty/options/types.py      | 2 ++
 4 files changed, 9 insertions(+)

diff --git a/docs/basic.rst b/docs/basic.rst
index b795c811e..2d5da6500 100644
--- a/docs/basic.rst
+++ b/docs/basic.rst
@@ -57,6 +57,7 @@ Previous window             :sc:`previous_window`
 Move window forward         :sc:`move_window_forward`
 Move window backward        :sc:`move_window_backward`
 Move window to top          :sc:`move_window_to_top`
+Visually focus window       :sc:`focus_visible_window`
 Focus specific window       :sc:`first_window`, :sc:`second_window` ... :sc:`tenth_window`
                             (also :kbd:`⌘+1`, :kbd:`⌘+2` ... :kbd:`⌘+9` on macOS)
                             (clockwise from the top-left)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 2601d6031..a109a4e21 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -12,6 +12,10 @@ To update |kitty|, :doc:`follow the instructions <binary>`.
   output of the last command in a new window, etc. See :ref:`shell_integration`
   for details.
 
+- A new shortcut :sc:`focus_visible_window` to visually focus a window using
+  the keyboard. Pressing it causes numbers to appear over each visible window
+  and you can press the number to focus the corresponding window (:iss:`4110`)
+
 - A new option :opt:`tab_bar_align` to draw the tab bar centered or right
   aligned (:iss:`3946`)
 
diff --git a/kitty/options/definition.py b/kitty/options/definition.py
index 39a9eed87..4efabb590 100644
--- a/kitty/options/definition.py
+++ b/kitty/options/definition.py
@@ -3149,6 +3149,8 @@ map('Ninth window',
 map('Tenth window',
     'tenth_window kitty_mod+0 tenth_window',
     )
+
+map('Visually select focus window', 'focus_visible_window kitty_mod+f7 focus_visible_window')
 egr()  # }}}
 
 
diff --git a/kitty/options/types.py b/kitty/options/types.py
index 123580c2d..2cbf58f63 100644
--- a/kitty/options/types.py
+++ b/kitty/options/types.py
@@ -767,6 +767,8 @@ defaults.map = [
     KeyDefinition(False, KeyAction('ninth_window'), 1024, False, 57, ()),
     # tenth_window
     KeyDefinition(False, KeyAction('tenth_window'), 1024, False, 48, ()),
+    # focus_visible_window
+    KeyDefinition(False, KeyAction('focus_visible_window'), 1024, False, 57370, ()),
     # next_tab
     KeyDefinition(False, KeyAction('next_tab'), 1024, False, 57351, ()),
     # next_tab