diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2013-03-14 11:07:57 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2013-05-14 16:35:36 +1000 |
| commit | 1c215f5a9c7f8a75ad56f3b34b0b7de2ee9aa6ff (patch) | |
| tree | 21518cb630f4804bd307164bab05983861e0041f /dix | |
| parent | 70236f770c7004016efe89dc5638ccbb9ef15bee (diff) | |
dix: send the current axis value in DeviceChangedEvents (#62321)
X.Org Bug 62321 <http://bugs.freedesktop.org/show_bug.cgi?id=62321>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 23d1bc69f305edd5a6e2cfec3dfc84befda0881c)
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/eventconvert.c | 4 | ||||
| -rw-r--r-- | dix/getevents.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/dix/eventconvert.c b/dix/eventconvert.c index ebc52c36c..f7ecdba77 100644 --- a/dix/eventconvert.c +++ b/dix/eventconvert.c @@ -501,9 +501,7 @@ appendValuatorInfo(DeviceChangedEvent *dce, xXIValuatorInfo * info, info->min.frac = 0; info->max.integral = dce->valuators[axisnumber].max; info->max.frac = 0; - /* FIXME: value */ - info->value.integral = 0; - info->value.frac = 0; + info->value = double_to_fp3232(dce->valuators[axisnumber].value); info->resolution = dce->valuators[axisnumber].resolution; info->number = axisnumber; info->mode = dce->valuators[axisnumber].mode; diff --git a/dix/getevents.c b/dix/getevents.c index a4f192cf0..241c7ec0d 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -277,6 +277,7 @@ CreateClassesChangedEvent(InternalEvent *event, dce->valuators[i].mode = slave->valuator->axes[i].mode; dce->valuators[i].name = slave->valuator->axes[i].label; dce->valuators[i].scroll = slave->valuator->axes[i].scroll; + dce->valuators[i].value = slave->valuator->axisVal[i]; } } if (slave->key) { |