From b3412adca8b2ba3fff348bceb4f01b9e968c0afc Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Sun, 22 Feb 2009 20:53:46 +1000 Subject: [PATCH] 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 --- Xi/chdevhier.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Xi/chdevhier.c b/Xi/chdevhier.c index 154a402e0..9a8582916 100644 --- a/Xi/chdevhier.c +++ b/Xi/chdevhier.c @@ -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);