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 From: Michael Schutte To: kbd@lists.altlinux.org Date: Fri, 24 Jul 2009 13:55:38 +0200 Message-Id: <1248436538-21478-1-git-send-email-michi@uiae.at> X-Mailer: git-send-email 1.5.6.5 Subject: [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: Fri, 24 Jul 2009 11:56:04 -0000 Archived-At: List-Archive: As always, auto-conversion applies in case of XLATE mode (or no KDSKBDIACRUC support). Signed-off-by: Michael Schutte --- src/loadkeys.y | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/loadkeys.y b/src/loadkeys.y index 64cb8ee..b2ba003 100644 --- a/src/loadkeys.y +++ b/src/loadkeys.y @@ -161,15 +161,16 @@ 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($2, $3, $5); - } ; +compsym : CCHAR + { $$ = $1; } + | UNUMBER + { $$ = $1 ^ 0xf000; } + ; singleline : { mod = 0; } modifiers KEYCODE NUMBER EQUALS rvalue EOL { -- 1.5.6.5