aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/dix
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-07-23 09:20:51 +0200
committermarha <marha@users.sourceforge.net>2013-07-23 09:20:51 +0200
commit5c340ceb9356ea029dea53b73440268d4769d5a5 (patch)
treeae22100b15246769392280ed7b10eba3dc68b0ea /xorg-server/dix
parentb6aadb8490bdacf33196fa0898fe1247b9a8ee2c (diff)
downloadvcxsrv-5c340ceb9356ea029dea53b73440268d4769d5a5.tar.gz
vcxsrv-5c340ceb9356ea029dea53b73440268d4769d5a5.tar.bz2
vcxsrv-5c340ceb9356ea029dea53b73440268d4769d5a5.zip
libX11 libXmu mesa xserver git update 23 July 2013
xserver commit d5ebe20f9ba9569351c4a41449866679fd60ba45 libX11 commit feb131b18aee31c2c125dc3275b0260940245882 libXmu commit d5dac08d65c4865f311cb62c161dbb1300eecd11 mesa commit 5a7bdd4b4173958c53109517b7c95f1039623e7e
Diffstat (limited to 'xorg-server/dix')
-rw-r--r--xorg-server/dix/getevents.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/dix/getevents.c b/xorg-server/dix/getevents.c
index 51d4fd4da..f5ab8c458 100644
--- a/xorg-server/dix/getevents.c
+++ b/xorg-server/dix/getevents.c
@@ -773,7 +773,7 @@ add_to_scroll_valuator(DeviceIntPtr dev, ValuatorMask *mask, int valuator, doubl
static void
scale_for_device_resolution(DeviceIntPtr dev, ValuatorMask *mask)
{
- double x;
+ double y;
ValuatorClassPtr v = dev->valuator;
int xrange = v->axes[0].max_value - v->axes[0].min_value + 1;
int yrange = v->axes[1].max_value - v->axes[1].min_value + 1;
@@ -783,14 +783,14 @@ scale_for_device_resolution(DeviceIntPtr dev, ValuatorMask *mask)
double resolution_ratio = 1.0;
double ratio;
- if (!valuator_mask_fetch_double(mask, 0, &x))
+ if (!valuator_mask_fetch_double(mask, 1, &y))
return;
if (v->axes[0].resolution != 0 && v->axes[1].resolution != 0)
resolution_ratio = 1.0 * v->axes[0].resolution/v->axes[1].resolution;
ratio = device_ratio/resolution_ratio/screen_ratio;
- valuator_mask_set_double(mask, 0, x * ratio);
+ valuator_mask_set_double(mask, 1, y / ratio);
}
/**