On Wed, Aug 04, 2010 at 02:54 +0400, Mike Belopuhov wrote:
> Hi,
>
> so as it seems revision 1.8 of the xf86-input-keyboard/src/bsd_kbd.c
> broke usual XkbLayout setup (like "us,ru" and such) in a way that
> it *always* picks whatever you have in the keyboard.encoding
> regardless of what is configured in the xorg.conf.
>
> Could be that this chunk in the diff is an accidental removal?
>
> - if (xf86findOption(pInfo->options, "XkbLayout") != NULL)
> - return TRUE;
>
so I've just confirmed that I need this piece to be able to switch
layouts. tested on i386 and amd64.
Index: src/bsd_kbd.c
===================================================================
RCS file: /cvs/xenocara/driver/xf86-input-keyboard/src/bsd_kbd.c,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 bsd_kbd.c
--- src/bsd_kbd.c 28 Jul 2010 19:47:40 -0000 1.9
+++ src/bsd_kbd.c 4 Aug 2010 09:58:53 -0000
@@ -499,6 +499,8 @@ OpenKeyboard(InputInfoPtr pInfo)
* XkbLayout has been specified. Do this even if the protocol is
* not wskbd.
*/
+ if (xf86findOption(pInfo->options, "XkbLayout") != NULL)
+ return TRUE;
if (ioctl(pInfo->fd, WSKBDIO_GETENCODING, &wsenc) == -1) {
/* Ignore the error, we just use the defaults */
