← Back to branch summary

~ubuntu-branches/ubuntu/edgy/xorg-server/edgy-updates

« back to all changes in this revision

Viewing changes to miext/cw/cw.c

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Parra Novo
  • Date: 2006-07-25 20:06:28 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20060725200628-gjmmd9gxfxdc4ejs
Tags: 1:1.1.1-0ubuntu1
* New Upstream version
* Changed Build-Depends from mesa-swrast-source to mesa-swx11-source,
  following Debian package nomenclature
* Re-did 12_security_policy_in_etc.diff for 1.1.1
* Dropped 15_security_allocate_local.diff (applied upstream)
* Dropped 16_SECURITY_setuid.diff (applied upstream)
* Dropped 000_ubuntu_fix_read_kernel_mapping.patch (applied upstream)
* Dropped 002_ubuntu_fix_for_certain_intel_chipsets.patch (applied upstream)
* Updated versioned Build-Depends on mesa-swx11-source to version
  6.5.0.cvs.20060725-0ubuntu1
* Added arrayobj.c, arrayobj.h, bitset.h & rbadaptors.h to
  GL/symlink-mesa.sh (linked from mesa-swx11-source)
* Added arrayobj.c to default build target on GL/mesa/main

Show diffs side-by-side

added added

removed removed

Lines of Context:
miext/cw/cw.c
19
19
 * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
20
20
 * PERFORMANCE OF THIS SOFTWARE.
21
21
 */
22
 
/* $Header: /cvs/xorg/xc/programs/Xserver/miext/cw/cw.c,v 1.21 2005/07/01 22:43:41 daniels Exp $ */
 
22
/* $Header$ */
23
23
 
24
24
#ifdef HAVE_DIX_CONFIG_H
25
25
#include <dix-config.h>
26
26
#endif
27
27
 
 
28
#include <string.h>
 
29
 
28
30
#include "gcstruct.h"
29
31
#include "windowstr.h"
30
32
#include "cw.h"
461
463
        DrawablePtr pBackingDrawable;
462
464
        int x_off, y_off, x_screen, y_screen;
463
465
 
464
 
        while (pWin && pWin->backgroundState == ParentRelative)
 
466
        while (pWin->backgroundState == ParentRelative)
465
467
            pWin = pWin->parent;
466
468
 
467
469
        pBackingDrawable = cwGetBackingDrawable((DrawablePtr)pWin, &x_off,
664
666
#endif
665
667
}
666
668
 
667
 
void
 
669
_X_EXPORT void
668
670
miDisableCompositeWrapper(ScreenPtr pScreen)
669
671
{
670
672
    cwDisabled[pScreen->myNum] = TRUE;