[PATCH] Use cached XKB keymap when rules haven't changed

[Peter Hutterer]

On Mon, Nov 24, 2008 at 06:50:57AM -0800, Dan Nicholson wrote:
> Thanks for testing. I'll have to dig in a little more and see why that
> would happen. I was mostly watching whether the map was cached at the
> right time, but not really playing with different keymaps.

AFAICT, it is cached at the right times, but it seems to use the wrong one.

> > Just configure one keyboard to have a different layout in your fdi file (e.g.
> > de) and start a plain server and xterm. In current master, the keyboard has
> > the specified layout, with your patch it has the default layout (us).
> > Can you please test and fix this? Thanks.
> 
> Does the log report the wrong layout, or do you just find the wrong
> keymap has been applied? If you run with -logverbose, does it report
> that the cached keymap is used? I'll take a look, but I'd like to make
> sure that I'm seeing the same issue you are.

no, that's the thing. the log looks like it's all fine, but the actual keymap
on the keyboard is the default one (that's on master btw, not 1.5, just to
make sure).

I tried with layout de (easy to test, y and z are swapped), and reverting the
patch with the same setup gave me the german layout. With the patch, I always
have the us layout.
 
Cheers,
  Peter