[PULL] xkb keymap loading

[Kristian Høgsberg]

On Tue, Mar 18, 2014 at 2:54 PM, Peter Hutterer
<peter.hutterer at who-t.net> wrote:
> The following changes since commit 795066477ee81b5b82e490eac8bed6b656d01f17:
>
>   config: search for PnPID on all parents (#75513) (2014-03-12 07:43:16 +1000)
>
> are available in the git repository at:
>
>   git://people.freedesktop.org/~whot/xserver for-keith
>
> for you to fetch changes up to 505eec9f38e8b167ce7ad51f72cca3ef33d0ceb3:
>
>   xkb: add XkbLoadKeymapFromString (2014-03-17 15:10:51 +1000)

I just rebased Xwayland on top of the rewritten patches and now
something is broken.  Xwayland doesn't get the keymap from the Wayland
server and falls back to us.  Let's not pull this for now.

Kristian

> ----------------------------------------------------------------
> Kristian Høgsberg (3):
>       xkb: factor out xkb loading to LoadXkm
>       xkb: add KeymapOrDefault
>       xkb: add XkbLoadKeymapFromString
>
> Peter Hutterer (2):
>       xkb: constify XkbDDXOpenConfigFile
>       xkb: add a callback to xkbcomp
>
> Rui Matos (2):
>       xkb: Factor out a function to copy a keymap's controls onto another
>       xkb: Repurpose XkbCopyDeviceKeymap to apply a given keymap to a device
>
>  Xi/exevents.c    |   2 +-
>  include/input.h  |   6 ++
>  include/xkbsrv.h |  11 ++-
>  xkb/ddxLoad.c    | 241 ++++++++++++++++++++++++++++++++++++++++++-------------
>  xkb/xkb.c        |  16 +---
>  xkb/xkbInit.c    |  42 ++++++++--
>  xkb/xkbUtils.c   |  37 +++++++--
>  7 files changed, 269 insertions(+), 86 deletions(-)
>
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel