From nobody Fri May 17 12:14:46 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1607678360; cv=none; d=zohomail.com; s=zohoarc; b=ZK0wiuAEK79u8b0ZI/ilOId7HWVl+QbWy0zW3bMG7ZNtyZLshXaVk/Idr69ZP2esEEfm9Cw+fYTyBko2nrbCGYytGivhcUil6rMDF6sDCYZQTp15QLV7z8E++I8c6bZk21PHLTKBZ/LRDYvhcAK86oZDOoMFjbA12wKEOooH3zw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607678360; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DHX9kZNd9vnjdHnG2uLRwzRxWwhk2Yrco6cXucV4B9E=; b=cWmFXwKR4WLMiZZ70tdDLTZ4bcAd3RRVdbqWQHWmuvaATUSbFR8tKDVedmc9lN3G3i8ioAkCKmZ3QsyEPV0UWHAQymzTk0lEL5NqAShdoxwyHrQnRvj8Qoam73OICYBG65DON/MD2OTGr54hI/z8GPhT4tPNk8Nk5+cI/JczE/0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 160767836018128.278352528124515; Fri, 11 Dec 2020 01:19:20 -0800 (PST) Received: from localhost ([::1]:36546 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knea7-0006IT-0G for importer@patchew.org; Fri, 11 Dec 2020 04:19:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kneUA-0007Eu-86 for qemu-devel@nongnu.org; Fri, 11 Dec 2020 04:13:13 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:58067) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kneU1-0004iq-SW for qemu-devel@nongnu.org; Fri, 11 Dec 2020 04:13:10 -0500 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-299-K6862J02MZ2wE3IbP4vXnw-1; Fri, 11 Dec 2020 04:12:59 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6B39F18C89C4 for ; Fri, 11 Dec 2020 09:12:58 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-94.ams2.redhat.com [10.36.112.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id A226E5D9CD; Fri, 11 Dec 2020 09:12:51 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id D40C1A1EE; Fri, 11 Dec 2020 10:12:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607677981; 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=DHX9kZNd9vnjdHnG2uLRwzRxWwhk2Yrco6cXucV4B9E=; b=FjreoQLpKm5vlQlQg6jrUqroZY8XvpXWowj09IdUkg3mHWGC9AyMub9Lj9KUOLSm3Rt7jQ SzNEVf5mBKAhWuEQxujRL+ese/jUdM3d2kQjbzZQz9N0vkpt4dxFqE0WlQp7z9BGaIZ7Yf pPzNPRRyR4UfaejCBBCydxGtFKLSb20= X-MC-Unique: K6862J02MZ2wE3IbP4vXnw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 1/8] console: drop qemu_console_get_ui_info Date: Fri, 11 Dec 2020 10:12:43 +0100 Message-Id: <20201211091250.1415-2-kraxel@redhat.com> In-Reply-To: <20201211091250.1415-1-kraxel@redhat.com> References: <20201211091250.1415-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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=20Lureau?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Unused and duplicate (there is dpy_get_ui_info). Signed-off-by: Gerd Hoffmann Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Daniel P. Berrang=C3=A9 Message-id: 20201208115737.18581-2-kraxel@redhat.com --- include/ui/console.h | 1 - ui/console.c | 6 ------ 2 files changed, 7 deletions(-) diff --git a/include/ui/console.h b/include/ui/console.h index e7303d8b98a8..5dd21976a376 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -390,7 +390,6 @@ bool qemu_console_is_gl_blocked(QemuConsole *con); char *qemu_console_get_label(QemuConsole *con); int qemu_console_get_index(QemuConsole *con); uint32_t qemu_console_get_head(QemuConsole *con); -QemuUIInfo *qemu_console_get_ui_info(QemuConsole *con); int qemu_console_get_width(QemuConsole *con, int fallback); int qemu_console_get_height(QemuConsole *con, int fallback); /* Return the low-level window id for the console */ diff --git a/ui/console.c b/ui/console.c index 53dee8e26b17..f995639e45f6 100644 --- a/ui/console.c +++ b/ui/console.c @@ -2122,12 +2122,6 @@ uint32_t qemu_console_get_head(QemuConsole *con) return con ? con->head : -1; } =20 -QemuUIInfo *qemu_console_get_ui_info(QemuConsole *con) -{ - assert(con !=3D NULL); - return &con->ui_info; -} - int qemu_console_get_width(QemuConsole *con, int fallback) { if (con =3D=3D NULL) { --=20 2.27.0 From nobody Fri May 17 12:14:46 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1607678126; cv=none; d=zohomail.com; s=zohoarc; b=AaE/JvxHJoB4W0tJv7F44b9UrDwBjfpPbnTWtWfRdrF8zE/ap5Aj9mi3dl04WVUW6HD3fOIlMaxjsBhON6zn8l2RX01hDBT31KiORfbAaHE+9GTLq7lnMCP61Ch4NPujIH12bkzxqkl5PH5klAAgtDP2asntlRfIp+wGdOuL0mk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607678126; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sXg9PtHs4TNRrma5VsX7y4nJvBbL6/tlaFskLe+ZdF8=; b=fhhfeiAR7YUbK02j6rNK8A/s1zY8lKnG430rPKU4vjAOor64BWbyAvOIm8ZHWAU+666NRj+dmS4dyMAQqTTmS54+YlGq4phnM6iuYF8HeTWtWH9hsH3AuNUHNSpB8+ovYeyOXKLNZtFctl4dxj5xeygmuQ/EAE6fuD3C2fWUWlw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1607678126507991.0432035087058; Fri, 11 Dec 2020 01:15:26 -0800 (PST) Received: from localhost ([::1]:51164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kneWL-0000U6-50 for importer@patchew.org; Fri, 11 Dec 2020 04:15:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50712) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kneU1-0007Bp-Fg for qemu-devel@nongnu.org; Fri, 11 Dec 2020 04:13:01 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:59435) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kneTy-0004hS-UP for qemu-devel@nongnu.org; Fri, 11 Dec 2020 04:13:01 -0500 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-277-nd9y_nLyPxC5wO6qnDrlDg-1; Fri, 11 Dec 2020 04:12:56 -0500 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 9ABC9107ACE4 for ; Fri, 11 Dec 2020 09:12:55 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-94.ams2.redhat.com [10.36.112.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F70B60862; Fri, 11 Dec 2020 09:12:51 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id DCF6BA1FB; Fri, 11 Dec 2020 10:12:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607677978; 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=sXg9PtHs4TNRrma5VsX7y4nJvBbL6/tlaFskLe+ZdF8=; b=Il4Hoa6rH/kTuUary0Emwp8llVUEm04EGsW8W0e15Ur8W9kKhqKalav4hpmZ/4VWrFK95+ efEQlqCQFm8jlvcifU6jQN0UapciK3JWeB678sIM85X0T2156yD1TU/Nmac7iDdJflQ2iE XT6SgZYYOhzX0WLlFdre5QYVJjD5l9A= X-MC-Unique: nd9y_nLyPxC5wO6qnDrlDg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 2/8] console: allow con==NULL in dpy_{get, set}_ui_info and dpy_ui_info_supported Date: Fri, 11 Dec 2020 10:12:44 +0100 Message-Id: <20201211091250.1415-3-kraxel@redhat.com> In-Reply-To: <20201211091250.1415-1-kraxel@redhat.com> References: <20201211091250.1415-1-kraxel@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=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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?Daniel=20P=20=2E=20Berrang=C3=A9?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Use active_console in that case like we do in many other places. Signed-off-by: Gerd Hoffmann Reviewed-by: Daniel P. Berrang=C3=A9 Message-id: 20201208115737.18581-3-kraxel@redhat.com --- ui/console.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ui/console.c b/ui/console.c index f995639e45f6..30e70be555db 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1544,19 +1544,27 @@ static void dpy_set_ui_info_timer(void *opaque) =20 bool dpy_ui_info_supported(QemuConsole *con) { + if (con =3D=3D NULL) { + con =3D active_console; + } + return con->hw_ops->ui_info !=3D NULL; } =20 const QemuUIInfo *dpy_get_ui_info(const QemuConsole *con) { - assert(con !=3D NULL); + if (con =3D=3D NULL) { + con =3D active_console; + } =20 return &con->ui_info; } =20 int dpy_set_ui_info(QemuConsole *con, QemuUIInfo *info) { - assert(con !=3D NULL); + if (con =3D=3D NULL) { + con =3D active_console; + } =20 if (!dpy_ui_info_supported(con)) { return -1; --=20 2.27.0 From nobody Fri May 17 12:14:46 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1607678246; cv=none; d=zohomail.com; s=zohoarc; b=WPwS0EtjY3jdoDyWBJSDsfJDKHGVI+MVAr2V3VI+zKjaAZmX//ljJhnboZuTgw1gs1g29JvtctxqMBs4B+ftLkrtcWj3Lzb3OGtHEEDb1ERk85rx9AiFfYwCGP58UBos9t8OpkapSthVLNsfBmEY91AxzKdri2suWmd32RVzrmo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607678246; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cxIX9GDzOgoFPRmeLMzj3W2zz96O176IaB6Yhw0mySw=; b=PnJG0YIAxgN3Qn2wQrVt323hKg4folhHIqiY4+ByCvDIoAs073tqb3KYdCBhTSwYNvafhvXk9lrrgX5h9GVx9Rj2GNdgQnAFu/sWLXqO0q8I158C+SlLR6UZ3iCnty9ZaoUQld8hFqXUGRHUNIVqLUz1430FZStl2rGnjQmp8fs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1607678246770726.2216520873592; Fri, 11 Dec 2020 01:17:26 -0800 (PST) Received: from localhost ([::1]:58732 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kneYH-0003kW-Kd for importer@patchew.org; Fri, 11 Dec 2020 04:17:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50696) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kneTz-0007Ar-Uk for qemu-devel@nongnu.org; Fri, 11 Dec 2020 04:12:59 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:32324) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kneTw-0004fX-FU for qemu-devel@nongnu.org; Fri, 11 Dec 2020 04:12:59 -0500 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-212-s0e4is87Ph-xi_-2ibKuSg-1; Fri, 11 Dec 2020 04:12:53 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2440B801AC1 for ; Fri, 11 Dec 2020 09:12:52 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-94.ams2.redhat.com [10.36.112.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id A8F7A10016F5; Fri, 11 Dec 2020 09:12:51 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id E6C339D92; Fri, 11 Dec 2020 10:12:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607677975; 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=cxIX9GDzOgoFPRmeLMzj3W2zz96O176IaB6Yhw0mySw=; b=IFHsOlgVgzE1iDGJGofGAOjFp9J19JedaXTNpw8c8XbNnjWUWrho6sB1xZr7rTZL2IqSZ6 Vfo5BHPqBYUYK9gFzfXOZJAfmP+c3UtUtATUIVMcso4YTGWasQbgUczazv3jqCRMwuzErg q/CIIJ3ntW60sUlaXEeH+3Auwj/tAOo= X-MC-Unique: s0e4is87Ph-xi_-2ibKuSg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 3/8] vnc: use enum for features Date: Fri, 11 Dec 2020 10:12:45 +0100 Message-Id: <20201211091250.1415-4-kraxel@redhat.com> In-Reply-To: <20201211091250.1415-1-kraxel@redhat.com> References: <20201211091250.1415-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=63.128.21.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_H4=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=20Lureau?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Use an enum for the vnc feature bits. That way they are enumerated automatically and we don't have to do that manually when adding or removing features. Signed-off-by: Gerd Hoffmann Reviewed-by: Marc-Andr=C3=A9 Lureau Message-id: 20201208115737.18581-4-kraxel@redhat.com --- ui/vnc.h | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/ui/vnc.h b/ui/vnc.h index 4e2637ce6c5c..262fcf179b44 100644 --- a/ui/vnc.h +++ b/ui/vnc.h @@ -438,18 +438,20 @@ enum { * *************************************************************************= ****/ =20 -#define VNC_FEATURE_RESIZE 0 -#define VNC_FEATURE_HEXTILE 1 -#define VNC_FEATURE_POINTER_TYPE_CHANGE 2 -#define VNC_FEATURE_WMVI 3 -#define VNC_FEATURE_TIGHT 4 -#define VNC_FEATURE_ZLIB 5 -#define VNC_FEATURE_COPYRECT 6 -#define VNC_FEATURE_RICH_CURSOR 7 -#define VNC_FEATURE_TIGHT_PNG 8 -#define VNC_FEATURE_ZRLE 9 -#define VNC_FEATURE_ZYWRLE 10 -#define VNC_FEATURE_LED_STATE 11 +enum VncFeatures { + VNC_FEATURE_RESIZE, + VNC_FEATURE_HEXTILE, + VNC_FEATURE_POINTER_TYPE_CHANGE, + VNC_FEATURE_WMVI, + VNC_FEATURE_TIGHT, + VNC_FEATURE_ZLIB, + VNC_FEATURE_COPYRECT, + VNC_FEATURE_RICH_CURSOR, + VNC_FEATURE_TIGHT_PNG, + VNC_FEATURE_ZRLE, + VNC_FEATURE_ZYWRLE, + VNC_FEATURE_LED_STATE, +}; =20 #define VNC_FEATURE_RESIZE_MASK (1 << VNC_FEATURE_RESIZE) #define VNC_FEATURE_HEXTILE_MASK (1 << VNC_FEATURE_HEXTILE) --=20 2.27.0 From nobody Fri May 17 12:14:46 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1607678250; cv=none; d=zohomail.com; s=zohoarc; b=b9IXuZZ996RN3hHpAuiFjtjTQQzv78YF/yCVcCZAyrvB4H+VqD94rM3vBnMNOXunJ+Fh29bcahGZ9fWxvQf7McSYe8uFYlApGrp8RugPnIibAuKbqenrruAvrY8AfKYULKUJBmg3wWGm+QficoK6oeabS+WZ1VpjOKxT2BwyXGY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607678250; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=moo2ZcRcZPyC2G8O/AUuESXMynkoKZxPPDH8sQImA3Q=; b=ML5n6n8QMxYp+55o7hmStg1m516QOTM0AWxzHXqcpchmSl55hQy9aPya67RawvYQh9jr6EYNGuBtoN1NyGNx2r5Kc1Occ1p2j3JZdiSfISCxJCEnoEfn5O8PBSGO0Ej02Hk/T+8DsEqjHwe6Ln/QZt/KiPHMoAWbzgrGg61Jgfk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1607678250125607.2739608493871; Fri, 11 Dec 2020 01:17:30 -0800 (PST) Received: from localhost ([::1]:58980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kneYL-0003s1-2b for importer@patchew.org; Fri, 11 Dec 2020 04:17:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50804) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kneUk-0007JO-N9 for qemu-devel@nongnu.org; Fri, 11 Dec 2020 04:13:46 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:45105) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kneU1-0004io-MD for qemu-devel@nongnu.org; Fri, 11 Dec 2020 04:13:11 -0500 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-298-UI5bmkhNO9mgbwWvajN-rQ-1; Fri, 11 Dec 2020 04:12:59 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6FE3A107ACE3 for ; Fri, 11 Dec 2020 09:12:58 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-94.ams2.redhat.com [10.36.112.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id A83855D9D5; Fri, 11 Dec 2020 09:12:51 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id F07AB9D99; Fri, 11 Dec 2020 10:12:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607677981; 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=moo2ZcRcZPyC2G8O/AUuESXMynkoKZxPPDH8sQImA3Q=; b=WB5FlQAK2qbVRDPlPMqK4zxKQMnT+sy2hlh+gsMd+xxogKVsJt8K8wI/8mp0/ofZy5kpjZ JHNFnS64o9y3DzOgIvW5+bvDD9/33kvs/xvDcON0W+hlKsH2n7ad+Sgmbi+4RVbUedESyd dEqOGMeYcW4FWgMBSAAqIE41cX/kzkI= X-MC-Unique: UI5bmkhNO9mgbwWvajN-rQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 4/8] vnc: drop unused copyrect feature Date: Fri, 11 Dec 2020 10:12:46 +0100 Message-Id: <20201211091250.1415-5-kraxel@redhat.com> In-Reply-To: <20201211091250.1415-1-kraxel@redhat.com> References: <20201211091250.1415-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=63.128.21.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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=20Lureau?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) vnc stopped using the copyrect pseudo encoding in 2017, in commit 50628d3479e4 ("cirrus/vnc: zap bitblit support from console code.") So we can drop the now unused copyrect feature bit. Signed-off-by: Gerd Hoffmann Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Daniel P. Berrang=C3=A9 Message-id: 20201208115737.18581-5-kraxel@redhat.com --- ui/vnc.h | 2 -- ui/vnc.c | 3 --- 2 files changed, 5 deletions(-) diff --git a/ui/vnc.h b/ui/vnc.h index 262fcf179b44..a7fd38a82075 100644 --- a/ui/vnc.h +++ b/ui/vnc.h @@ -445,7 +445,6 @@ enum VncFeatures { VNC_FEATURE_WMVI, VNC_FEATURE_TIGHT, VNC_FEATURE_ZLIB, - VNC_FEATURE_COPYRECT, VNC_FEATURE_RICH_CURSOR, VNC_FEATURE_TIGHT_PNG, VNC_FEATURE_ZRLE, @@ -459,7 +458,6 @@ enum VncFeatures { #define VNC_FEATURE_WMVI_MASK (1 << VNC_FEATURE_WMVI) #define VNC_FEATURE_TIGHT_MASK (1 << VNC_FEATURE_TIGHT) #define VNC_FEATURE_ZLIB_MASK (1 << VNC_FEATURE_ZLIB) -#define VNC_FEATURE_COPYRECT_MASK (1 << VNC_FEATURE_COPYRECT) #define VNC_FEATURE_RICH_CURSOR_MASK (1 << VNC_FEATURE_RICH_CURSOR) #define VNC_FEATURE_TIGHT_PNG_MASK (1 << VNC_FEATURE_TIGHT_PNG) #define VNC_FEATURE_ZRLE_MASK (1 << VNC_FEATURE_ZRLE) diff --git a/ui/vnc.c b/ui/vnc.c index 49235056f7a8..8c2771c1ce3b 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -2061,9 +2061,6 @@ static void set_encodings(VncState *vs, int32_t *enco= dings, size_t n_encodings) case VNC_ENCODING_RAW: vs->vnc_encoding =3D enc; break; - case VNC_ENCODING_COPYRECT: - vs->features |=3D VNC_FEATURE_COPYRECT_MASK; - break; case VNC_ENCODING_HEXTILE: vs->features |=3D VNC_FEATURE_HEXTILE_MASK; vs->vnc_encoding =3D enc; --=20 2.27.0 From nobody Fri May 17 12:14:46 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1607678354; cv=none; d=zohomail.com; s=zohoarc; b=HJjG1WMe350dV4XcfNX/rCsCbu7dNsQpSCYH+2SIqOb1Z3gKa4SKpjhaXquBgkX5Qp2OuAyrQz5IByHkSOIhPsEySoZ0YXlIcVn+MQdICP26doHYby136zqIBNIGRwI+O7yFQoxHVUAKXJtPTKwIe8j1oCS3XpEMDKqyfd6TOEE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607678354; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WX/uh++fkK5GD+shjr3nqTBp8r8AkWYmVPiIpRu9py4=; b=cKJKw89uY4kRMUZtm7+fNPMhSCBHAjvi3yoGRy5FxEy7TCG8xTTads89tGM5qdohaliYr/BzkUM/6mrk/rM6x659TJ6bnVq5DvJuxKF74MlxRY+4Gf7gj//N2iCGNy0P51SpHW4dSkA2J9IByo9wBCtH3WLLksVUFR3UFCkptMg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1607678354222345.6575507941933; Fri, 11 Dec 2020 01:19:14 -0800 (PST) Received: from localhost ([::1]:36224 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knea1-0006A2-4a for importer@patchew.org; Fri, 11 Dec 2020 04:19:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50808) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kneUk-0007Ja-Od for qemu-devel@nongnu.org; Fri, 11 Dec 2020 04:13:46 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:60436) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kneU5-0004je-VV for qemu-devel@nongnu.org; Fri, 11 Dec 2020 04:13:13 -0500 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-397-OsICoaWuNdCfjjnD6wqlkQ-1; Fri, 11 Dec 2020 04:13:00 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4128959 for ; Fri, 11 Dec 2020 09:12:59 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-94.ams2.redhat.com [10.36.112.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id B472C5F724; Fri, 11 Dec 2020 09:12:52 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 054E79D9B; Fri, 11 Dec 2020 10:12:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607677982; 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=WX/uh++fkK5GD+shjr3nqTBp8r8AkWYmVPiIpRu9py4=; b=caJKZM3MQLKM/e5khrbltgPrGMsUZzlEc6dgr18aukBypB7z1WGhZMeQpACf4orVj6S0Uv a2JEBeGeyHZSHEFzbKmANPaJ3zyPmW48SZposIRLtRoeh8+VS9KSce16pKmCsBSho6Mr8I 08EWOGvjeHE8xSK595YylmrahXjhtiQ= X-MC-Unique: OsICoaWuNdCfjjnD6wqlkQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 5/8] vnc: add pseudo encodings Date: Fri, 11 Dec 2020 10:12:47 +0100 Message-Id: <20201211091250.1415-6-kraxel@redhat.com> In-Reply-To: <20201211091250.1415-1-kraxel@redhat.com> References: <20201211091250.1415-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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=20Lureau?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Add #defines for two new pseudo encodings: * cursor with alpha channel. * extended desktop resize. https://github.com/rfbproto/rfbproto/blob/master/rfbproto.rst#pseudo-encodi= ngs Signed-off-by: Gerd Hoffmann Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Daniel P. Berrang=C3=A9 Message-id: 20201208115737.18581-6-kraxel@redhat.com --- ui/vnc.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/vnc.h b/ui/vnc.h index a7fd38a82075..6f5006da3593 100644 --- a/ui/vnc.h +++ b/ui/vnc.h @@ -411,6 +411,8 @@ enum { #define VNC_ENCODING_AUDIO 0XFFFFFEFD /* -259 */ #define VNC_ENCODING_TIGHT_PNG 0xFFFFFEFC /* -260 */ #define VNC_ENCODING_LED_STATE 0XFFFFFEFB /* -261 */ +#define VNC_ENCODING_DESKTOP_RESIZE_EXT 0XFFFFFECC /* -308 */ +#define VNC_ENCODING_ALPHA_CURSOR 0XFFFFFEC6 /* -314 */ #define VNC_ENCODING_WMVi 0x574D5669 =20 /*************************************************************************= **** --=20 2.27.0 From nobody Fri May 17 12:14:46 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1607678132; cv=none; d=zohomail.com; s=zohoarc; b=dsox254CIezw0JTAy2nUhziIeZdIFfVfHXr7HBfbKv5/AP16ycSw/m/RpkZwNgk7eMTC1Aa6LseGP88gxqGiS0Qk+XDQJWBu7p40/vh+JXXZQh/KdxPNfJtjQtzvWCXI3vEzuu94yqoThrHCd0G7ZBPoS28rRHzSb1C+FLhQyH8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607678132; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZnI4moO+fLj8Yi3nEEqmO9o35hjuYt4zvzug7p/zGyM=; b=ISYy2ihxk4BkFNOtoINcNAZgamAxDsRaJdn3XE4X0d+QVc6na/0IK808jRwBDElcVE3S+HyXNRp+txYUL+hHpZKHdmrCsiKYa2Wmlc7SgYXfiqw6Nw12/pA0XZ0dGs0TLCGDKZogW1XgzalBMoq6NUISbyOhDH1DrKNEukGDeHc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1607678132082249.05099515505594; Fri, 11 Dec 2020 01:15:32 -0800 (PST) Received: from localhost ([::1]:51478 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kneWQ-0000bz-OM for importer@patchew.org; Fri, 11 Dec 2020 04:15:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50794) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kneUB-0007GI-M8 for qemu-devel@nongnu.org; Fri, 11 Dec 2020 04:13:13 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:25136) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kneU6-0004ji-3c for qemu-devel@nongnu.org; Fri, 11 Dec 2020 04:13:11 -0500 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-16-E8OgAsViP7qF63Blnf7g-A-1; Fri, 11 Dec 2020 04:13:00 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 72ECD800D55 for ; Fri, 11 Dec 2020 09:12:59 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-94.ams2.redhat.com [10.36.112.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id B401B5F70B; Fri, 11 Dec 2020 09:12:52 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 0FEDB9D9C; Fri, 11 Dec 2020 10:12:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607677983; 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=ZnI4moO+fLj8Yi3nEEqmO9o35hjuYt4zvzug7p/zGyM=; b=I0mgoKi/4LOdIbZV+33gpWN4W+89KpONiyct0NT6TFIa2DymnVUXNZMwV+0cggDMQZP6jW vtFNjn1R5xSmNsC4Fe8C6MJOUWJ8nUCSZDU9oqy0/j9XIucEW8/c1ehhqL6qdbjak0oLzM e5AjHsoT2OjvMbgp7UEvxKRXWfC+7+k= X-MC-Unique: E8OgAsViP7qF63Blnf7g-A-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 6/8] vnc: add alpha cursor support Date: Fri, 11 Dec 2020 10:12:48 +0100 Message-Id: <20201211091250.1415-7-kraxel@redhat.com> In-Reply-To: <20201211091250.1415-1-kraxel@redhat.com> References: <20201211091250.1415-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=63.128.21.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_H4=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=20Lureau?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) There is a new vnc extension for cursors with an alpha channel. Use it if supported by the vnc client, prefer it over the "rich cursor" extension which supports only a bitmask for transparency. This is a visible improvement especially on modern desktops which actually use the alpha channel when defining cursors. https://github.com/rfbproto/rfbproto/blob/master/rfbproto.rst#cursor-with-a= lpha-pseudo-encoding Signed-off-by: Gerd Hoffmann Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Daniel P. Berrang=C3=A9 Tested-by: Daniel P. Berrang=C3=A9 Message-id: 20201208115737.18581-7-kraxel@redhat.com --- ui/vnc.h | 2 ++ ui/vnc.c | 21 ++++++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/ui/vnc.h b/ui/vnc.h index 6f5006da3593..c8d3ad9ec496 100644 --- a/ui/vnc.h +++ b/ui/vnc.h @@ -448,6 +448,7 @@ enum VncFeatures { VNC_FEATURE_TIGHT, VNC_FEATURE_ZLIB, VNC_FEATURE_RICH_CURSOR, + VNC_FEATURE_ALPHA_CURSOR, VNC_FEATURE_TIGHT_PNG, VNC_FEATURE_ZRLE, VNC_FEATURE_ZYWRLE, @@ -461,6 +462,7 @@ enum VncFeatures { #define VNC_FEATURE_TIGHT_MASK (1 << VNC_FEATURE_TIGHT) #define VNC_FEATURE_ZLIB_MASK (1 << VNC_FEATURE_ZLIB) #define VNC_FEATURE_RICH_CURSOR_MASK (1 << VNC_FEATURE_RICH_CURSOR) +#define VNC_FEATURE_ALPHA_CURSOR_MASK (1 << VNC_FEATURE_ALPHA_CURSO= R) #define VNC_FEATURE_TIGHT_PNG_MASK (1 << VNC_FEATURE_TIGHT_PNG) #define VNC_FEATURE_ZRLE_MASK (1 << VNC_FEATURE_ZRLE) #define VNC_FEATURE_ZYWRLE_MASK (1 << VNC_FEATURE_ZYWRLE) diff --git a/ui/vnc.c b/ui/vnc.c index 8c2771c1ce3b..247e80d8f5c8 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -937,6 +937,18 @@ static int vnc_cursor_define(VncState *vs) QEMUCursor *c =3D vs->vd->cursor; int isize; =20 + if (vnc_has_feature(vs, VNC_FEATURE_ALPHA_CURSOR)) { + vnc_lock_output(vs); + vnc_write_u8(vs, VNC_MSG_SERVER_FRAMEBUFFER_UPDATE); + vnc_write_u8(vs, 0); /* padding */ + vnc_write_u16(vs, 1); /* # of rects */ + vnc_framebuffer_update(vs, c->hot_x, c->hot_y, c->width, c->height, + VNC_ENCODING_ALPHA_CURSOR); + vnc_write_s32(vs, VNC_ENCODING_RAW); + vnc_write(vs, c->data, c->width * c->height * 4); + vnc_unlock_output(vs); + return 0; + } if (vnc_has_feature(vs, VNC_FEATURE_RICH_CURSOR)) { vnc_lock_output(vs); vnc_write_u8(vs, VNC_MSG_SERVER_FRAMEBUFFER_UPDATE); @@ -2102,9 +2114,9 @@ static void set_encodings(VncState *vs, int32_t *enco= dings, size_t n_encodings) break; case VNC_ENCODING_RICH_CURSOR: vs->features |=3D VNC_FEATURE_RICH_CURSOR_MASK; - if (vs->vd->cursor) { - vnc_cursor_define(vs); - } + break; + case VNC_ENCODING_ALPHA_CURSOR: + vs->features |=3D VNC_FEATURE_ALPHA_CURSOR_MASK; break; case VNC_ENCODING_EXT_KEY_EVENT: send_ext_key_event_ack(vs); @@ -2134,6 +2146,9 @@ static void set_encodings(VncState *vs, int32_t *enco= dings, size_t n_encodings) vnc_desktop_resize(vs); check_pointer_type_change(&vs->mouse_mode_notifier, NULL); vnc_led_state_change(vs); + if (vs->vd->cursor) { + vnc_cursor_define(vs); + } } =20 static void set_pixel_conversion(VncState *vs) --=20 2.27.0 From nobody Fri May 17 12:14:46 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1607678249; cv=none; d=zohomail.com; s=zohoarc; b=dRGUACqSKEVfkBzgnPLVpujzvpQyuvoWzuoJYT9AqOakbOagl4F8KBj4GKEH1yOIOUI1MaVeoBcVaN5vs/e69HUzWeNjYz4B58u8s+4WVtVYe4QlMiudWGOUgIrFsn6Tmah85A/yLRVxtLZ/DKjPfEq/VXQxAKP2H1oUl7Aj/YE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607678249; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Wq9bxXFiEZiWNfxB3VKZXN/zH1Ik3kNE0TlN/sqibYg=; b=DaAYZTehB467nFdi6zVggdpCVofPNQDSzK18ZEJVArzrlFYfIBz3GyzMgevrqA2c93NLyjD3+ZdlPkjSMrWU0TOpK6TPQdrOK428j1TxmWbFIL6oZZ/Y1yxW2Dw6cQ7g/Noy+6RVAZl1e0td0zWj+0+JAK7znakJr/PLmTqd02Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1607678249357371.4510669329095; Fri, 11 Dec 2020 01:17:29 -0800 (PST) Received: from localhost ([::1]:58868 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kneYK-0003p5-8j for importer@patchew.org; Fri, 11 Dec 2020 04:17:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50754) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kneU6-0007Dd-LN for qemu-devel@nongnu.org; Fri, 11 Dec 2020 04:13:06 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:40495) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kneU1-0004i4-E9 for qemu-devel@nongnu.org; Fri, 11 Dec 2020 04:13:06 -0500 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-218-rbzm6aU6Pt23drjG-vQAyQ-1; Fri, 11 Dec 2020 04:12:57 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5DA38107ACE8; Fri, 11 Dec 2020 09:12:56 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-94.ams2.redhat.com [10.36.112.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id ED6931002393; Fri, 11 Dec 2020 09:12:52 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 18CC89D9D; Fri, 11 Dec 2020 10:12:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607677980; 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=Wq9bxXFiEZiWNfxB3VKZXN/zH1Ik3kNE0TlN/sqibYg=; b=W81aw87dZmTCYHzDSxRuiHke9ltGMeYG6Htk/kJYtACGtQfAZ0JA7Lt8cnXRoBhwMrcB83 jg4BjMAlbvEoELJX9uSF3NYoq5GhFhxaxCUuI+1sY6SpCERzwuyxKwI0SvxUUHt5UiyCBU XIzyXLMt3xX9o+PPbHXwvQYwiofplsw= X-MC-Unique: rbzm6aU6Pt23drjG-vQAyQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 7/8] ui/vnc: Add missing lock for send_color_map Date: Fri, 11 Dec 2020 10:12:49 +0100 Message-Id: <20201211091250.1415-8-kraxel@redhat.com> In-Reply-To: <20201211091250.1415-1-kraxel@redhat.com> References: <20201211091250.1415-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=63.128.21.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: Peng Liang , Euler Robot , Gerd Hoffmann , qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Peng Liang vnc_write() should be locked after the RFB protocol is initialized. Fixes: 0c426e4534b4 ("vnc: Add support for color map") Cc: qemu-stable@nongnu.org Reported-by: Euler Robot Signed-off-by: Peng Liang Message-id: 20201116141338.148911-1-liangpeng10@huawei.com Signed-off-by: Gerd Hoffmann --- ui/vnc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/vnc.c b/ui/vnc.c index 247e80d8f5c8..34e6dc437c0f 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -2168,6 +2168,7 @@ static void send_color_map(VncState *vs) { int i; =20 + vnc_lock_output(vs); vnc_write_u8(vs, VNC_MSG_SERVER_SET_COLOUR_MAP_ENTRIES); vnc_write_u8(vs, 0); /* padding */ vnc_write_u16(vs, 0); /* first color */ @@ -2180,6 +2181,7 @@ static void send_color_map(VncState *vs) vnc_write_u16(vs, (((i >> pf->gshift) & pf->gmax) << (16 - pf->gbi= ts))); vnc_write_u16(vs, (((i >> pf->bshift) & pf->bmax) << (16 - pf->bbi= ts))); } + vnc_unlock_output(vs); } =20 static void set_pixel_format(VncState *vs, int bits_per_pixel, --=20 2.27.0 From nobody Fri May 17 12:14:46 2024 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1607678126; cv=none; d=zohomail.com; s=zohoarc; b=P454qk0+jSVIRERO7T+957/BhNpkbbS3mPfxaEozcKZr1at0lCD4woZC7QsqWeWKjR5Yom45QdUZbvCXNAxsk6sW+urBc71Nkg/hFsJwGy7LA0qadnc8myQVhbM3bv3QK/7Zv2EMp/M63XJgKQpXPt3YX/OkrJtEuz4rQ2TanVo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607678126; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cxIEjvho7eyh3m6h2azIU0Z/7onVePosHIs+gxuHU70=; b=JBKSWuBQqaa3t19bdQOx/ivKz38xByGQ+EQJ/H9C5+jPYp3TnbIcM7n4AS/dSbhmTHL+FJLXwOH3pvSQuOAodmwwZsenYNhcxOpjTv8atg6Vq8ujX5GdGSOC0Df1broQI70iUg1F4gIBrHcanJy3r0WsqML/MFrKNXqBzEyOehk= 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=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1607678126581214.10531933536834; Fri, 11 Dec 2020 01:15:26 -0800 (PST) Received: from localhost ([::1]:51214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kneWL-0000VO-4j for importer@patchew.org; Fri, 11 Dec 2020 04:15:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50716) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kneU1-0007Bu-Kd for qemu-devel@nongnu.org; Fri, 11 Dec 2020 04:13:01 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:58297) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kneU0-0004ht-0b for qemu-devel@nongnu.org; Fri, 11 Dec 2020 04:13:01 -0500 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-216-78mf5SahMh6scF4oU5wChQ-1; Fri, 11 Dec 2020 04:12:57 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5AD05800D55; Fri, 11 Dec 2020 09:12:56 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-94.ams2.redhat.com [10.36.112.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id EE38C10023B8; Fri, 11 Dec 2020 09:12:52 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 21C289D9E; Fri, 11 Dec 2020 10:12:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607677979; 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=cxIEjvho7eyh3m6h2azIU0Z/7onVePosHIs+gxuHU70=; b=A5bNFDVwlktJdB36SqoQuHH17sfGU7CSMgh4Yqv2h5sd5nB97F2o0G9OBt/4KNk2Pe3Mjx sQI5LJvMDjieLPA0kvq/6uvOFp14ttlkxK5GszX8SgU98mHAoDMLY9RsT1pv/O9ryilC1H oUI6iYmfhx71r3mmh7J9SjL4aTGtWzA= X-MC-Unique: 78mf5SahMh6scF4oU5wChQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 8/8] sdl2: Add extra mouse buttons Date: Fri, 11 Dec 2020 10:12:50 +0100 Message-Id: <20201211091250.1415-9-kraxel@redhat.com> In-Reply-To: <20201211091250.1415-1-kraxel@redhat.com> References: <20201211091250.1415-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=63.128.21.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_H4=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: Gerd Hoffmann , Darrell Walisser Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Darrell Walisser Allows guest to receive mouse buttons 4 and 5, aka "SIDE" button and "EXTRA" button Signed-off-by: Darrell Walisser Message-id: GNUALCfDBqhCUvLwBNJaKqxcPewMtlqCnixk8xTrgI@ubuntu Signed-off-by: Gerd Hoffmann --- ui/sdl2.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/sdl2.c b/ui/sdl2.c index 189d26e2a951..a578017268ae 100644 --- a/ui/sdl2.c +++ b/ui/sdl2.c @@ -275,6 +275,8 @@ static void sdl_send_mouse_event(struct sdl2_console *s= con, int dx, int dy, [INPUT_BUTTON_LEFT] =3D SDL_BUTTON(SDL_BUTTON_LEFT), [INPUT_BUTTON_MIDDLE] =3D SDL_BUTTON(SDL_BUTTON_MIDDLE), [INPUT_BUTTON_RIGHT] =3D SDL_BUTTON(SDL_BUTTON_RIGHT), + [INPUT_BUTTON_SIDE] =3D SDL_BUTTON(SDL_BUTTON_X1), + [INPUT_BUTTON_EXTRA] =3D SDL_BUTTON(SDL_BUTTON_X2) }; static uint32_t prev_state; =20 --=20 2.27.0