Skip to content

N
nx-libs
Commit 8e66435a authored by Ulrich Sibiller's avatar Ulrich Sibiller
Browse files
Options

GCOps.c: code simplification / scope improvements

parent 41bc1de9
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 14 deletions
nx-X11/programs/Xserver/hw/nxagent/GCOps.c
View file @ 8e66435a
...@@ -296,7 +296,6 @@ FIXME: The popup could be synchronized with one single put image, ...@@ -296,7 +296,6 @@ FIXME: The popup could be synchronized with one single put image,
#endif #endif
RegionRec corruptedRegion; RegionRec corruptedRegion;
RegionInit(&corruptedRegion, NullBox, 1); RegionInit(&corruptedRegion, NullBox, 1);
RegionIntersect(&corruptedRegion, RegionIntersect(&corruptedRegion,
...@@ -374,7 +373,6 @@ FIXME: The popup could be synchronized with one single put image, ...@@ -374,7 +373,6 @@ FIXME: The popup could be synchronized with one single put image,
else else
{ {
RegionRec tmpRegion; RegionRec tmpRegion;
RegionInit(&tmpRegion, NullBox, 1); RegionInit(&tmpRegion, NullBox, 1);
#ifdef DEBUG #ifdef DEBUG
...@@ -540,14 +538,13 @@ FIXME: The popup could be synchronized with one single put image, ...@@ -540,14 +538,13 @@ FIXME: The popup could be synchronized with one single put image,
{ {
RegionPtr pSrcRegion = nxagentCreateRegion(pSrcDrawable, NULL, srcx, srcy, width, height); RegionPtr pSrcRegion = nxagentCreateRegion(pSrcDrawable, NULL, srcx, srcy, width, height);
RegionRec corruptedRegion;
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "nxagentDeferCopyArea: Source region [%d,%d,%d,%d].\n", fprintf(stderr, "nxagentDeferCopyArea: Source region [%d,%d,%d,%d].\n",
pSrcRegion -> extents.x1, pSrcRegion -> extents.y1, pSrcRegion -> extents.x1, pSrcRegion -> extents.y1,
pSrcRegion -> extents.x2, pSrcRegion -> extents.y2); pSrcRegion -> extents.x2, pSrcRegion -> extents.y2);
#endif #endif
RegionRec corruptedRegion;
RegionInit(&corruptedRegion, NullBox, 1); RegionInit(&corruptedRegion, NullBox, 1);
RegionIntersect(&corruptedRegion, RegionIntersect(&corruptedRegion,
...@@ -728,9 +725,7 @@ RegionPtr nxagentCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, ...@@ -728,9 +725,7 @@ RegionPtr nxagentCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
unsigned int format = (depth == 1) ? XYPixmap : ZPixmap; unsigned int format = (depth == 1) ? XYPixmap : ZPixmap;
int leftPad = 0; int length = nxagentImageLength(width, height, format, 0, depth);
int length = nxagentImageLength(width, height, format, leftPad, depth);
if ((data = malloc(length)) == NULL) if ((data = malloc(length)) == NULL)
{ {
...@@ -742,7 +737,6 @@ RegionPtr nxagentCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, ...@@ -742,7 +737,6 @@ RegionPtr nxagentCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
} }
unsigned long planeMask = 0xffffffff; unsigned long planeMask = 0xffffffff;
fbGetImage(nxagentVirtualDrawable(pSrcDrawable), srcx, srcy, width, height, format, planeMask, data); fbGetImage(nxagentVirtualDrawable(pSrcDrawable), srcx, srcy, width, height, format, planeMask, data);
/* /*
...@@ -751,7 +745,7 @@ RegionPtr nxagentCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, ...@@ -751,7 +745,7 @@ RegionPtr nxagentCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
*/ */
nxagentPutImage(pDstDrawable, pGC, depth, dstx, dsty, nxagentPutImage(pDstDrawable, pGC, depth, dstx, dsty,
width, height, leftPad, format, data); width, height, 0, format, data);
#ifdef TEST #ifdef TEST
fprintf(stderr,"nxagentCopyArea: Realize Pixmap %p virtual %p x %d y %d w %d h %d\n", fprintf(stderr,"nxagentCopyArea: Realize Pixmap %p virtual %p x %d y %d w %d h %d\n",
...@@ -939,9 +933,7 @@ RegionPtr nxagentCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, ...@@ -939,9 +933,7 @@ RegionPtr nxagentCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
unsigned int format = (depth == 1) ? XYPixmap : ZPixmap; unsigned int format = (depth == 1) ? XYPixmap : ZPixmap;
int leftPad = 0; int length = nxagentImageLength(width, height, format, 0, depth);
int length = nxagentImageLength(width, height, format, leftPad, depth);
if ((data = malloc(length)) == NULL) if ((data = malloc(length)) == NULL)
{ {
...@@ -953,7 +945,6 @@ RegionPtr nxagentCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, ...@@ -953,7 +945,6 @@ RegionPtr nxagentCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
} }
unsigned long planeMask = 0xffffffff; unsigned long planeMask = 0xffffffff;
fbGetImage(nxagentVirtualDrawable(pSrcDrawable), srcx, srcy, width, height, format, planeMask, data); fbGetImage(nxagentVirtualDrawable(pSrcDrawable), srcx, srcy, width, height, format, planeMask, data);
/* /*
...@@ -962,7 +953,7 @@ RegionPtr nxagentCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, ...@@ -962,7 +953,7 @@ RegionPtr nxagentCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
*/ */
nxagentPutImage(pDstDrawable, pGC, depth, dstx, dsty, nxagentPutImage(pDstDrawable, pGC, depth, dstx, dsty,
width, height, leftPad, format, data); width, height, 0, format, data);
#ifdef TEST #ifdef TEST
fprintf(stderr,"nxagentCopyPlane: Synchronize Pixmap %p virtual %p x %d y %d w %d h %d \n", fprintf(stderr,"nxagentCopyPlane: Synchronize Pixmap %p virtual %p x %d y %d w %d h %d \n",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment