[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 2/8] ui: fix incorrect pointer position on highdpi with gtk
From: |
Gerd Hoffmann |
Subject: |
[PULL 2/8] ui: fix incorrect pointer position on highdpi with gtk |
Date: |
Mon, 22 Nov 2021 13:40:09 +0100 |
From: Alexander Orzechowski <orzechowski.alexander@gmail.com>
Signed-off-by: Alexander Orzechowski <orzechowski.alexander@gmail.com>
Message-Id: <20211121065504.29101-3-orzechowski.alexander@gmail.com>
[ kraxel: codestyle fix ]
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
ui/gtk.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/ui/gtk.c b/ui/gtk.c
index d2892ea6b4a9..dc4a1491f0ce 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 ||
--
2.33.1
- [PULL 0/8] Fixes 20211122 patches, Gerd Hoffmann, 2021/11/22
- [PULL 1/8] ui: fix incorrect scaling on highdpi with gtk/opengl, Gerd Hoffmann, 2021/11/22
- [PULL 3/8] ui/gtk: graphic_hw_gl_flushed after closing dmabuf->fence_fd, Gerd Hoffmann, 2021/11/22
- [PULL 2/8] ui: fix incorrect pointer position on highdpi with gtk,
Gerd Hoffmann <=
- [PULL 5/8] migration: fix dump-vmstate with modules, Gerd Hoffmann, 2021/11/22
- [PULL 4/8] ui/vnc-clipboard: fix adding notifier twice, Gerd Hoffmann, 2021/11/22
- [PULL 7/8] microvm: add missing g_free() call, Gerd Hoffmann, 2021/11/22
- [PULL 6/8] hw/i386/microvm: Reduce annoying debug message in dt_setup_microvm(), Gerd Hoffmann, 2021/11/22
- [PULL 8/8] microvm: check g_file_set_contents() return value, Gerd Hoffmann, 2021/11/22
- Re: [PULL 0/8] Fixes 20211122 patches, Richard Henderson, 2021/11/22