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

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:
Peter Hutterer 2009-05-20 14:07:03 +10:00
parent 81b3b0cce0
commit 1cce55cc03
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Xi/extinit.c
View File

@ -1079,7 +1079,7 @@ IResetProc(ExtensionEntry * unused)
void void
AssignTypeAndName(DeviceIntPtr dev, Atom type, char *name) AssignTypeAndName(DeviceIntPtr dev, Atom type, char *name)
{ {
dev->type = type; dev->xinput_type = type;
dev->name = (char *)xalloc(strlen(name) + 1); dev->name = (char *)xalloc(strlen(name) + 1);
strcpy(dev->name, name); strcpy(dev->name, name);
} }

2
Xi/listdev.c
View File

@ -175,7 +175,7 @@ CopySwapDevice(ClientPtr client, DeviceIntPtr d, int num_classes,
dev = (xDeviceInfoPtr) * buf; dev = (xDeviceInfoPtr) * buf;
dev->id = d->id; dev->id = d->id;
dev->type = d->type; dev->type = d->xinput_type;
dev->num_classes = num_classes; dev->num_classes = num_classes;
if (d->isMaster && IsKeyboardDevice(d)) if (d->isMaster && IsKeyboardDevice(d))
dev->use = IsXKeyboard; dev->use = IsXKeyboard;

2
include/inputstr.h
View File

@ -471,7 +471,7 @@ typedef struct _DeviceIntRec {
Bool coreEvents; /* TRUE if device also sends core */ Bool coreEvents; /* TRUE if device also sends core */
GrabInfoRec deviceGrab; /* grab on the device */ GrabInfoRec deviceGrab; /* grab on the device */
Bool isMaster; /* TRUE if device is master */ Bool isMaster; /* TRUE if device is master */
Atom type; Atom xinput_type;
char *name; char *name;
CARD8 id; CARD8 id;
KeyClassPtr key; KeyClassPtr key;

2
xkb/xkb.c
View File

@ -6117,7 +6117,7 @@ char * str;
if (dev->button) if (dev->button)
rep.totalBtns= dev->button->numButtons; rep.totalBtns= dev->button->numButtons;
else rep.totalBtns= 0; else rep.totalBtns= 0;
rep.devType= dev->type; rep.devType= dev->xinput_type;
rep.hasOwnState= (dev->key && dev->key->xkbInfo); rep.hasOwnState= (dev->key && dev->key->xkbInfo);
rep.nDeviceLedFBs = 0; rep.nDeviceLedFBs = 0;
if (dev->kbdfeed) rep.dfltKbdFB= dev->kbdfeed->ctrl.id; if (dev->kbdfeed) rep.dfltKbdFB= dev->kbdfeed->ctrl.id;