qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

split the KB_VARTAB code in wscons autodetection so that it understands

Browse Source 
both XkbOptions and XkbVariant. now we can understand the .dvorak,
.nodeadkeys and .swapctrlcaps wscons variants and pass them correctly onto XKB.
Means that xmodmap or setxkbmap magic isn't needed in those cases
anymore.

"no objections" matthieu@. Diff from Tobias Ulmer (tobiasu at tmux dot
org); thanks!
This commit is contained in:
oga 2009-12-07 19:28:53 +00:00
parent bf862c28bf
commit 80bba657d4
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
driver/xf86-input-keyboard/src/bsd_kbd.c
View File

@ -42,7 +42,18 @@
struct nameint {
int val;
char *name;
} kbdenc[] = { KB_OVRENC, KB_ENCTAB, { 0 } }, kbdvar[] = { KB_VARTAB, { 0 } };
} kbdenc[] = { KB_OVRENC, KB_ENCTAB, { 0 } };
struct nameint kbdvar[] = {
{ KB_NODEAD, "nodeadkeys" },
{ KB_DVORAK, "dvorak" },
{ 0 }
};
struct nameint kbdopt[] = {
{ KB_SWAPCTRLCAPS, "ctrl:swapcaps" },
{ 0 }
};
#endif
extern void KbdGetMapping(InputInfoPtr pInfo, KeySymsPtr pKeySyms,
@ -550,12 +561,20 @@ OpenKeyboard(InputInfoPtr pInfo)
xf86addNewOption(pInfo->options, "XkbLayout", kbdenc[i].name);
break;
}
if (xf86findOption(pInfo->options, "XkbOptions") == NULL)
if (xf86findOption(pInfo->options, "XkbVariant") == NULL)
for (i = 0; kbdvar[i].val; i++)
if (KB_VARIANT(wsenc) == kbdvar[i].val) {
xf86Msg(X_PROBED, "%s: using wscons option %s\n",
xf86Msg(X_PROBED, "%s: using wscons variant %s\n",
pInfo->name, kbdvar[i].name);
xf86addNewOption(pInfo->options, "XkbOptions", kbdvar[i].name);
xf86addNewOption(pInfo->options, "XkbVariant", kbdvar[i].name);
break;
}
if (xf86findOption(pInfo->options, "XkbOptions") == NULL)
for (i = 0; kbdopt[i].val; i++)
if (KB_VARIANT(wsenc) == kbdopt[i].val) {
xf86Msg(X_PROBED, "%s: using wscons option %s\n",
pInfo->name, kbdopt[i].name);
xf86addNewOption(pInfo->options, "XkbOptions", kbdopt[i].name);
break;
}
#endif