From patchwork Sun Nov 21 06:55:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Orzechowski X-Patchwork-Id: 1557670 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=eoHiy6o2; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4HxkkY0q88z9t5G for ; Sun, 21 Nov 2021 19:55:17 +1100 (AEDT) Received: from localhost ([::1]:49668 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moid0-00020x-IS for incoming@patchwork.ozlabs.org; Sun, 21 Nov 2021 03:55:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49020) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moglU-0005Lc-BX for qemu-devel@nongnu.org; Sun, 21 Nov 2021 01:55:52 -0500 Received: from [2607:f8b0:4864:20::f31] (port=37828 helo=mail-qv1-xf31.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moglR-000329-Ri for qemu-devel@nongnu.org; Sun, 21 Nov 2021 01:55:52 -0500 Received: by mail-qv1-xf31.google.com with SMTP id u16so10217539qvk.4 for ; Sat, 20 Nov 2021 22:55:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5xpZ/oN69NYjWLiOy9aVbPuud8yfHwuHeUJvbpO6fBg=; b=eoHiy6o2iL8UJo5skue0d5T8vzkd4GP6n2gbWGOg5Jq5ySW5cFz+5U6tokejHlZlXR DqfkSmjUsV+2IVZrfHEBXkmX93jnI0OcL5lUKIrdUy1PP7R4b5eMmyeBdAj2d37+qJqj 0SWUcQuJEiH+bbeyBI7qJXti+bxrsQx3QXoyyVJoOJw+cRBZIe3hzJJNR0RcbDX4LE6q /3xMIR9E7SWwtSg2qy5v3UjlSwGNJ5GTOwdeTg8lAgwsiW40q2GxbSypI6ggk0Jpze8K prmTVoiL8c6GI3wTwXPne38hZaEgiIUpLz9IVIpG1qGI7CgCeU0SRkCRMVmdfM7+UK1d UeXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5xpZ/oN69NYjWLiOy9aVbPuud8yfHwuHeUJvbpO6fBg=; b=DDjSQK4YGkehQRUhOI03InoP84mzxVZdGPRL0KiQ2NiA0HPtMz/9foxo6OHfIpQpyX a8nMAQ8ryJLwRgGedTsWgTz4S+igAndKT7klUDebc05ErJPkJFJ1S4NYhoJ4GfPdERkZ mfMqgcb0Ir8GeubCaq6xjACNUFPArBe88raC8SL0QZBHJxB9dLzoMspp3D2gVJt3XEC2 Tj7GjlWUBoAUVjha74Hg9nrx/O4zA0MxzmS0VYWScqhzWPeQP7t03AYYc14SlMHAo+tz k7bOQPYPXCasPq4/38Yo68Cm2Gq4SN764LhjpS40y6z/StMcf1V0qZe3zlun/mfmJMUp Yg+w== X-Gm-Message-State: AOAM532wn2PbJ0uh93U/rpEuFVLLGejegNVJIbSuhz7QN2b+JUYYPyHM qQO+/8Mttwi4v7vFfc/sv7FQuFuC3mv1Yv8UYAE= X-Google-Smtp-Source: ABdhPJxqz9LsPPaKXGFf8Qm8j8b8aruisM+vCYWfvSCkHn6JSR5ZbcJPXa0/Nw77TDxueFHHEUJbeg== X-Received: by 2002:a05:6214:8e5:: with SMTP id dr5mr88671674qvb.28.1637477748618; Sat, 20 Nov 2021 22:55:48 -0800 (PST) Received: from alexdesktop.localdomain (cpebc4dfb42ca53-cmbc4dfb42ca50.cpe.net.cable.rogers.com. [99.251.122.96]) by smtp.gmail.com with ESMTPSA id j24sm2489860qkg.133.2021.11.20.22.55.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Nov 2021 22:55:48 -0800 (PST) From: Alexander Orzechowski To: qemu-devel@nongnu.org Subject: [PATCH 1/2] ui: fix incorrect scaling on highdpi with gtk/opengl Date: Sun, 21 Nov 2021 01:55:03 -0500 Message-Id: <20211121065504.29101-2-orzechowski.alexander@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211121065504.29101-1-orzechowski.alexander@gmail.com> References: <20211121065504.29101-1-orzechowski.alexander@gmail.com> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::f31 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::f31; envelope-from=orzechowski.alexander@gmail.com; helo=mail-qv1-xf31.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sun, 21 Nov 2021 03:51:47 -0500 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: , Cc: Alexander Orzechowski Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alexander Orzechowski Reviewed-by: Philippe Mathieu-Daudé --- ui/gtk-gl-area.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ui/gtk-gl-area.c b/ui/gtk-gl-area.c index 461da7712f..d3565698ae 100644 --- a/ui/gtk-gl-area.c +++ b/ui/gtk-gl-area.c @@ -41,15 +41,16 @@ void gd_gl_area_draw(VirtualConsole *vc) #ifdef CONFIG_GBM QemuDmaBuf *dmabuf = vc->gfx.guest_fb.dmabuf; #endif - int ww, wh, y1, y2; + int ww, wh, ws, y1, y2; if (!vc->gfx.gls) { return; } gtk_gl_area_make_current(GTK_GL_AREA(vc->gfx.drawing_area)); - ww = gtk_widget_get_allocated_width(vc->gfx.drawing_area); - wh = gtk_widget_get_allocated_height(vc->gfx.drawing_area); + ws = gdk_window_get_scale_factor (gtk_widget_get_window(vc->gfx.drawing_area)); + ww = gtk_widget_get_allocated_width(vc->gfx.drawing_area) * ws; + wh = gtk_widget_get_allocated_height(vc->gfx.drawing_area) * ws; if (vc->gfx.scanout_mode) { if (!vc->gfx.guest_fb.framebuffer) { From patchwork Sun Nov 21 06:55:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Orzechowski X-Patchwork-Id: 1557668 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=oUwZ9xU9; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hxkgp44SYz9t5G for ; Sun, 21 Nov 2021 19:52:52 +1100 (AEDT) Received: from localhost ([::1]:43360 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moiad-0006Ce-G7 for incoming@patchwork.ozlabs.org; Sun, 21 Nov 2021 03:52:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moglU-0005Lk-U3 for qemu-devel@nongnu.org; Sun, 21 Nov 2021 01:55:52 -0500 Received: from [2607:f8b0:4864:20::833] (port=41482 helo=mail-qt1-x833.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moglT-00032l-4g for qemu-devel@nongnu.org; Sun, 21 Nov 2021 01:55:52 -0500 Received: by mail-qt1-x833.google.com with SMTP id v22so13534606qtx.8 for ; Sat, 20 Nov 2021 22:55:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kWxlpj8mWhkOK0M2vJPQE3IMUvDbT9hEDEfIqiv7KKU=; b=oUwZ9xU9UTBWaP83vM+LZHXlv76Zc1QtBGbyMdj4wvXu+5KVAsG+0xshhcYNo8XoQ1 0eNA0pe0JXT9+VK2wuvSCHIYAc007F4+wmyPQp0tZdgWMydnWND+v0bcx/mSQO9ZI5I+ NcLpS6MBLM1iD0wJs9day28LqJoml0n8NgbcYX/XJUsg3Kn54oCuxc2EOuY0gjV8mPva wVbwlxnGCCVQe3wxQPYyMlaou0WSnIaf5WdzxCpcFnlaILneH+LkiWSsaAQHE48ksRYj gSOEFK5bQZAN+mATLn8Ybkee32YF3jut5NuHUtGGF1MAYxCiASwiCijnySvFWgUXYpXe OFvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kWxlpj8mWhkOK0M2vJPQE3IMUvDbT9hEDEfIqiv7KKU=; b=mbNr+sYgjreeGDxjQMwt+C2t0/d1cvRxtV6PrlnslhWBq2x7Ylx0qgx6U0FKLzGIYI gZg0eDGC6BFlsAngFgt8vEbYSg2nRMHUhgflzzekVYmnAzp8mdG3U/usnAF4x/yYSNBf EbXT6UCiLmWRHWuGP/82svNxodcld0qhebF4QGia+vVK7mj7Y7F4Wlw10qCj2cYNibgX cOphChpCEIwDH3Fd3nzkskt8nutZXylMUaps5vhf/wAQ3hET+jYvxeK7He8Xn0YFwmcT AqokfQQ7engDOFOSewW23CyKAKMeSAZ1ZC4Yl3lDuUPOqkdVMu/kHQIfNmOnijGb3FHO 3qRw== X-Gm-Message-State: AOAM532JKztHiWR6k6jOvxNjn+Wb4iuJkEMmE/S/9mzUghuopdFp1v8t 8AQqqyx8hSi8VM7pnvjxxmKOmZqhRYrmxeivg+w= X-Google-Smtp-Source: ABdhPJw2PUbtHqFgYrtCyJehfdfStp9wzNGGfim/iVCnCLkiXptBXeiETjHS0Z+4Xkb6zYvQFHXNVQ== X-Received: by 2002:a05:622a:1112:: with SMTP id e18mr20799459qty.226.1637477750240; Sat, 20 Nov 2021 22:55:50 -0800 (PST) Received: from alexdesktop.localdomain (cpebc4dfb42ca53-cmbc4dfb42ca50.cpe.net.cable.rogers.com. [99.251.122.96]) by smtp.gmail.com with ESMTPSA id j24sm2489860qkg.133.2021.11.20.22.55.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Nov 2021 22:55:50 -0800 (PST) From: Alexander Orzechowski To: qemu-devel@nongnu.org Subject: [PATCH 2/2] ui: fix incorrect pointer position on highdpi with gtk Date: Sun, 21 Nov 2021 01:55:04 -0500 Message-Id: <20211121065504.29101-3-orzechowski.alexander@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211121065504.29101-1-orzechowski.alexander@gmail.com> References: <20211121065504.29101-1-orzechowski.alexander@gmail.com> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::833 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::833; envelope-from=orzechowski.alexander@gmail.com; helo=mail-qt1-x833.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sun, 21 Nov 2021 03:51:46 -0500 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: , Cc: Alexander Orzechowski Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alexander Orzechowski --- ui/gtk.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ui/gtk.c b/ui/gtk.c index d2892ea6b4..b2670142b5 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -838,10 +838,11 @@ static gboolean gd_motion_event(GtkWidget *widget, GdkEventMotion *motion, { VirtualConsole *vc = opaque; GtkDisplayState *s = vc->s; + GdkWindow *window; int x, y; int mx, my; int fbh, fbw; - int ww, wh; + int ww, wh, ws; if (!vc->gfx.ds) { return TRUE; @@ -850,8 +851,10 @@ static gboolean gd_motion_event(GtkWidget *widget, GdkEventMotion *motion, fbw = surface_width(vc->gfx.ds) * vc->gfx.scale_x; fbh = surface_height(vc->gfx.ds) * vc->gfx.scale_y; - ww = gdk_window_get_width(gtk_widget_get_window(vc->gfx.drawing_area)); - wh = gdk_window_get_height(gtk_widget_get_window(vc->gfx.drawing_area)); + window = gtk_widget_get_window(vc->gfx.drawing_area); + ww = gdk_window_get_width(window); + wh = gdk_window_get_height(window); + ws = gdk_window_get_scale_factor (window); mx = my = 0; if (ww > fbw) { @@ -861,8 +864,8 @@ static gboolean gd_motion_event(GtkWidget *widget, GdkEventMotion *motion, my = (wh - fbh) / 2; } - x = (motion->x - mx) / vc->gfx.scale_x; - y = (motion->y - my) / vc->gfx.scale_y; + x = (motion->x - mx) / vc->gfx.scale_x * ws; + y = (motion->y - my) / vc->gfx.scale_y * ws; if (qemu_input_is_absolute()) { if (x < 0 || y < 0 ||