hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-09-27 21:22:26 +00:00
Code Issues Projects Releases Wiki Activity

XKB: ifdef XKB is dead, yet it was still present in a few places.

Browse source
This commit is contained in:
Maarten Maathuis 2009-01-29 12:42:57 +01:00
commit 3903e23153
3 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Xi/chdevhier.c
View file

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