From 4bf89bb1f47bdf003cb9af47363dd28c3fe82ba2 Mon Sep 17 00:00:00 2001 From: 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 + { $$ = $1; } + | UNUMBER + { $$ = $1 ^ 0xf000; } + ; singleline : { mod = 0; } modifiers KEYCODE NUMBER EQUALS rvalue EOL { -- 1.5.6.5