diff options
| author | Egbert Eich <eich@suse.de> | 2004-02-27 21:31:02 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-02-27 21:31:02 +0000 |
| commit | 1e46a7cef63f62d30d628743807bc37f64ed7842 (patch) | |
| tree | d272ee89a75a70021d5ac306378412896b177f5b /cfb | |
| parent | b052486adb9ea26f37be120966eb60cd3ac3db2f (diff) | |
5. Reversed Xinerama changes (Egbert Eich).
4. Reversed Xutf8* to XFree86utf8* function name changes for the release
(Egbert Eich).
3. Removed sources for patch which were included when patch had a bad bug
(Egbert Eich).
2. Removed unnecessary fonts (Egbert Eich).
1. Removed XIE and PEX extension files from release tree. The build
environment has been gone already (Egbert Eich).
Diffstat (limited to 'cfb')
| -rw-r--r-- | cfb/cfbpntwin.c | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/cfb/cfbpntwin.c b/cfb/cfbpntwin.c index e564b4d6e..04a190006 100644 --- a/cfb/cfbpntwin.c +++ b/cfb/cfbpntwin.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/cfb/cfbpntwin.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/cfb/cfbpntwin.c,v 1.1.4.4 2004/02/25 21:46:36 kaleb Exp $ */ /* $Xorg: cfbpntwin.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ /*********************************************************** @@ -59,11 +59,9 @@ SOFTWARE. #include "cfbmskbits.h" #include "mi.h" -#ifdef XINERAMA +#ifdef PANORAMIX #include "panoramiX.h" #include "panoramiXsrv.h" -extern Bool noPanoramiXExtension; -extern WindowPtr *WindowTable; #endif void @@ -100,11 +98,9 @@ cfbPaintWindow(pWin, pRegion, what) } else { -#ifndef NO_XINERAMA_PORT int xorg = pWin->drawable.x; int yorg = pWin->drawable.y; -#endif -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension) { int index = pWin->drawable.pScreen->myNum; if(WindowTable[index] == pWin) { @@ -117,11 +113,7 @@ cfbPaintWindow(pWin, pRegion, what) (int)REGION_NUM_RECTS(pRegion), REGION_RECTS(pRegion), pWin->background.pixmap, -#ifndef NO_XINERAMA_PORT xorg, yorg); -#else - (int)pWin->drawable.x, (int)pWin->drawable.y); -#endif } break; case BackgroundPixel: @@ -149,20 +141,16 @@ cfbPaintWindow(pWin, pRegion, what) } else { -#ifndef NO_XINERAMA_PORT int xorg, yorg; -#endif for (pBgWin = pWin; pBgWin->backgroundState == ParentRelative; pBgWin = pBgWin->parent); -#ifndef NO_XINERAMA_PORT xorg = pBgWin->drawable.x; yorg = pBgWin->drawable.y; -#endif -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension) { int index = pWin->drawable.pScreen->myNum; if(WindowTable[index] == pBgWin) { @@ -176,12 +164,7 @@ cfbPaintWindow(pWin, pRegion, what) (int)REGION_NUM_RECTS(pRegion), REGION_RECTS(pRegion), pWin->border.pixmap, -#ifndef NO_XINERAMA_PORT xorg, yorg); -#else - (int) pBgWin->drawable.x, - (int) pBgWin->drawable.y); -#endif } break; } |