summaryrefslogtreecommitdiff
path: root/xc/programs/Xserver/fb/fbfill.c
diff options
context:
space:
mode:
Diffstat (limited to 'xc/programs/Xserver/fb/fbfill.c')
-rw-r--r--xc/programs/Xserver/fb/fbfill.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/xc/programs/Xserver/fb/fbfill.c b/xc/programs/Xserver/fb/fbfill.c
index 2370d3006..8ecb3cde6 100644
--- a/xc/programs/Xserver/fb/fbfill.c
+++ b/xc/programs/Xserver/fb/fbfill.c
@@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/fb/fbfill.c,v 1.4 2001/05/29 04:54:09 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbfill.c,v 1.6 2003/01/31 00:01:45 torrey Exp $ */
#include "fb.h"
@@ -81,8 +81,8 @@ fbFill (DrawablePtr pDrawable,
pPriv->pm,
dstBpp,
- (pGC->patOrg.x + pDrawable->x),
- pGC->patOrg.y + pDrawable->y - y);
+ (pGC->patOrg.x + pDrawable->x + dstXoff),
+ pGC->patOrg.y + pDrawable->y + dstYoff - y);
}
else
{
@@ -106,9 +106,9 @@ fbFill (DrawablePtr pDrawable,
}
fbGetStipDrawable (&pStip->drawable, stip, stipStride, stipBpp, stipXoff, stipYoff);
- fbStipple (dst + y * dstStride,
+ fbStipple (dst + (y + dstYoff) * dstStride,
dstStride,
- x * dstBpp,
+ (x + dstXoff) * dstBpp,
dstBpp,
width * dstBpp, height,
stip,
@@ -118,8 +118,8 @@ fbFill (DrawablePtr pDrawable,
pPriv->evenStipple,
fgand, fgxor,
bgand, bgxor,
- pGC->patOrg.x + pDrawable->x,
- pGC->patOrg.y + pDrawable->y - y);
+ pGC->patOrg.x + pDrawable->x + dstXoff,
+ pGC->patOrg.y + pDrawable->y + dstYoff - y);
}
break;
}
@@ -146,8 +146,8 @@ fbFill (DrawablePtr pDrawable,
pGC->alu,
pPriv->pm,
dstBpp,
- (pGC->patOrg.x + pDrawable->x) * dstBpp,
- pGC->patOrg.y + pDrawable->y - y);
+ (pGC->patOrg.x + pDrawable->x + dstXoff) * dstBpp,
+ pGC->patOrg.y + pDrawable->y + dstYoff - y);
break;
}
}