[PATCH] xkb: don't setMods locking modifiers (#27903)

Peter Hutterer peter.hutterer at who-t.net
Mon Apr 30 23:53:37 PDT 2012


On Sun, Apr 22, 2012 at 05:25:35PM +0100, Daniel Stone wrote:
> Hi,
> 
> On 28 July 2011 05:36, Peter Hutterer <peter.hutterer at who-t.net> wrote:
> > @@ -348,7 +348,11 @@ _XkbFilterLockState(       XkbSrvInfoPtr   xkbi,
> >        filter->filter = _XkbFilterLockState;
> >        filter->upAction = *pAction;
> >        xkbi->state.locked_mods^= pAction->mods.mask;
> > -       xkbi->setMods = pAction->mods.mask;
> > +       /* Don't actually change setMods here. We're locking modifiers, so
> > +        * the combined results of base + locked is the same regardless. By
> > +        * not setting them, we get to release locked modifiers on the
> > +        * second key _press_, not release (Bug 27903)
> > +        */
> 
> This mostly seems OK to me, but breaks the LockNoLock state; I guess
> you'd want to directly change base_mods in the other branch.  With
> that fixed:
> Acked-by: Daniel Stone <daniel at fooishbar.org>

fwiw, obsoleted by Andreas' e3f6a76dd480717eae4b17ad8e2ff707de2ffe4c.
  xkb: Support noLock and noUnlock flags for LockMods

Cheers,
  Peter


More information about the xorg-devel mailing list