aboutsummaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
authorAlexander Orzechowski <orzechowski.alexander@gmail.com>2021-11-21 01:55:04 -0500
committerGerd Hoffmann <kraxel@redhat.com>2021-11-22 11:14:01 +0100
commitf14aab420c58b57e07189d6d9e6d3fbfab4761a6 (patch)
tree17c51586844580b563a9aeaecdc2c123b4083ec4 /ui
parent4323118cadc5a316f73b5b0a60b5789ed9201369 (diff)
ui: fix incorrect pointer position on highdpi with gtk
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>
Diffstat (limited to 'ui')
-rw-r--r--ui/gtk.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/ui/gtk.c b/ui/gtk.c
index d2892ea6b4..dc4a1491f0 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 ||