From nobody Sat Nov 15 19:34:16 2025 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=1748108175; cv=none; d=zohomail.com; s=zohoarc; b=ctlRzPnl0LQZkjygnz8e86Hx6SOm9BRIPEbbHmYJKAeyT9d/VWuprEib/kdu1Ol7aa93XFYZMPxF2I5XK+kiw0aKZJXdBjmoGxs9W5HWgfeqb4BY8g73dh4f2SzGZ0J5Tm7jdMZ0M0P/XBybBDoI2GmwUx8LYSmW1E8w8Ky0LIM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748108175; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=JC2wYKSCVTSC9hRt1qKP/ALSipYOkMme8Y7eicj3lBU=; b=JFLb7QgFSY06IyDvQQnTcK0yfjMpVea/gmh7FpwXSfQrDc77Zqn84guWO+kfNGPisSm3tKye12uCfcpa4Sc3l3t9Gq47pSSXssiVVrYzybQsoFRs/aLvWUekaZPmI9RqFm48WJb7jLWZqauaOjex8e7zyYcl+xpkHbrXFpoJgXU= 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 1748108175413144.83835818781495; Sat, 24 May 2025 10:36:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uIsn3-0000O1-Gn; Sat, 24 May 2025 13:36:09 -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 1uIsn0-0000Ga-FM for qemu-devel@nongnu.org; Sat, 24 May 2025 13:36:06 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uIsmy-0000kp-W9 for qemu-devel@nongnu.org; Sat, 24 May 2025 13:36:06 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-648-GTVondoIPzyRrNp75XieBg-1; Sat, 24 May 2025 13:36:02 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9A1B418001CC; Sat, 24 May 2025 17:36:01 +0000 (UTC) Received: from localhost (unknown [10.45.242.4]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7629719560AB; Sat, 24 May 2025 17:36:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748108164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JC2wYKSCVTSC9hRt1qKP/ALSipYOkMme8Y7eicj3lBU=; b=Mjje9fKD3gnD67iCYiL0X+CCXwGy88SvAz1g+wdbAf/SXubIiy+ugCb2wz9YjFHyvdJUMV XKld6cpuqc8NTURXLCa4btl54tQqnkKduly+ZKD26fPo0t24t1syOe9N5exWz5OANsCs8U oMTpJrsYVGB90rxprU0MjZyuTTUsSvw= X-MC-Unique: GTVondoIPzyRrNp75XieBg-1 X-Mimecast-MFC-AGG-ID: GTVondoIPzyRrNp75XieBg_1748108161 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , stefanha@redhat.com, Weifeng Liu Subject: [PULL 13/19] gtk/ui: Introduce helper gd_update_scale Date: Sat, 24 May 2025 19:35:06 +0200 Message-ID: <20250524173514.317886-14-marcandre.lureau@redhat.com> In-Reply-To: <20250524173514.317886-1-marcandre.lureau@redhat.com> References: <20250524173514.317886-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 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.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.298, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1748108176236116600 From: Weifeng Liu The code snippet updating scale_x/scale_y is general and will be used in next patch. Make it a function. Signed-off-by: Weifeng Liu Message-ID: <20250511073337.876650-4-weifeng.liu.z@gmail.com> Acked-by: Gerd Hoffmann Acked-by: Marc-Andr=C3=A9 Lureau --- include/ui/gtk.h | 2 ++ ui/gtk.c | 30 +++++++++++++++++++----------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/include/ui/gtk.h b/include/ui/gtk.h index aa3d637029..d3944046db 100644 --- a/include/ui/gtk.h +++ b/include/ui/gtk.h @@ -224,4 +224,6 @@ int gd_gl_area_make_current(DisplayGLCtx *dgc, /* gtk-clipboard.c */ void gd_clipboard_init(GtkDisplayState *gd); =20 +void gd_update_scale(VirtualConsole *vc, int ww, int wh, int fbw, int fbh); + #endif /* UI_GTK_H */ diff --git a/ui/gtk.c b/ui/gtk.c index 8f5bb4b62e..47af49e387 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -801,6 +801,24 @@ void gd_update_monitor_refresh_rate(VirtualConsole *vc= , GtkWidget *widget) #endif } =20 +void gd_update_scale(VirtualConsole *vc, int ww, int wh, int fbw, int fbh) +{ + if (!vc) { + return; + } + + if (vc->s->full_screen) { + vc->gfx.scale_x =3D (double)ww / fbw; + vc->gfx.scale_y =3D (double)wh / fbh; + } else if (vc->s->free_scale) { + double sx, sy; + + sx =3D (double)ww / fbw; + sy =3D (double)wh / fbh; + + vc->gfx.scale_x =3D vc->gfx.scale_y =3D MIN(sx, sy); + } +} /** * DOC: Coordinate handling. * @@ -908,17 +926,7 @@ static gboolean gd_draw_event(GtkWidget *widget, cairo= _t *cr, void *opaque) ww_widget =3D gdk_window_get_width(gtk_widget_get_window(widget)); wh_widget =3D gdk_window_get_height(gtk_widget_get_window(widget)); =20 - if (s->full_screen) { - vc->gfx.scale_x =3D (double)ww_widget / fbw; - vc->gfx.scale_y =3D (double)wh_widget / fbh; - } else if (s->free_scale) { - double sx, sy; - - sx =3D (double)ww_widget / fbw; - sy =3D (double)wh_widget / fbh; - - vc->gfx.scale_x =3D vc->gfx.scale_y =3D MIN(sx, sy); - } + gd_update_scale(vc, ww_widget, wh_widget, fbw, fbh); =20 ww_surface =3D fbw * vc->gfx.scale_x; wh_surface =3D fbh * vc->gfx.scale_y; --=20 2.49.0