diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 18:43:42 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 18:43:42 +0000 |
| commit | 591dcad65f73450a07ac7477a3a827d95eb6f726 (patch) | |
| tree | d39091468270df7225717439077c308485c23026 /src/xftdraw.c | |
| parent | c7e70c7e31897e00caaeb177176a8c24b834bc78 (diff) | |
Merging XORG-CURRENT into trunkXORG-6_7_99_1XACE-SELINUX-MERGE
Diffstat (limited to 'src/xftdraw.c')
| -rw-r--r-- | src/xftdraw.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/xftdraw.c b/src/xftdraw.c index e25bf5b..2eb3306 100644 --- a/src/xftdraw.c +++ b/src/xftdraw.c @@ -1,7 +1,7 @@ /* - * $XFree86: xc/lib/Xft/xftdraw.c,v 1.26 2003/04/03 22:25:50 dawes Exp $ + * $XFree86: xc/lib/Xft/xftdraw.c,v 1.25 2002/10/11 17:53:02 keithp Exp $ * - * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. + * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -177,6 +177,7 @@ XftDrawCreateBitmap (Display *dpy, draw->colormap = 0; draw->render.pict = 0; draw->core.gc = 0; + draw->core.use_pixmap = 0; draw->clip_type = XftClipTypeNone; draw->subwindow_mode = ClipByChildren; XftMemAlloc (XFT_MEM_DRAW, sizeof (XftDraw)); @@ -202,6 +203,7 @@ XftDrawCreateAlpha (Display *dpy, draw->colormap = 0; draw->render.pict = 0; draw->core.gc = 0; + draw->core.use_pixmap = 0; draw->clip_type = XftClipTypeNone; draw->subwindow_mode = ClipByChildren; XftMemAlloc (XFT_MEM_DRAW, sizeof (XftDraw)); @@ -807,7 +809,7 @@ XftDrawRect (XftDraw *draw, { if (_XftDrawRenderPrepare (draw)) { - XRenderFillRectangle (draw->dpy, PictOpOver, draw->render.pict, + XRenderFillRectangle (draw->dpy, PictOpSrc, draw->render.pict, &color->color, x, y, width, height); } else if (_XftDrawCorePrepare (draw, color)) @@ -914,7 +916,10 @@ XftDrawSetClipRectangles (XftDraw *draw, /* * Check for quick exit */ - if (draw->clip_type == XftClipTypeRectangles && + if (draw->clip_type == XftClipTypeRectangles && + draw->clip.rect->n == n && + (n == 0 || (draw->clip.rect->xOrigin == xOrigin && + draw->clip.rect->yOrigin == yOrigin)) && !memcmp (XftClipRects (draw->clip.rect), rects, n * sizeof (XRectangle))) { return True; |