xkb: Daniel's patch to stop evdev keyboard segfaults.
mi: Remove quickfix from ba547d4f6a
This commit is contained in:
parent
4aaaa70d1b
commit
a309c936bb
|
@ -244,14 +244,6 @@ mieqProcessInputEvents()
|
||||||
dev = e->pDev;
|
dev = e->pDev;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* FIXME: Keyboard extension devices do not have devPrivates
|
|
||||||
* initialized, resulting in a segfault in XkbHandleActions. */
|
|
||||||
if (e->event[0].u.u.type == DeviceKeyPress ||
|
|
||||||
e->event[0].u.u.type == DeviceKeyRelease ||
|
|
||||||
e->event[0].u.u.type == KeyPress ||
|
|
||||||
e->event[0].u.u.type == KeyRelease)
|
|
||||||
e->pDev = dev = inputInfo.keyboard;
|
|
||||||
|
|
||||||
/* MPX devices send both core and Xi events.
|
/* MPX devices send both core and Xi events.
|
||||||
* Use dev to get the correct processing function but supply
|
* Use dev to get the correct processing function but supply
|
||||||
* e->pDev to pass the correct device
|
* e->pDev to pass the correct device
|
||||||
|
|
|
@ -1220,7 +1220,8 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
|
||||||
tmp = xalloc(src->max_key_code + 1);
|
tmp = xalloc(src->max_key_code + 1);
|
||||||
if (!tmp)
|
if (!tmp)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
dst->map->syms = tmp;
|
/*dst->map->syms = tmp;*/
|
||||||
|
dst->map->modmap = tmp;
|
||||||
}
|
}
|
||||||
memcpy(dst->map->modmap, src->map->modmap, src->max_key_code + 1);
|
memcpy(dst->map->modmap, src->map->modmap, src->max_key_code + 1);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user