[PATCH 33/37] composite: Factor out backing store transition

[Keith Packard]

Adam Jackson <ajax at redhat.com> writes:

> No functional change.
>
> Signed-off-by: Adam Jackson <ajax at redhat.com>
> ---
>  composite/compinit.c | 27 ++++++++++++++++-----------
>  1 file changed, 16 insertions(+), 11 deletions(-)
>
> diff --git a/composite/compinit.c b/composite/compinit.c
> index 111c16e..7daf171 100644
> --- a/composite/compinit.c
> +++ b/composite/compinit.c
> @@ -104,6 +104,20 @@ compInstallColormap(ColormapPtr pColormap)
>      pScreen->InstallColormap = compInstallColormap;
>  }
>  
> +static void
> +compCheckBackingStore(WindowPtr pWin)
> +{
> +    if (pWin->backingStore != NotUseful && !pWin->backStorage) {
> +        compRedirectWindow(serverClient, pWin, CompositeRedirectAutomatic);
> +        pWin->backStorage = TRUE;
> +    }
> +    else if (pWin->backingStore == NotUseful && pWin->backStorage) {
> +        compUnredirectWindow(serverClient, pWin,
> +                             CompositeRedirectAutomatic);
> +        pWin->backStorage = FALSE;
> +    }
> +}
> +
>  /* Fake backing store via automatic redirection */
>  static Bool
>  compChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
> @@ -116,17 +130,8 @@ compChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
>      ret = pScreen->ChangeWindowAttributes(pWin, mask);
>  
>      if (ret && (mask & CWBackingStore) &&
> -        pScreen->backingStoreSupport != NotUseful) {
> -        if (pWin->backingStore != NotUseful && !pWin->backStorage) {
> -            compRedirectWindow(serverClient, pWin, CompositeRedirectAutomatic);
> -            pWin->backStorage = TRUE;
> -        }
> -        else if (pWin->backingStore == NotUseful && pWin->backStorage) {
> -            compUnredirectWindow(serverClient, pWin,
> -                                 CompositeRedirectAutomatic);
> -            pWin->backStorage = FALSE;
> -        }
> -    }
> +        pScreen->backingStoreSupport != NotUseful)
> +        compCheckBackingStore(pWin);
>  

Looks like this is missing a } here?

-- 
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 810 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20141027/1875436d/attachment.sig>