For both: Reviewed-by: Jeremy Huddleston <[email protected]> On Feb 15, 2012, at 8:32 PM, Peter Hutterer <[email protected]> wrote:
> This reverts commit bbb6b8c834e0e1491ca14403b5d0840dd14380d3. > > With this patch applied, Xorg -retro does not display the default cursor. > > Cause: IsFloating(dev) returns 1 for a master device if that master device > is not yet paired with the keyboard. This happens for the VCP at startup, > causing the above issue. > > Correct fix is to replace with "!IsMaster() && IsFloating()". > > Reported-by: Colin Harrison <[email protected]> > Reported-by: Jon TURNEY <[email protected]> > Signed-off-by: Peter Hutterer <[email protected]> > --- > I'm sending this as a revert + a new patch to make future cherry-picking > easier. > > render/animcur.c | 3 --- > 1 files changed, 0 insertions(+), 3 deletions(-) > > diff --git a/render/animcur.c b/render/animcur.c > index 8d4a9c2..31cbab9 100644 > --- a/render/animcur.c > +++ b/render/animcur.c > @@ -208,9 +208,6 @@ AnimCurDisplayCursor (DeviceIntPtr pDev, > AnimCurScreenPtr as = GetAnimCurScreen(pScreen); > Bool ret; > > - if (IsFloating(pDev)) > - return FALSE; > - > Unwrap (as, pScreen, DisplayCursor); > if (IsAnimCur(pCursor)) > { > -- > 1.7.7.5 > _______________________________________________ > [email protected]: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: http://lists.x.org/mailman/listinfo/xorg-devel > _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
