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:20 +0200 Message-Id: <1248436520-21443-1-git-send-email-michi@uiae.at> X-Mailer: git-send-email 1.5.6.5 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: [kbd] [PATCH] Never handle plain ASCII characters as Unicode 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:55:56 -0000 Archived-At: List-Archive: This doesn’t seem to work for compose: The Unicode keysym representing an ASCII char gets inserted and the kernel waits for another keypress to be “dead”. Signed-off-by: Michael Schutte --- src/ksyms.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ksyms.c b/src/ksyms.c index 4055e54..f68ea30 100644 --- a/src/ksyms.c +++ b/src/ksyms.c @@ -1858,16 +1858,16 @@ convert_code(int code, int direction) if (KTYP(code) == KT_META) return code; + else if (!input_is_unicode && code < 0x80) + /* basic ASCII is fine in every situation */ + return code; + else if (input_is_unicode && (code ^ 0xf000) < 0x80) + /* so is Unicode "Basic Latin" */ + return code ^ 0xf000; else if ((input_is_unicode && direction == TO_UNICODE) || (!input_is_unicode && direction == TO_8BIT)) /* no conversion necessary */ result = code; - else if (!input_is_unicode && code < 0x80) - /* convert ASCII chars without looking them up */ - result = (direction == TO_UNICODE) ? (code ^ 0xf000) : code; - else if (input_is_unicode && (code ^ 0xf000) < 0x80) - /* same for Unicode "Basic Latin" */ - result = (direction == TO_UNICODE) ? code : (code ^ 0xf000); else { /* depending on direction, this will give us either an 8-bit * K(KTYP, KVAL) or a Unicode keysym xor 0xf000 */ -- 1.5.6.5