From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A5343238159 for ; Mon, 22 Jun 2026 08:58:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782118702; cv=none; b=K3f/Wa+yELdmjx5ClsaUwUQ27in/7J/5VZLBbLCXEO7Mq1DzBtf3bUYIitFZMjw3WuJZZCobdvI0IMEwj1mW94aylsTvdGgAOPVnhEgX8wXBC0Sfiyur6Bn9FZrY95LLGA4Y3QcPRGD8ZwQ/4XN/eZ1U5jbsXVKM/GciZgzIGKo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782118702; c=relaxed/simple; bh=QMlxjNjGpvYYf0BlQPftIf0r6ZPpt7MazWXIEqJtq54=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=ji+MJ4jpUHq6C5QLEAOnKA8u0C2dxx6ofZXHNsKh48P+T4T4IOtSuRxE9hlQq65guaijEI8FAwe3/NLUIgJMQH5eATEqc5S7yqHnV7hGg+Bbwy9uMo7kwGXVgx7KsTGCAKAXhS0uMMs85TOoE41J5Ww6TuQDucem+tdAQBkc6AQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PohTs3cA; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="PohTs3cA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BC5D91F000E9; Mon, 22 Jun 2026 08:58:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1782118701; bh=eKEqXZSQUEpptujST1ZcrLvYsmOdDClzgTRjaaz0BSs=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=PohTs3cAVARQNcOdOc7THP6uz3oIQZ1nFwCJgA2s8J5fjk5F++0ylFOrb7gORuHd0 cOQSjuWdl3I5cRchdu+j3uZUVfOA3MCVFb2D84AW5sbzJ0JQ/QUSytd5ZrEXPTPci1 tFD1IgegNjwXmmVhXG1f87b9b84P2ke8KNBhwsQr2YJOVz0UJyvLJ21nC/jaXxUHOD ihBP4+Gf0y5h4+kQXgRk75/xmnEgzI55X8SgxCsafRxTTAZwk1H/lG5iovnW7htAzG Lkf8RDzZ8ZHuPMaBtaaqv9iNH/vVTEVYrW53U2zvX+tojJo6HZb0ADsrjENy3vtd6K iKqEbsMOd/21g== Date: Mon, 22 Jun 2026 10:58:17 +0200 From: Alexey Gladkov To: Nicolas Pitre Cc: kbd@lists.linux.dev Subject: Re: [PATCH 3/3] keymaps: convert include files to use CSI keysyms Message-ID: References: <20260612014857.1668427-1-nico@fluxnic.net> <20260612014857.1668427-4-nico@fluxnic.net> Precedence: bulk X-Mailing-List: kbd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260612014857.1668427-4-nico@fluxnic.net> On Thu, Jun 11, 2026 at 09:48:57PM -0400, Nicolas Pitre wrote: > Convert the shared keymap include files to use the new Csi_* keysyms > for function keys (F1-F12) and navigation keys (Home, End, Insert, > Delete, PageUp, PageDown). This fixes the long-standing discrepancy > where F1-F5 used non-standard sequences (\e[[A through \e[[E) while > F6 and above used standard CSI sequences. > > The Csi_* keysyms automatically encode modifier state into the output > sequence, so explicit shift/control bindings for F13-F36 are no longer > needed and have been removed. The alt/control-alt bindings for console > switching (Console_1 through Console_24) and other special actions > (Scroll_Backward, Scroll_Forward, Boot) are preserved. > > Updated files: > - linux-keys-bare.inc > - linux-keys-extd.inc > - linux-with-modeshift-altgr.inc > > Legacy versions of these files are preserved as *-legacy.inc for > keymaps that need the old F1-F246 keysym behavior. > > Note: Standalone keymaps that don't use these include files (such as > defkeymap.map and various language-specific keymaps) are not updated > and will continue to use the legacy keysyms. > > Note: The Csi_* keysyms require Linux kernel 7.1 or later. Keymaps > built from these include files will leave the function and navigation > keys inoperative on older kernels (and loadkeys additionally reports > errors for them on non-Unicode consoles). Systems that must run > pre-7.1 kernels should use the *-legacy.inc include files instead. Existing keymaps continue to include files with their original names such as linux-keys-bare.inc, etc. After an update, they automatically become CSI variants. The presence of *-legacy.inc files alongside them does not help keymaps that are already installed: none of them are selected automatically. This patch will break systems with pre-7.1 kernel. I need to think about how to handle such migration. > Signed-off-by: Nicolas Pitre > --- > .../i386/include/linux-keys-bare-legacy.inc | 170 ++++++++++++++++++ > data/keymaps/i386/include/linux-keys-bare.inc | 76 +++----- > .../i386/include/linux-keys-extd-legacy.inc | 37 ++++ > data/keymaps/i386/include/linux-keys-extd.inc | 23 +-- > .../linux-with-modeshift-altgr-legacy.inc | 101 +++++++++++ > .../include/linux-with-modeshift-altgr.inc | 52 ++---- > 6 files changed, 356 insertions(+), 103 deletions(-) > create mode 100644 data/keymaps/i386/include/linux-keys-bare-legacy.inc > create mode 100644 data/keymaps/i386/include/linux-keys-extd-legacy.inc > create mode 100644 data/keymaps/i386/include/linux-with-modeshift-altgr-legacy.inc > > diff --git a/data/keymaps/i386/include/linux-with-modeshift-altgr-legacy.inc b/data/keymaps/i386/include/linux-with-modeshift-altgr-legacy.inc > new file mode 100644 > index 0000000..29012ba > --- /dev/null > +++ b/data/keymaps/i386/include/linux-with-modeshift-altgr-legacy.inc > @@ -0,0 +1,101 @@ > +# For keymaps in which AltGr_Lock is used to switch between two alphabets. > +# > +# A common construction is > +# alt keycode 42 = AltGr_Lock > +# altgr alt keycode 42 = AltGr_Lock > +# > +# All Linux keys have the same meaning with or without AltGr. > +# No convention for Hex_* has been established. > + > +include "linux-keys-bare" linux-with-modeshift-altgr-legacy.inc should include linux-keys-bare-legacy, not the new linux-keys-bare. -- Rgrds, legion