From nobody Sun Feb 8 23:36:12 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1558109698; cv=none; d=zoho.com; s=zohoarc; b=FfmSiB3gSEpPKjFgU/7SMOgX3s8Q5PKnaxt0hxy+bE293V7XgZb51i1MpoYesUHn/sQ9ZOPScCWoK25yLoJGrNWI7kytoR2JovPCxHgN9gdIvYnSry7bA+CAZBfDYcvdtMKEVmtNMjY3zahshubMBcKOnw5KFfMbgcZ0fx56WOg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558109698; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=n/uTcfZVc4kVcsNSm9RvzrWhF5r/W+NAx+onAgBAEsk=; b=GiHlw/t4bY3477IIO3XxiWi+NLL+fHcs73r2WT6gHrOi6WaRbdZAX4AcidJIaLt+B5jZraIIu/+/+gjMzI3OzbOFOLvxcOHKoH9Y6U3ajBeKFJqnwEC/ehAjvv15qCJi9Lyip4uor+3IPiNGNTELyZyoAoAlBCmLBQ+BADHfnf8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1558109698388884.1297009264775; Fri, 17 May 2019 09:14:58 -0700 (PDT) Received: from localhost ([127.0.0.1]:50840 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hRfVS-0005RP-Cb for importer@patchew.org; Fri, 17 May 2019 12:14:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60924) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hRfTs-0004GY-Of for qemu-devel@nongnu.org; Fri, 17 May 2019 12:13:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hRfTo-0008AL-UZ for qemu-devel@nongnu.org; Fri, 17 May 2019 12:13:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33058) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hRfTl-0007zU-6V for qemu-devel@nongnu.org; Fri, 17 May 2019 12:13:06 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 662E3317916C; Fri, 17 May 2019 16:12:45 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-117-74.ams2.redhat.com [10.36.117.74]) by smtp.corp.redhat.com (Postfix) with ESMTP id B2F8E5D71B; Fri, 17 May 2019 16:12:42 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B335317532; Fri, 17 May 2019 18:12:41 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 17 May 2019 18:12:39 +0200 Message-Id: <20190517161241.11813-3-kraxel@redhat.com> In-Reply-To: <20190517161241.11813-1-kraxel@redhat.com> References: <20190517161241.11813-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Fri, 17 May 2019 16:12:50 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 2/4] ui/curses: manipulate cchar_t with standard curses functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samuel Thibault , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Samuel Thibault The chars/attr fields are curses internals, setcchar and getcchar have to be used instead. Signed-off-by: Samuel Thibault Tested-by: Kamil Rytarowski Message-Id: <20190427183307.12796-3-samuel.thibault@ens-lyon.org> Signed-off-by: Gerd Hoffmann --- ui/curses.c | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/ui/curses.c b/ui/curses.c index 81d419879ede..1f3fcabb004b 100644 --- a/ui/curses.c +++ b/ui/curses.c @@ -66,20 +66,22 @@ static void curses_update(DisplayChangeListener *dcl, { console_ch_t *line; cchar_t curses_line[width]; + wchar_t wch[CCHARW_MAX]; + attr_t attrs; + short colors; + int ret; =20 line =3D screen + y * width; for (h +=3D y; y < h; y ++, line +=3D width) { for (x =3D 0; x < width; x++) { chtype ch =3D line[x] & 0xff; chtype at =3D line[x] & ~0xff; - if (vga_to_curses[ch].chars[0]) { - curses_line[x] =3D vga_to_curses[ch]; - } else { - curses_line[x] =3D (cchar_t) { - .chars[0] =3D ch, - }; + ret =3D getcchar(&vga_to_curses[ch], wch, &attrs, &colors, NUL= L); + if (ret =3D=3D ERR || wch[0] =3D=3D 0) { + wch[0] =3D ch; + wch[1] =3D 0; } - curses_line[x].attr |=3D at; + setcchar(&curses_line[x], wch, at, 0, NULL); } mvwadd_wchnstr(screenpad, y, 0, curses_line, width); } @@ -412,7 +414,7 @@ static void curses_atexit(void) static void convert_ucs(unsigned char fch, uint16_t uch, iconv_t conv) { char mbch[MB_LEN_MAX]; - wchar_t wch; + wchar_t wch[2]; char *puch, *pmbch; size_t such, smbch; mbstate_t ps; @@ -430,20 +432,22 @@ static void convert_ucs(unsigned char fch, uint16_t u= ch, iconv_t conv) } =20 memset(&ps, 0, sizeof(ps)); - if (mbrtowc(&wch, mbch, sizeof(mbch) - smbch, &ps) =3D=3D -1) { + if (mbrtowc(&wch[0], mbch, sizeof(mbch) - smbch, &ps) =3D=3D -1) { fprintf(stderr, "Could not convert 0x%04x " "from a multibyte character to wchar_t: %s\n", uch, strerror(errno)); return; } - vga_to_curses[fch].chars[0] =3D wch; + + wch[1] =3D 0; + setcchar(&vga_to_curses[fch], wch, 0, 0, NULL); } =20 /* Setup wchar glyph for one font character */ static void convert_font(unsigned char fch, iconv_t conv) { char mbch[MB_LEN_MAX]; - wchar_t wch; + wchar_t wch[2]; char *pfch, *pmbch; size_t sfch, smbch; mbstate_t ps; @@ -461,13 +465,15 @@ static void convert_font(unsigned char fch, iconv_t c= onv) } =20 memset(&ps, 0, sizeof(ps)); - if (mbrtowc(&wch, mbch, sizeof(mbch) - smbch, &ps) =3D=3D -1) { + if (mbrtowc(&wch[0], mbch, sizeof(mbch) - smbch, &ps) =3D=3D -1) { fprintf(stderr, "Could not convert font glyph 0x%02x " "from a multibyte character to wchar_t: %s\n", fch, strerror(errno)); return; } - vga_to_curses[fch].chars[0] =3D wch; + + wch[1] =3D 0; + setcchar(&vga_to_curses[fch], wch, 0, 0, NULL); } =20 /* Convert one wchar to UCS-2 */ @@ -592,7 +598,16 @@ static void font_setup(void) if (strcmp(nl_langinfo(CODESET), "UTF-8")) { /* Non-Unicode capable, use termcap equivalents for those availabl= e */ for (i =3D 0; i <=3D 0xFF; i++) { - switch (get_ucs(vga_to_curses[i].chars[0], nativecharset_to_uc= s2)) { + wchar_t wch[CCHARW_MAX]; + attr_t attr; + short color; + int ret; + + ret =3D getcchar(&vga_to_curses[i], wch, &attr, &color, NULL); + if (ret =3D=3D ERR) + continue; + + switch (get_ucs(wch[0], nativecharset_to_ucs2)) { case 0x00a3: vga_to_curses[i] =3D *WACS_STERLING; break; --=20 2.18.1