← Back to branch summary

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

« back to all changes in this revision

Viewing changes to mi/mioverlay.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:
mi/mioverlay.c
103
103
                                    HasBorder(w) && \
104
104
                                    (w)->backgroundState == ParentRelative)
105
105
 
106
 
Bool
 
106
_X_EXPORT Bool
107
107
miInitOverlay(
108
108
    ScreenPtr pScreen, 
109
109
    miOverlayInOverlayFunc inOverlayFunc,
1730
1730
/*  We need this as an addition since the xf86 common code doesn't
1731
1731
    know about the second tree which is static to this file.  */
1732
1732
 
1733
 
void
 
1733
_X_EXPORT void
1734
1734
miOverlaySetRootClip(ScreenPtr pScreen, Bool enable)
1735
1735
{
1736
1736
    WindowPtr pRoot = WindowTable[pScreen->myNum];
1818
1818
/****************************************************************/
1819
1819
 
1820
1820
/* not used */
1821
 
Bool
 
1821
_X_EXPORT Bool
1822
1822
miOverlayGetPrivateClips(
1823
1823
    WindowPtr pWin,
1824
1824
    RegionPtr *borderClip,
1837
1837
    return FALSE;
1838
1838
}
1839
1839
 
1840
 
void 
 
1840
_X_EXPORT void 
1841
1841
miOverlaySetTransFunction (
1842
1842
   ScreenPtr pScreen, 
1843
1843
   miOverlayTransFunc transFunc
1845
1845
    MIOVERLAY_GET_SCREEN_PRIVATE(pScreen)->MakeTransparent = transFunc;
1846
1846
}
1847
1847
 
1848
 
Bool 
 
1848
_X_EXPORT Bool 
1849
1849
miOverlayCopyUnderlay(ScreenPtr pScreen)
1850
1850
{
1851
1851
    return MIOVERLAY_GET_SCREEN_PRIVATE(pScreen)->copyUnderlay;
1852
1852
}
1853
1853
 
1854
 
void
 
1854
_X_EXPORT void
1855
1855
miOverlayComputeCompositeClip(GCPtr pGC, WindowPtr pWin)
1856
1856
{
1857
1857
    ScreenPtr       pScreen = pGC->pScreen;
1907
1907
    }
1908
1908
}
1909
1909
 
1910
 
Bool
 
1910
_X_EXPORT Bool
1911
1911
miOverlayCollectUnderlayRegions(
1912
1912
    WindowPtr pWin,
1913
1913
    RegionPtr *region
2029
2029
static Bool
2030
2030
CollectUnderlayChildrenRegions(WindowPtr pWin, RegionPtr pReg)
2031
2031
{
2032
 
    ScreenPtr pScreen = pWin->drawable.pScreen;
2033
2032
    WindowPtr pChild;
2034
2033
    miOverlayTreePtr pTree;
2035
2034
    Bool hasUnderlay;