From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51061) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZWCle-0003V5-Js for qemu-devel@nongnu.org; Sun, 30 Aug 2015 20:16:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZWClb-0006FL-CE for qemu-devel@nongnu.org; Sun, 30 Aug 2015 20:16:10 -0400 Received: from domu-toccata.ens-lyon.fr ([140.77.166.138]:38970 helo=sonata.ens-lyon.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZWClb-0006FB-50 for qemu-devel@nongnu.org; Sun, 30 Aug 2015 20:16:07 -0400 Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 8D731200CC for ; Mon, 31 Aug 2015 02:16:06 +0200 (CEST) Received: from sonata.ens-lyon.org ([127.0.0.1]) by localhost (sonata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oew9OlR_dSxN for ; Mon, 31 Aug 2015 02:16:06 +0200 (CEST) Received: from var.ipv6 (ABordeaux-652-1-130-128.w2-6.abo.wanadoo.fr [2.6.113.128]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by sonata.ens-lyon.org (Postfix) with ESMTPSA id 641BA200CA for ; Mon, 31 Aug 2015 02:16:06 +0200 (CEST) Received: from samy by var.ipv6 with local (Exim 4.86) (envelope-from ) id 1ZWCla-0002C9-7z for qemu-devel@nongnu.org; Mon, 31 Aug 2015 02:16:06 +0200 Date: Mon, 31 Aug 2015 02:16:06 +0200 From: Samuel Thibault Message-ID: <20150831001606.GE3238@var.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCHv2] baum: Add support for typing ascii List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This adds support for typing ascii through the Baum Braille driver, by translating it to braille with the NABCC table. Signed-off-by: Samuel Thibault diff --git a/backends/baum.c b/backends/baum.c index a69aaff..50e6e86 100644 --- a/backends/baum.c +++ b/backends/baum.c @@ -1,7 +1,7 @@ /* * QEMU Baum Braille Device * - * Copyright (c) 2008 Samuel Thibault + * Copyright (c) 2008, 2015 Samuel Thibault * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -468,12 +468,21 @@ static int baum_write(CharDriverState *chr, const uint8_t *buf, int len) } /* Send the key code to the other end */ -static void baum_send_key(BaumDriverState *baum, uint8_t type, uint8_t value) { +static void baum_send_key(BaumDriverState *baum, uint8_t type, uint8_t value) +{ uint8_t packet[] = { type, value }; DPRINTF("writing key %x %x\n", type, value); baum_write_packet(baum, packet, sizeof(packet)); } +/* Send the 2-byte key code to the other end */ +static void baum_send_key2(BaumDriverState *baum, uint8_t type, uint16_t value) +{ + uint8_t packet[] = { type, value & 0xFF, value >> 8 }; + DPRINTF("writing key %x %x\n", type, value); + baum_write_packet(baum, packet, sizeof(packet)); +} + /* We got some data on the BrlAPI socket */ static void baum_chr_read(void *opaque) { @@ -492,6 +501,14 @@ static void baum_chr_read(void *opaque) baum_send_key(baum, BAUM_RSP_RoutingKey, (code & BRLAPI_KEY_CMD_ARG_MASK)+1); baum_send_key(baum, BAUM_RSP_RoutingKey, 0); break; + case BRLAPI_KEY_CMD_PASSDOTS: + { + unsigned char dots = code & BRLAPI_KEY_CMD_ARG_MASK; + DPRINTF("passdots %x\n", dots); + baum_send_key2(baum, BAUM_RSP_EntryKeys, dots << 8); + baum_send_key2(baum, BAUM_RSP_EntryKeys, 0); + break; + } case 0: switch (code & BRLAPI_KEY_CMD_ARG_MASK) { case BRLAPI_KEY_CMD_FWINLT: @@ -538,7 +555,30 @@ static void baum_chr_read(void *opaque) } break; case BRLAPI_KEY_TYPE_SYM: - break; + { + unsigned modifiers = ((code & BRLAPI_KEY_FLAGS_MASK) + >> BRLAPI_KEY_FLAGS_SHIFT) & 0xFF; + unsigned keysym = code & BRLAPI_KEY_CODE_MASK; + unsigned dots; + if (modifiers & ~1) { + /* Unsupported */ + break; + } + if (keysym <= ' ' || keysym > '~') { + /* Unsupported */ + break; + } + DPRINTF("keysym %x\n", keysym); + for (dots = 1; dots <= 0xFF; dots++) { + if (nabcc_translation[dots] == keysym) { + DPRINTF("dots %x\n", dots); + baum_send_key2(baum, BAUM_RSP_EntryKeys, dots << 8); + baum_send_key2(baum, BAUM_RSP_EntryKeys, 0); + break; + } + } + break; + } } } if (ret == -1 && (brlapi_errno != BRLAPI_ERROR_LIBCERR || errno != EINTR)) {