From f47a000b7ac0edbe7e56ed0a4bc17bad16b16df0 Mon Sep 17 00:00:00 2001 From: Sybren Date: Thu, 12 Jul 2012 15:51:03 +0200 Subject: [PATCH] Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=51904 The Xdmx server now updates the desktop info of screenInfo, and the cursor movent is now scaled correctly in scale_from_screen(). --- dix/getevents.c | 4 ++-- hw/dmx/dmxcursor.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dix/getevents.c b/dix/getevents.c index 27c2e04..70d1727 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -844,14 +844,14 @@ scale_from_screen(DeviceIntPtr dev, ValuatorMask *mask) scaled = valuator_mask_get_double(mask, 0) + scr->x; scaled = rescaleValuatorAxis(scaled, NULL, dev->valuator->axes + 0, - 0, scr->width); + screenInfo.x, screenInfo.width); valuator_mask_set_double(mask, 0, scaled); } if (valuator_mask_isset(mask, 1)) { scaled = valuator_mask_get_double(mask, 1) + scr->y; scaled = rescaleValuatorAxis(scaled, NULL, dev->valuator->axes + 1, - 0, scr->height); + screenInfo.y, screenInfo.height); valuator_mask_set_double(mask, 1, scaled); } } diff --git a/hw/dmx/dmxcursor.c b/hw/dmx/dmxcursor.c index 1a77c7d..35aca81 100644 --- a/hw/dmx/dmxcursor.c +++ b/hw/dmx/dmxcursor.c @@ -346,6 +346,8 @@ dmxComputeScreenOrigins(void) screenInfo.screens[i]->y -= minY; } } + + update_desktop_dimensions(); } /** Recompute origin information in the #dmxScreens list. This is -- 1.7.11.1