[PATCH 17/20] mi: check for MASTER_POINTER instead of manual checks.

[Daniel Stone]

On Fri, Feb 18, 2011 at 01:52:24PM +1000, Peter Hutterer wrote:
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> ---
>  mi/mipointer.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/mi/mipointer.c b/mi/mipointer.c
> index 5b82978..209ea06 100644
> --- a/mi/mipointer.c
> +++ b/mi/mipointer.c
> @@ -540,7 +540,7 @@ miPointerMoveNoEvent (DeviceIntPtr pDev, ScreenPtr pScreen,
>       * VCP, as this may cause a non-HW rendered cursor to be rendered during
>       * SIGIO. This again leads to allocs during SIGIO which leads to SIGABRT.
>       */
> -    if ((pDev == inputInfo.pointer || (!IsMaster(pDev) && pDev->u.master == inputInfo.pointer))
> +    if (GetMaster(pDev, MASTER_POINTER) == inputInfo.pointer
>          && !pScreenPriv->waitForUpdate && pScreen == pPointer->pSpriteScreen)
>      {
>  	pPointer->devx = x;

Nitpicky, but please put the && before the linebreak, not after.

Cheers,
Daniel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.x.org/archives/xorg-devel/attachments/20110503/2a6e85aa/attachment-0001.pgp>