From patchwork Sat Nov 29 10:39:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gonglei (Arei)" X-Patchwork-Id: 415984 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 0978A140277 for ; Sat, 29 Nov 2014 21:40:50 +1100 (AEDT) Received: from localhost ([::1]:47191 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XufSI-0006A3-Tv for incoming@patchwork.ozlabs.org; Sat, 29 Nov 2014 05:40:46 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56746) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XufRi-0005fb-Rc for qemu-devel@nongnu.org; Sat, 29 Nov 2014 05:40:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XufRe-0004AP-1N for qemu-devel@nongnu.org; Sat, 29 Nov 2014 05:40:10 -0500 Received: from szxga01-in.huawei.com ([119.145.14.64]:48880) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XufRd-000415-D2 for qemu-devel@nongnu.org; Sat, 29 Nov 2014 05:40:05 -0500 Received: from 172.24.2.119 (EHLO szxeml405-hub.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CFG02052; Sat, 29 Nov 2014 18:39:56 +0800 (CST) Received: from localhost (10.177.19.102) by szxeml405-hub.china.huawei.com (10.82.67.60) with Microsoft SMTP Server id 14.3.158.1; Sat, 29 Nov 2014 18:39:48 +0800 From: To: Date: Sat, 29 Nov 2014 18:39:41 +0800 Message-ID: <1417257582-1272-2-git-send-email-arei.gonglei@huawei.com> X-Mailer: git-send-email 1.7.3.1.msysgit.0 In-Reply-To: <1417257582-1272-1-git-send-email-arei.gonglei@huawei.com> References: <1417257582-1272-1-git-send-email-arei.gonglei@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.19.102] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 119.145.14.64 Cc: Gonglei , weidong.huang@huawei.com, kraxel@redhat.com, peter.huangpeng@huawei.com Subject: [Qemu-devel] [RFC PATCH 1/2] vnc: introduce vnc_display_kbd_layout function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Gonglei In order to support changing vnc keyboard layout dynamically. Signed-off-by: Gonglei --- include/ui/console.h | 5 +++++ ui/vnc.c | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/include/ui/console.h b/include/ui/console.h index 887ed91..4645dc3 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -333,6 +333,7 @@ void vnc_display_add_client(const char *id, int csock, bool skipauth); char *vnc_display_local_addr(const char *id); #ifdef CONFIG_VNC int vnc_display_password(const char *id, const char *password); +int vnc_display_kbd_layout(const char *id, const char *kbd_layout); int vnc_display_pw_expire(const char *id, time_t expires); QemuOpts *vnc_parse_func(const char *str); int vnc_init_func(QemuOpts *opts, void *opaque); @@ -341,6 +342,10 @@ static inline int vnc_display_password(const char *id, const char *password) { return -ENODEV; } +int vnc_display_kbd_layout(const char *id, const char *kbd_layout) +{ + return -ENODEV; +} static inline int vnc_display_pw_expire(const char *id, time_t expires) { return -ENODEV; diff --git a/ui/vnc.c b/ui/vnc.c index 8d189e7..5a2c60d 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3090,6 +3090,27 @@ int vnc_display_password(const char *id, const char *password) return 0; } +int vnc_display_kbd_layout(const char *id, const char *kbd_layout) +{ + VncDisplay *vs = vnc_display_find(id); + kbd_layout_t *k = NULL; + + if (!vs) { + return -EINVAL; + } + + k = init_keyboard_layout(name2keysym, kbd_layout); + if (!k) { + return -EINVAL; + } + + trace_vnc_key_map_init(kbd_layout); + g_free(vs->kbd_layout); + vs->kbd_layout = k; + + return 0; +} + int vnc_display_pw_expire(const char *id, time_t expires) { VncDisplay *vs = vnc_display_find(id);