diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-06-01 15:20:42 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-06-02 10:27:05 +0930 |
| commit | 5a3d06b8f42473cea3741dc722a775deaa2b73f6 (patch) | |
| tree | 1e3a18959591554f747230dc7e87fe165a106084 /xkb | |
| parent | 5ebe76f13fb6e96cebe5a386024a73eceeb828ff (diff) | |
xkb: delete default rules when devices are closed.
We only have one set of default rules options in xkb. When the second keyboard
is brought up with Xkb options specified, these new options overwrite the old.
In future server generations, the rules used for the VCK are a mixture of the
default ones and ones previously specified for other keyboards. Simply
resetting the xkb default rules to NULL avoids this issue.
Reproducable by setting XkbLayout "de" and XkbVariant "nodeadkeys". In the
second server generation, the VCK has "us(nodeadkeys)". This again produces a
SIGABRT when the first key is hit.
I could not figure out why the SIGABRT happens. This patch is avoiding the
issue rather than fixing it.
Diffstat (limited to 'xkb')
| -rw-r--r-- | xkb/xkbInit.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c index 0d5d15ef3..47ad55369 100644 --- a/xkb/xkbInit.c +++ b/xkb/xkbInit.c @@ -279,6 +279,21 @@ XkbSetRulesDflts(char *rulesFile,char *model,char *layout, return; } +void +XkbDeleteRulesDflts() +{ + _XkbFree(XkbRulesFile); + XkbRulesFile = NULL; + _XkbFree(XkbModelDflt); + XkbModelDflt = NULL; + _XkbFree(XkbLayoutDflt); + XkbLayoutDflt = NULL; + _XkbFree(XkbVariantDflt); + XkbVariantDflt = NULL; + _XkbFree(XkbOptionsDflt); + XkbOptionsDflt = NULL; +} + /***====================================================================***/ #include "xkbDflts.h" |