frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Peter Hutterer 2009-08-11 16:20:20 +10:00
parent fe045820f1
commit 3989dc1d34
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dix/eventconvert.c
View File

@ -347,7 +347,7 @@ appendKeyInfo(DeviceChangedEvent *dce, xXIKeyInfo* info)
uint32_t *kc; uint32_t *kc;
int i; int i;
info->type = KeyClass; info->type = XIKeyClass;
info->num_keycodes = dce->keys.max_keycode - dce->keys.min_keycode + 1; info->num_keycodes = dce->keys.max_keycode - dce->keys.min_keycode + 1;
info->length = sizeof(xXIKeyInfo)/4 + info->num_keycodes; info->length = sizeof(xXIKeyInfo)/4 + info->num_keycodes;
info->sourceid = dce->deviceid; 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)); 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->num_buttons = dce->buttons.num_buttons;
info->length = bytes_to_int32(sizeof(xXIButtonInfo)) + info->length = bytes_to_int32(sizeof(xXIButtonInfo)) +
info->num_buttons + mask_len; info->num_buttons + mask_len;
@ -386,7 +386,7 @@ appendButtonInfo(DeviceChangedEvent *dce, xXIButtonInfo *info)
static int static int
appendValuatorInfo(DeviceChangedEvent *dce, xXIValuatorInfo *info, int axisnumber) appendValuatorInfo(DeviceChangedEvent *dce, xXIValuatorInfo *info, int axisnumber)
{ {
info->type = ValuatorClass; info->type = XIValuatorClass;
info->length = sizeof(xXIValuatorInfo)/4; info->length = sizeof(xXIValuatorInfo)/4;
info->label = dce->valuators[axisnumber].name; info->label = dce->valuators[axisnumber].name;
info->min.integral = dce->valuators[axisnumber].min; info->min.integral = dce->valuators[axisnumber].min;