frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dmx: fix a call to XkbSetRulesDflts, takes XkbRMLVOSet now.

This commit is contained in:
Peter Hutterer 2009-08-04 15:15:24 +10:00
parent 2cde9208ff
commit e7c950c627
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/dmx/input/dmxinputinit.c
View File

@ -381,12 +381,15 @@ static void dmxKeyboardFreeNames(XkbComponentNamesPtr names)
static int dmxKeyboardOn(DeviceIntPtr pDevice, DMXLocalInitInfo *info) static int dmxKeyboardOn(DeviceIntPtr pDevice, DMXLocalInitInfo *info)
{ {
GETDMXINPUTFROMPDEVICE; GETDMXINPUTFROMPDEVICE;
XkbRMLVOSet rmlvo;
XkbSetRulesDflts(dmxConfigGetXkbRules(), rmlvo.rules = dmxConfigGetXkbRules();
dmxConfigGetXkbModel(), rmlvo.model = dmxConfigGetXkbModel();
dmxConfigGetXkbLayout(), rmlvo.layout = dmxConfigGetXkbLayout();
dmxConfigGetXkbVariant(), rmlvo.variant = dmxConfigGetXkbVariant();
dmxConfigGetXkbOptions()); rmlvo.options = dmxConfigGetXkbOptions();
XkbSetRulesDflts(&rmlvo);
if (!info->force && (dmxInput->keycodes if (!info->force && (dmxInput->keycodes
|| dmxInput->symbols || dmxInput->symbols
|| dmxInput->geometry)) { || dmxInput->geometry)) {