From nobody Sat Feb 4 13:35:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P8D6z6NV9z3n7mj; Sat, 4 Feb 2023 13:35:39 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P8D6z5mHnz3nPS; Sat, 4 Feb 2023 13:35:39 +0000 (UTC) (envelope-from se@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675517739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6535YOty8PhdUP5fjtQ5aEbs3QlgXMF6exCWgp+6MZw=; b=j5Ub3Icod86C2Syzt3E6gTC9Xidr+8yyZgzvGMqY79M4iMOBuNV+toEdOOQ410mqJbXXae 1ZhRk+MMY6BIlTKEzb5+cdcLp7g/vcQFxfc18c1jpZFUepnt8upvTfM9kcQz2entmpaYtu rGIYf7t9wgbjLi4o0tDOwVTQa8eFazry+mFTtrFreikHrpJ3VeH/MKcdY042hbiONbI2Th 5AeuUAL15wltTswdBRVdEzTfZNkh1nyTsFW/eJnOoYP0dL96k8huCfpEOWErsjSMQf93Nf 3vSDzb7DiQLPQLUZw/77vi3bL6O4hzbcJYNu22Yje1u0973Q9aEjYSpdyr9zfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675517739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6535YOty8PhdUP5fjtQ5aEbs3QlgXMF6exCWgp+6MZw=; b=lPDtocnGh00ITYQIGDbcOZAp/AtDjlmH1GcwdlCitWVaY2w0Z4fKRfI3hQm50BB1dHx1Rs hgvhT7UUdN3f0fxLqnmoHtUcAKcusNZLjHgSML3B5I291j8kM6nwUNN/2N69GZ3rJYWz+P 2qtDjsBI0wOoTgzF3KlJjfubJBoPNxl/AcNGboAAK7brPQFSUY1FIljvTqdiecDQTWa8TN MMDsYYIfrYkm4eebvbf9nye4OeRcpCNaan/ZKdFXrFtxiaz5k559SJswiT6CBZZCtlaPNa U9HNMz0rUaQCMmFMcFvNU9ZzSPeMbWsb2A3atdnoKRYGFXUIkBa1HcXET/V6uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675517739; a=rsa-sha256; cv=none; b=D5y7tCW+KAOVyDlWvmMqpGmQYRjXzXMl98De2T37UzQLjt4fcuQUUAHvYEFQCdQN2vdFxt JS3zFQ2hwO0avNXIwYVHE/XnS9XZTA5lIZnuGR7itgQ5aACa12+mrGfpWyeGK1P9fj8swv VPKkkEXitg6ZcvYPm0KcmDWbptS6S4eeF2EsxLCsit5KAfIjXgdUzRb6/gIy6l58M2W+N1 5vqJvz2pymXA+m1DrKQ5ROy+B/ZI7fc5S/FD+KN7Htl1EBl42s6GTxbcjHnrpHOpqU0urb WDQ//euyQPxh/ercKFxOOkV6sIeMtkKjkSJ6a+eIeGkU9bJJv0kgJGlbQCAOTg== Received: from [IPV6:2003:cd:5f2a:1000:a12e:bb93:eec3:990a] (p200300cd5f2a1000a12ebb93eec3990a.dip0.t-ipconnect.de [IPv6:2003:cd:5f2a:1000:a12e:bb93:eec3:990a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: se/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4P8D6y6ZFfzPSR; Sat, 4 Feb 2023 13:35:38 +0000 (UTC) (envelope-from se@FreeBSD.org) Message-ID: <297c877d-2a2f-70cf-604c-e458634cb068@FreeBSD.org> Date: Sat, 4 Feb 2023 14:35:35 +0100 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 From: =?UTF-8?Q?Stefan_E=c3=9fer?= Subject: Re: git: 1e0853ee8403 - main - sys/kbio.h: support Unicode key codes in vt keymap files Content-Language: de-DE, en-US To: Jessica Clarke , Emmanuel Vadot Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <202302011630.311GUmt1068106@gitrepo.freebsd.org> <84830C1A-149F-4B05-99DC-1E0B50C8B59A@freebsd.org> In-Reply-To: <84830C1A-149F-4B05-99DC-1E0B50C8B59A@freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-ThisMailContainsUnwantedMimeParts: N Am 02.02.23 um 08:43 schrieb Jessica Clarke: > On 1 Feb 2023, at 16:40, Jessica Clarke wrote: >> >> On 1 Feb 2023, at 16:30, Stefan Eßer wrote: >>> >>> The branch main has been updated by se: >>> >>> URL: https://cgit.FreeBSD.org/src/commit/?id=1e0853ee84031e4131a0b8cc8737696f199d3d4c >>> >>> commit 1e0853ee84031e4131a0b8cc8737696f199d3d4c >>> Author: Stefan Eßer >>> AuthorDate: 2023-02-01 16:24:18 +0000 >>> Commit: Stefan Eßer >>> CommitDate: 2023-02-01 16:24:18 +0000 >>> >>> sys/kbio.h: support Unicode key codes in vt keymap files >>> >>> Some keyboard definitions return Unicode characters that cannot be >>> represented in the 8 bits provided by an u_char. >>> >>> Extend then width of the keycode entries to 16 bits to allow for all >>> keycodes currently defined in share/vt/keymaps/*,kbd. >>> >>> Reported by: yuri@aetern.org >>> MFC after: 3 days >>> --- >>> sys/sys/kbio.h | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/sys/sys/kbio.h b/sys/sys/kbio.h >>> index 7f17bda76c51..b0779f5ed114 100644 >>> --- a/sys/sys/kbio.h >>> +++ b/sys/sys/kbio.h >>> @@ -200,7 +200,7 @@ typedef struct okeymap okeymap_t; >>> >>> struct acc_t { >>> u_char accchar; >>> - u_char map[NUM_ACCENTCHARS][2]; >>> + u_short map[NUM_ACCENTCHARS][2]; >> >> This breaks ABI for [GP]IO_DEADKEYMAP. > > Ping. This is important, especially with the MFC after. > > This should be reverted and re-landed with compat IMO. The patch has been reverted in commit f7e5465cb597 and a patch set that offers ABI backwards compatibility has been uploaded to phabricator for review as: https://reviews.freebsd.org/D38381 The ioctl handler in kbd/kbd.c has been extended in the same way as had been used to support 32 bit key codes in the main key map (with similar backwards compatibility code). Support of kbdcontrol built with the patched kbio.h on an old kernel could be added to kbdcontrol.c - but we do not support running a new user land on an old kernel, in general. (The old kbdcontrol on a new kernel could load the normal keymap, but the dead key map would be ignored.) I have used u_int for all values to be able to support the full Unicode range, since this type has already been used for the normal key code maps. I'd appreciate a quick review to be able to MFC to -STABLE in time for inclusion in the upcoming 13.2 release ... Regards, STefan