andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xkb: better support of XkbDfltXIId

Browse Source 
XKB.h specifies that XkbDfltXIId should be used where the client doesn't
care about the device identifier.  We take this to mean core devices,
where practical.
This commit is contained in:
Daniel Stone 2006-10-14 22:14:56 +03:00 committed by Daniel Stone
parent 4d8030076e
commit a05044cfc1
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xkb/xkbUtils.c
View File

@ -78,6 +78,8 @@ _XkbLookupKeyboard(int id,int *why_rtrn)
{ {
DeviceIntPtr dev = NULL; DeviceIntPtr dev = NULL;
if (id == XkbDfltXIId)
id = XkbUseCoreKbd;
if ((dev= _XkbLookupAnyDevice(id,why_rtrn))==NULL) if ((dev= _XkbLookupAnyDevice(id,why_rtrn))==NULL)
return NULL; return NULL;
else if ((!dev->key)||(!dev->key->xkbInfo)) { else if ((!dev->key)||(!dev->key->xkbInfo)) {
@ -108,6 +110,8 @@ _XkbLookupLedDevice(int id,int *why_rtrn)
{ {
DeviceIntPtr dev = NULL; DeviceIntPtr dev = NULL;
if (id == XkbDfltXIId)
id = XkbUseCorePtr;
if ((dev= _XkbLookupAnyDevice(id,why_rtrn))==NULL) if ((dev= _XkbLookupAnyDevice(id,why_rtrn))==NULL)
return NULL; return NULL;
else if ((!dev->kbdfeed)&&(!dev->leds)) { else if ((!dev->kbdfeed)&&(!dev->leds)) {