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

Add a nasty little hack to make keyboard selection work for Swiss keyboard

Browse Source 
encodings and the Canadian French one. The way XkbLayout and XkbVariant
work for this encodings changed some long time ago and the result was
that you would end up with no keyboard at all in X. Now XkbVariant includes
part of the layout selection which is about as ugly and makes the wscons
mapping a bit tricky.
OK matthieu@, maja@
This commit is contained in:
claudio 2010-11-26 16:53:00 +00:00
parent aa9ee11f20
commit 21c462b41f
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,10 +35,10 @@
#define KB_OVRENC \
{ KB_UK, "gb" }, \
{ KB_SV, "se" }, \
{ KB_SG, "ch(de)" }, \
{ KB_SF, "ch(fr)" }, \
{ KB_SG, "ch" }, \
{ KB_SF, "ch" }, \
{ KB_LA, "latam" }, \
{ KB_CF, "ca(fr)" }
{ KB_CF, "ca" }
struct nameint {
int val;
@ -46,8 +46,13 @@ struct nameint {
} kbdenc[] = { KB_OVRENC, KB_ENCTAB, { 0 } };
struct nameint kbdvar[] = {
{ KB_NODEAD, "nodeadkeys" },
{ KB_DVORAK, "dvorak" },
{ KB_NODEAD | KB_SG, "de_nodeadkeys" },
{ KB_NODEAD | KB_SF, "fr_nodeadkeys" },
{ KB_SF, "fr" },
{ KB_DVORAK | KB_CF, "fr-dvorak" },
{ KB_CF, "fr-legacy" },
{ KB_NODEAD, "nodeadkeys" },
{ KB_DVORAK, "dvorak" },
{ 0 }
};
@ -524,7 +529,8 @@ OpenKeyboard(InputInfoPtr pInfo)
}
if (xf86findOption(pInfo->options, "XkbVariant") == NULL)
for (i = 0; kbdvar[i].val; i++)
if (KB_VARIANT(wsenc) == kbdvar[i].val) {
if (wsenc == kbdvar[i].val ||
KB_VARIANT(wsenc) == kbdvar[i].val) {
xf86Msg(X_PROBED, "%s: using wscons variant %s\n",
pInfo->name, kbdvar[i].name);
xf86addNewOption(pInfo->options, "XkbVariant", kbdvar[i].name);