Xi: don't need to set the XKB settings for new core devices.

This is done by the XKB code these days anyway, so we might as well ignore it
and keep using the stanard stuff.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-02-22 20:53:46 +10:00
parent a180c23679
commit b3412adca8

View File

@ -102,7 +102,6 @@ ProcXChangeDeviceHierarchy(ClientPtr client)
{
xCreateMasterInfo* c = (xCreateMasterInfo*)any;
char* name;
XkbRMLVOSet set;
SWAPIF(swaps(&c->namelen, n));
name = xcalloc(c->namelen + 1, sizeof(char));
@ -119,15 +118,6 @@ ProcXChangeDeviceHierarchy(ClientPtr client)
if (!c->sendCore)
ptr->coreEvents = keybd->coreEvents = FALSE;
/* supplying NULL for rules simply means we re-use
whatever ruleset we used for the previous devices. */
set.rules = NULL;
set.model = "pc105";
set.layout = "us";
set.variant = NULL;
set.options = NULL;
XkbSetRulesDflts(&set);
ActivateDevice(ptr);
ActivateDevice(keybd);