[PATCH xserver] Xi: make XIQueryPointer return the current modifiers/group as documented.

Peter Hutterer peter.hutterer at who-t.net
Wed Feb 9 16:02:20 PST 2011


On Mon, Feb 07, 2011 at 06:21:31PM +0100, carlosg at gnome.org wrote:
> From: Carlos Garnacho <carlosg at gnome.org>
> 
> The previous XKB info was being returned instead of the current
> one, producing inconsistent results between the latest events
> and the modifiers/group returned by this call.
> 
> Signed-off-by: Carlos Garnacho <carlosg at gnome.org>
> ---
>  Xi/xiquerypointer.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/Xi/xiquerypointer.c b/Xi/xiquerypointer.c
> index b521c48..8df958e 100644
> --- a/Xi/xiquerypointer.c
> +++ b/Xi/xiquerypointer.c
> @@ -129,7 +129,7 @@ ProcXIQueryPointer(ClientPtr client)
>  
>      if (kbd)
>      {
> -        state = &kbd->key->xkbInfo->prev_state;
> +        state = &kbd->key->xkbInfo->state;
>          rep.mods.base_mods = state->base_mods;
>          rep.mods.latched_mods = state->latched_mods;
>          rep.mods.locked_mods = state->locked_mods;
> -- 
> 1.7.4

merged, thanks.
 
Cheers,
  Peter


More information about the xorg-devel mailing list