summaryrefslogtreecommitdiff
path: root/dix
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-08-11 16:20:20 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-08-17 10:14:20 +1000
commit3989dc1d34f116f30915632cc5286937392e180a (patch)
tree1522f23ecd2b728ef9bc45b7e58d4aff692d7275 /dix
parentfe045820f1fb33991e8bff5c6e192097caa85727 (diff)
dix: use the XI2 defines for class types.
Doesn't matter really, they have the same values anyway. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'dix')
-rw-r--r--dix/eventconvert.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/dix/eventconvert.c b/dix/eventconvert.c
index 554f6eb76..f0c98eadc 100644
--- a/dix/eventconvert.c
+++ b/dix/eventconvert.c
@@ -347,7 +347,7 @@ appendKeyInfo(DeviceChangedEvent *dce, xXIKeyInfo* info)
uint32_t *kc;
int i;
- info->type = KeyClass;
+ info->type = XIKeyClass;
info->num_keycodes = dce->keys.max_keycode - dce->keys.min_keycode + 1;
info->length = sizeof(xXIKeyInfo)/4 + info->num_keycodes;
info->sourceid = dce->deviceid;
@@ -367,7 +367,7 @@ appendButtonInfo(DeviceChangedEvent *dce, xXIButtonInfo *info)
mask_len = bytes_to_int32(bits_to_bytes(dce->buttons.num_buttons));
- info->type = ButtonClass;
+ info->type = XIButtonClass;
info->num_buttons = dce->buttons.num_buttons;
info->length = bytes_to_int32(sizeof(xXIButtonInfo)) +
info->num_buttons + mask_len;
@@ -386,7 +386,7 @@ appendButtonInfo(DeviceChangedEvent *dce, xXIButtonInfo *info)
static int
appendValuatorInfo(DeviceChangedEvent *dce, xXIValuatorInfo *info, int axisnumber)
{
- info->type = ValuatorClass;
+ info->type = XIValuatorClass;
info->length = sizeof(xXIValuatorInfo)/4;
info->label = dce->valuators[axisnumber].name;
info->min.integral = dce->valuators[axisnumber].min;