From 3287798efe2f5c292bf2544424b9a8a5c5cf8242 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 7 Aug 2021 15:15:59 +0530
Subject: [PATCH] terminfo: Fix "cnorm" the property for setting the cursor to
 normal using a solid block rather than a blinking block cursor

cnorm should match the default cursor in kitty, which is a blinking
block. Fixes #3906
---
 docs/changelog.rst      |   3 +++
 kitty/terminfo.py       |   2 +-
 terminfo/kitty.terminfo |   2 +-
 terminfo/x/xterm-kitty  | Bin 3297 -> 3297 bytes
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 72ce14549..e6de68bcc 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -26,6 +26,9 @@ To update |kitty|, :doc:`follow the instructions <binary>`.
   an English locale does not exist, set :envvar:`LANG` to ``en_US.UTF-8``
   (:iss:`3899`)
 
+- terminfo: Fix "cnorm" the property for setting the cursor to normal using a
+  solid block rather than a blinking block cursor (:iss:`3906`)
+
 
 0.22.2 [2021-08-02]
 ----------------------
diff --git a/kitty/terminfo.py b/kitty/terminfo.py
index c99f78ce5..115ccf060 100644
--- a/kitty/terminfo.py
+++ b/kitty/terminfo.py
@@ -113,7 +113,7 @@ string_capabilities = {
     # Clear screen
     'clear': r'\E[H\E[2J',
     # Make cursor appear normal
-    'cnorm': r'\E[?12l\E[?25h',
+    'cnorm': r'\E[1 q\E[?25h',
     # Carriage return
     'cr': r'^M',  # CR (carriage return \r)
     # Change scroll region
diff --git a/terminfo/kitty.terminfo b/terminfo/kitty.terminfo
index b754c2ff3..18580cf15 100644
--- a/terminfo/kitty.terminfo
+++ b/terminfo/kitty.terminfo
@@ -24,7 +24,7 @@ xterm-kitty|KovIdTTY,
 	cbt=\E[Z,
 	civis=\E[?25l,
 	clear=\E[H\E[2J,
-	cnorm=\E[?12l\E[?25h,
+	cnorm=\E[1 q\E[?25h,
 	cr=^M,
 	csr=\E[%i%p1%d;%p2%dr,
 	cub=\E[%p1%dD,
diff --git a/terminfo/x/xterm-kitty b/terminfo/x/xterm-kitty
index 57891eced96fc6f4ac941f034327d782ba26857d..a4e0cb2d9d5bfdd523a4292fe6d50ad41164fec6 100644
GIT binary patch
delta 540
zcmY*UU5JcP7=EAgykD&y8BE5m>^9+o{47OLlE0#CnhOlIZOE1lTddkdhT>w1Ek-Fe
zH8ouLSz8kug%q_HMBHqWOiFvDrEObndY$j<YqovsJm>j4opY*<)yBjE%#($Zlunec
zCA#w+V%8}qq({z5-t)_T6{OeWP3iM!R+4-2KnCQQypT8Ec`u)2SiX5S8s%Zf?2qT;
zv7Yezzgh+aNFa$6=A#LVu?#I(hYc{>1WVag>_98B$a$k3hjA3ei>~=#7kY331zg8%
zl<^2p@yZvbW(Z$n{R2Po8)F#9U+i*byIs~}ID6eb&vI^mqz`z!6|p<6?22=cuD>5i
zvwr9A%;X=(GCVsF@xhw&(!F)>BK6thm)Nh?a<dWl%Z<57=QxA2*}x2!ay8d;Gj}q}
z9NXE!<2=oCyu>TK!9JGxkQF}XYYy=vhnMp^M>xs}iq>gT)7qp<bcL?fjk;Z1b&s~`
z5k01-^o$m(Zq=;wTF_oC>0RyDCmQ}JoeILoPoIXsx3|o+<~Umv94fA48`oq`R<3ee
KQ29_dSN{VZk^`jx

delta 541
zcmY*UUucbC9R5A;^E+Z&>|`59ItUkNvK2*Xt)(bS=K_alBCBbei>21Gj$LqZqNOjT
zSnAZ_!k<~wCJHHP7escmBpoU3N~5)=<+u0y`a1Hf_j#XxZ}0n-Ql(Vo8q~^KSs@)L
zT(9iOwTsy~>6Tu(D3?6H;#Xb<J>HZdk7fnACl6#qp2-V&<DK{NNv7nhXERYAcFcZz
zJ{RkGzyB>~4ogslYSdsg(%6Kp*nwTx1G6UBN^8M>v?7D7H`;Ip9S8<o`qX*!VgPvr
zxQ!wnVH~e~;onT)ORT@+2Yz7|bNGXU&g_uOcns%=JL*~19gFmFkGCRr#}!?WL|w)G
zNSX~hf9Lw#<5-4gM<V{T?7Vbu-MdIldi)&w-^#h!wEO91-GU=4m}H6@xP=Ye&1N28
zhFP|;on5@ZeqQD^-rx|6e8?w!&expaM^0^HiPN0nJfX|9T32aWH*3A_)V;b-TlKJ>
z)U(>DJ=&*1$!%Yr)4UF9LGS9Yj%oO#x|&4z`2Q!B@a^U*TNh^=6Q_fEp3tU-#?H~J
LY)OoMSen#D#>oVX