From 801970aa332da5786f91d2f9410d4ed9f440c6ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Tue, 26 Jul 2022 18:44:29 +0200
Subject: [PATCH] =?UTF-8?q?input:=20kitty:=20always=20treat=20composed=20c?=
 =?UTF-8?q?haracters=20as=20=E2=80=98printable=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Certain dead key combinations results different escape sequences in
foot, compared to kitty, when the kitty keyboard protocol is used.

        if (composed && is_text)
            key = utf32;
        else {
            key = xkb_keysym_to_utf32(sym_to_use);
            if (key == 0)
                return false;

            /* The *shifted* key. May be the same as the unshifted
             * key - if so, this is filtered out below, when
             * emitting the CSI */
            alternate = xkb_keysym_to_utf32(sym);
        }

If is_text=false, we’ll fall through to the non-composed
logic. is_text is set to true if the character is printable *and*
there aren’t any non-consumed modifiers enabled.

shift+space is one example where shift is *not* consumed (typically -
may be layouts where it is).

As a result, pressing ", followed by shift+space with the
international english keyboard layout (where " is a dead key) results
in different sequences in foot and kitty.

This patch fixes this by always treating composed characters as
printable.

Closes #1120
---
 CHANGELOG.md | 4 ++++
 input.c      | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea0f5803..29eaf084 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -88,11 +88,15 @@
 * Crash when application emitted an invalid `CSI 38;5;<idx>m`, `CSI
   38:5:<idx>m`, `CSI 48;5;<idx>m` or `CSI 48:5:<idx>m` sequence
   ([#1111][1111]).
+* Certain dead-key combinations resulting in different escape
+  sequences compared to kitty, when the kitty keyboard protocol is
+  used ([#1120][1120]).
 
 [1055]: https://codeberg.org/dnkl/foot/issues/1055
 [1092]: https://codeberg.org/dnkl/foot/issues/1092
 [1097]: https://codeberg.org/dnkl/foot/issues/1097
 [1111]: https://codeberg.org/dnkl/foot/issues/1111
+[1120]: https://codeberg.org/dnkl/foot/issues/1120
 
 
 ### Security
diff --git a/input.c b/input.c
index d4598cf6..e0f21c6e 100644
--- a/input.c
+++ b/input.c
@@ -1239,7 +1239,7 @@ emit_escapes:
             ? ctx->level0_syms.syms[0]
             : sym;
 
-        if (composed && is_text)
+        if (composed)
             key = utf32;
         else {
             key = xkb_keysym_to_utf32(sym_to_use);