From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on sa.int.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00 autolearn=ham version=3.2.5 Date: Wed, 29 Jul 2009 09:55:44 +0200 From: Michael Schutte To: Linux console tools development discussion Message-ID: <20090729075544.GA3610@amilo.homenet> Mail-Followup-To: Linux console tools development discussion References: <1248436538-21478-1-git-send-email-michi@uiae.at> <4A6F7E7E.30207@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="E39vaYmALEf/7YXx" Content-Disposition: inline In-Reply-To: <4A6F7E7E.30207@gmail.com> Jabber-ID: schm@yne.at User-Agent: Mutt/1.5.17 (2007-11-01) Subject: Re: [kbd] [PATCH] Enable UNUMBERs in compose definitions X-BeenThere: kbd@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: Linux console tools development discussion List-Id: Linux console tools development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jul 2009 07:56:22 -0000 Archived-At: List-Archive: --E39vaYmALEf/7YXx Content-Type: multipart/mixed; boundary="OXfL5xGRrasGEqWY" Content-Disposition: inline --OXfL5xGRrasGEqWY Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hey Alexey, On Wed, Jul 29, 2009 at 02:41:02AM +0400, Alexey Gladkov wrote: > You narrowed syntax. I disagree with this incompatibility. > Why you did this ? >=20 > At least, three keymaps use Literal: >=20 > $ grep -lri '^[[:space:]]*Compose.*to[[:space:]]\+[a-zA-Z][a-zA-Z_0-9]*' * > i386/qwerty/br-latin1-abnt2.map > i386/qwerty/br-latin1-us.map > i386/qwerty/et.map You=E2=80=99re right of course. A corrected version of the patch is attach= ed to this mail. --=20 Michael Schutte --OXfL5xGRrasGEqWY Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-Enable-UNUMBERs-in-compose-definitions.patch" Content-Transfer-Encoding: quoted-printable =46rom 4bf89bb1f47bdf003cb9af47363dd28c3fe82ba2 Mon Sep 17 00:00:00 2001 =46rom: Michael Schutte Date: Fri, 24 Jul 2009 12:28:27 +0200 Subject: [PATCH] Enable UNUMBERs in compose definitions As always, auto-conversion applies in case of XLATE mode (or no KDSKBDIACRUC support). Signed-off-by: Michael Schutte --- src/loadkeys.y | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/loadkeys.y b/src/loadkeys.y index c58aa03..6beba09 100644 --- a/src/loadkeys.y +++ b/src/loadkeys.y @@ -169,15 +169,20 @@ strline : STRING LITERAL EQUALS STRLITERAL EOL addfunc(kbs_buf); } ; -compline : COMPOSE CCHAR CCHAR TO CCHAR EOL +compline : COMPOSE compsym compsym TO compsym EOL { compose($2, $3, $5); } - | COMPOSE CCHAR CCHAR TO rvalue EOL + | COMPOSE compsym compsym TO rvalue EOL { compose($2, $3, $5); } ; +compsym : CCHAR + { $$ =3D $1; } + | UNUMBER + { $$ =3D $1 ^ 0xf000; } + ; singleline : { mod =3D 0; } modifiers KEYCODE NUMBER EQUALS rvalue EOL { --=20 1.5.6.5 --OXfL5xGRrasGEqWY-- --E39vaYmALEf/7YXx Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iQEcBAEBAgAGBQJKcACAAAoJEPPkEi8djCYaGz8H/j0LuyPx+I7K/41wXUzP4pjD vqEDYmtKzczRFkm1Rzv4lb2V1GcfB1DtL0AuYytzUrHFMWCEFiTB/arN6kaeec+v pMdHu1LruHfCKYMYNUbtcMu0P0Sedyl831UN0TFa07Vqods50SYsyUia9RKSVemJ dkAb98BHDKmy7HjeHuE77XdbD1F8Pwe5rENvnfg1aM4pfx7K0t1qmiufKjxHv4cY HHhUmj67cQpw6BLgp+0IbDJdR99C4uIJ/3e1pa8ZAFnmwhXQYoTKwzphKC9WiGEA QT0uoLi0omQcMRI9HujiDM00czswJGuDFppz9L+wMjAcZFnXMS+94Mdvuco207E= =UXBn -----END PGP SIGNATURE----- --E39vaYmALEf/7YXx--