From nobody Tue Apr 7 02:37:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1773737693; cv=none; d=zohomail.com; s=zohoarc; b=FQAtfLyejGVUTpPUe2xQ0Ina2PrKViBXdXVcRWStNf7ghDtdzNxN3iaJar0a9OQpGJtSBLh29HEhqMi5EeUY1BfjndbjWXlCTFBqQVTSSuL5kiI2tbOjGHDVtwDpiBF0fiQKsjfT4Hd7xT65XXgNboyOHmh36a89gKgm0KYl4kY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773737693; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=PPgZoVBC3b4nDaEUUg80+XlVnCSXlIOSgM1V9iyuX24=; b=I/Qr/iyezNrJIVvjBw74zdkUP+EPAUsKoTpJDPsHJLuWsloVwHuGntX08DNgZ0kLrneDYvqxrDEktel24hgOTMwJG1OOO6XEqPu3sLkiwBfQeOPWWZXe4HgXn4H2pt0HM5HxHhKOg/Ldm2SglHZGSuEJYu1wxAu9RWNK1depJKw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773737693189820.1296302106535; Tue, 17 Mar 2026 01:54:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w2QBF-0008ND-ST; Tue, 17 Mar 2026 04:53:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w2QAF-0006hG-SL for qemu-devel@nongnu.org; Tue, 17 Mar 2026 04:52:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w2QAD-000384-7F for qemu-devel@nongnu.org; Tue, 17 Mar 2026 04:52:34 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-27-oI_BlhmWMSu-lNKtlZMikg-1; Tue, 17 Mar 2026 04:52:31 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6946F19560A6 for ; Tue, 17 Mar 2026 08:52:30 +0000 (UTC) Received: from localhost (unknown [10.44.22.6]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5135D19560AB for ; Tue, 17 Mar 2026 08:52:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773737552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PPgZoVBC3b4nDaEUUg80+XlVnCSXlIOSgM1V9iyuX24=; b=G+kfqdboKmsV9mWTA20hDceety8IpdvROUX7watf+pZxGQw1BU+ERoA389skc281uUlai5 eEIbAd/GA8GJYDpqi6WZiHx8bjutj2VsxArYbqbnG6N5CNazXgcMZsFyadHPucPrK2K33+ GxdSe8X74VOfBOJ6jx4EgZ9xHsa671U= X-MC-Unique: oI_BlhmWMSu-lNKtlZMikg-1 X-Mimecast-MFC-AGG-ID: oI_BlhmWMSu-lNKtlZMikg_1773737550 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Tue, 17 Mar 2026 12:50:33 +0400 Subject: [PATCH 19/60] ui/console-vc: make show_cursor() take vt100 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260317-qemu-vnc-v1-19-48eb1dcf7b76@redhat.com> References: <20260317-qemu-vnc-v1-0-48eb1dcf7b76@redhat.com> In-Reply-To: <20260317-qemu-vnc-v1-0-48eb1dcf7b76@redhat.com> To: qemu-devel@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=2790; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=NyYSvih93rJd1CyzwrhBo41dWBooijMHyzc0vvlvhBE=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBpuRXa9/4+mZMUFwBNqLlVzWSmXQSJR51b1lVMA n9B0VnZvH2JAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCabkV2gAKCRDa6OEJdZac 5XnKEAC03bgMrLW8YzW0GcFMPHiXUIYb+aDc4kfBdEa8moHwoAwHF/00maC2bmEZeZRfPfbl1VI ZD5eAiQiQ2sQFucXwX8Mt4KfndeWslz3iGm8zSespwPNs828gI0EuLuIfsEccBjO/RGBNFHHfyX prVsF7MI7xvZfYQ1DILZLVgl3lnuRAvn2FFGZ9Nrx/gVw0kicla+lZLJDXEA4yY5bJggJrqk2rI 4bbt9fanno0jSQD8BOGlD/v5g8XpCdwWUF5A6KPs1G8Hqn6c6DikDrnMl6n21yFc0h7I+Hdd7mh hLAgcJwEKRmVT7V/h57QP461DW2gKcL3QAk3woaYVYaDI+3Rugc42hrGzXYn1OmF4NFvcw4bCfj iCsh5H8aLKkKk7QcmnljpLmTPZN71ZIqv/GFrMxnXR0DtJeSp1gsvw8b0/c5kFltJ1o1JyGwyQk ga0dtepvzLFRyo3g2J7SYDt44WgCqWO2oniAekL1/jX6UQwOu/iGbW9xlFENQqYlYX+99Z7Ypuk Yn5WnSZCy4E8dhc9gnnN14xWE0yzkmU5ZCTV3PBnoYC0gQVBfNDmYCdFM9xy9DPs6VYbWn6XeXm IUXgBtBSXZ3l6O2XVdgh2WsQKrRfoVDtH6wPECxIeUhOpsf3RgvnVK4j1goEWCxJZunB3A7BjcO Xfjw0Orf2+xTYMA== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1773737694635154100 Decouples glyph rendering from the console object, continuing the QemuVT100 abstraction introduced in the previous commits. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- ui/console-vc.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ui/console-vc.c b/ui/console-vc.c index 4117429a508..56e2527c7a2 100644 --- a/ui/console-vc.c +++ b/ui/console-vc.c @@ -195,32 +195,32 @@ static void vt100_invalidate_xy(QemuVT100 *vt, int x,= int y) } } =20 -static void console_show_cursor(QemuTextConsole *s, int show) +static void vt100_show_cursor(QemuVT100 *vt, int show) { TextCell *c; int y, y1; - int x =3D s->vt.x; + int x =3D vt->x; =20 - s->vt.cursor_invalidate =3D 1; + vt->cursor_invalidate =3D 1; =20 - if (x >=3D s->vt.width) { - x =3D s->vt.width - 1; + if (x >=3D vt->width) { + x =3D vt->width - 1; } - y1 =3D (s->vt.y_base + s->vt.y) % s->vt.total_height; - y =3D y1 - s->vt.y_displayed; + y1 =3D (vt->y_base + vt->y) % vt->total_height; + y =3D y1 - vt->y_displayed; if (y < 0) { - y +=3D s->vt.total_height; + y +=3D vt->total_height; } - if (y < s->vt.height) { - c =3D &s->vt.cells[y1 * s->vt.width + x]; + if (y < vt->height) { + c =3D &vt->cells[y1 * vt->width + x]; if (show && cursor_visible_phase) { TextAttributes t_attrib =3D TEXT_ATTRIBUTES_DEFAULT; t_attrib.invers =3D !(t_attrib.invers); /* invert fg and bg */ - vt100_putcharxy(&s->vt, x, y, c->ch, &t_attrib); + vt100_putcharxy(vt, x, y, c->ch, &t_attrib); } else { - vt100_putcharxy(&s->vt, x, y, c->ch, &(c->t_attrib)); + vt100_putcharxy(vt, x, y, c->ch, &(c->t_attrib)); } - vt100_invalidate_xy(&s->vt, x, y); + vt100_invalidate_xy(vt, x, y); } } =20 @@ -251,7 +251,7 @@ static void console_refresh(QemuTextConsole *s) y1 =3D 0; } } - console_show_cursor(s, 1); + vt100_show_cursor(&s->vt, 1); dpy_gfx_update(QEMU_CONSOLE(s), 0, 0, w, h); } =20 @@ -1069,11 +1069,11 @@ static int vc_chr_write(Chardev *chr, const uint8_t= *buf, int len) s->vt.update_y0 =3D s->vt.height * FONT_HEIGHT; s->vt.update_x1 =3D 0; s->vt.update_y1 =3D 0; - console_show_cursor(s, 0); + vt100_show_cursor(&s->vt, 0); for(i =3D 0; i < len; i++) { vc_putchar(drv, buf[i]); } - console_show_cursor(s, 1); + vt100_show_cursor(&s->vt, 1); if (s->vt.update_x0 < s->vt.update_x1) { dpy_gfx_update(QEMU_CONSOLE(s), s->vt.update_x0, s->vt.update_y0, s->vt.update_x1 - s->vt.update_x0, --=20 2.53.0