From patchwork Thu Sep 17 06:22:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 273511 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 95ACBC433E2 for ; Thu, 17 Sep 2020 06:27:29 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3861020707 for ; Thu, 17 Sep 2020 06:27:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ROLy34dT" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3861020707 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35028 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kInOC-0001FL-2r for qemu-devel@archiver.kernel.org; Thu, 17 Sep 2020 02:27:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60478) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kInKX-0005Pt-3s for qemu-devel@nongnu.org; Thu, 17 Sep 2020 02:23:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:25156) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kInKU-0002rG-Fw for qemu-devel@nongnu.org; Thu, 17 Sep 2020 02:23:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600323817; 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=ziCp3kCLgwt0IrpskcKmpgnVheJ8yvW5fcXhOtiMXtk=; b=ROLy34dTHqT7SJV345banGNyQno1MwjuJHzeT5CxnPkNlDXDIfqfnh72mMAC5LdCHYCRt4 qfyWFI1VnOaJndRSPSarAd9zkCY83oHMdu1k7SQCR5H+R7PKEKPAAN4YTYREmWRjVBxK+O cahPHP+wBd+fKL+lezH02K8Sl+ea+Ug= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-372-zo0_IHdhOP2ExQiWd0aQQQ-1; Thu, 17 Sep 2020 02:23:34 -0400 X-MC-Unique: zo0_IHdhOP2ExQiWd0aQQQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A4EB71008301 for ; Thu, 17 Sep 2020 06:23:33 +0000 (UTC) Received: from localhost (unknown [10.36.110.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1395E60BE5; Thu, 17 Sep 2020 06:23:25 +0000 (UTC) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 4/5] spice: get monitors physical dimension Date: Thu, 17 Sep 2020 10:22:41 +0400 Message-Id: <20200917062242.1877925-5-marcandre.lureau@redhat.com> In-Reply-To: <20200917062242.1877925-1-marcandre.lureau@redhat.com> References: <20200917062242.1877925-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/16 20:51:18 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.999, 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, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Note that for consistency, we use the same logic as MonitorsConfig to figure out the associated monitor. However, I can't find traces of the discussion/patches about the "new spice-server" behaviour: it still uses the multiple-configurations path in git master. Signed-off-by: Marc-André Lureau --- include/ui/console.h | 3 +++ ui/spice-display.c | 17 +++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/include/ui/console.h b/include/ui/console.h index b1b0b74317..dfbd7f2940 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -129,6 +129,9 @@ typedef struct DisplaySurface { } DisplaySurface; typedef struct QemuUIInfo { + /* physical dimension */ + uint16_t width_mm; + uint16_t height_mm; /* geometry */ int xoff; int yoff; diff --git a/ui/spice-display.c b/ui/spice-display.c index 625d9232b9..2f14d5a080 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -674,6 +674,8 @@ static int interface_client_monitors_config(QXLInstance *sin, info = *dpy_get_ui_info(ssd->dcl.con); + /* Note: this code doesn't handle Spice multi-head support, where multiple + * monitor configuration for a single QXL device means multiple head. */ if (mc->num_of_monitors == 1) { /* * New spice-server version which filters the list of monitors @@ -697,7 +699,22 @@ static int interface_client_monitors_config(QXLInstance *sin, info.height = mc->monitors[head].height; } } +#if SPICE_SERVER_VERSION >= 0x000e04 /* release 0.14.4 */ + if (mc->flags & VD_AGENT_CONFIG_MONITORS_FLAG_PHYSICAL_SIZE) { + VDAgentMonitorMM *mm = (void *)&mc->monitors[mc->num_of_monitors]; + if (mc->num_of_monitors == 1) { + info.width_mm = mm[0].width; + info.height_mm = mm[0].height; + } else { + head = qemu_console_get_index(ssd->dcl.con); + if (mc->num_of_monitors > head) { + info.width_mm = mm[head].width; + info.height_mm = mm[head].height; + } + } + } +#endif trace_qemu_spice_ui_info(ssd->qxl.id, info.width, info.height); dpy_set_ui_info(ssd->dcl.con, &info); return 1;