input: rename device->type to device->xinput_type.
This type is only used in XI to give a hint of what type this device may be. Call it xinput_type for clarity. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
parent
81b3b0cce0
commit
1cce55cc03
|
@ -1079,7 +1079,7 @@ IResetProc(ExtensionEntry * unused)
|
|||
void
|
||||
AssignTypeAndName(DeviceIntPtr dev, Atom type, char *name)
|
||||
{
|
||||
dev->type = type;
|
||||
dev->xinput_type = type;
|
||||
dev->name = (char *)xalloc(strlen(name) + 1);
|
||||
strcpy(dev->name, name);
|
||||
}
|
||||
|
|
|
@ -175,7 +175,7 @@ CopySwapDevice(ClientPtr client, DeviceIntPtr d, int num_classes,
|
|||
dev = (xDeviceInfoPtr) * buf;
|
||||
|
||||
dev->id = d->id;
|
||||
dev->type = d->type;
|
||||
dev->type = d->xinput_type;
|
||||
dev->num_classes = num_classes;
|
||||
if (d->isMaster && IsKeyboardDevice(d))
|
||||
dev->use = IsXKeyboard;
|
||||
|
|
|
@ -471,7 +471,7 @@ typedef struct _DeviceIntRec {
|
|||
Bool coreEvents; /* TRUE if device also sends core */
|
||||
GrabInfoRec deviceGrab; /* grab on the device */
|
||||
Bool isMaster; /* TRUE if device is master */
|
||||
Atom type;
|
||||
Atom xinput_type;
|
||||
char *name;
|
||||
CARD8 id;
|
||||
KeyClassPtr key;
|
||||
|
|
|
@ -6117,7 +6117,7 @@ char * str;
|
|||
if (dev->button)
|
||||
rep.totalBtns= dev->button->numButtons;
|
||||
else rep.totalBtns= 0;
|
||||
rep.devType= dev->type;
|
||||
rep.devType= dev->xinput_type;
|
||||
rep.hasOwnState= (dev->key && dev->key->xkbInfo);
|
||||
rep.nDeviceLedFBs = 0;
|
||||
if (dev->kbdfeed) rep.dfltKbdFB= dev->kbdfeed->ctrl.id;
|
||||
|
|
Loading…
Reference in New Issue
Block a user