summaryrefslogtreecommitdiff
path: root/mi
diff options
context:
space:
mode:
Diffstat (limited to 'mi')
-rw-r--r--mi/miarc.c6
-rw-r--r--mi/mibitblt.c4
-rw-r--r--mi/midispcur.c4
-rw-r--r--mi/mifillarc.c9
-rw-r--r--mi/mifillrct.c3
-rw-r--r--mi/mifpolycon.c3
-rw-r--r--mi/miglblt.c2
-rw-r--r--mi/mipoly.c5
-rw-r--r--mi/mipolypnt.c3
-rw-r--r--mi/miwideline.c11
-rw-r--r--mi/mizerarc.c5
-rw-r--r--mi/mizerline.c6
12 files changed, 34 insertions, 27 deletions
diff --git a/mi/miarc.c b/mi/miarc.c
index cd870fa39..74d103b3f 100644
--- a/mi/miarc.c
+++ b/mi/miarc.c
@@ -262,7 +262,7 @@ miArcSegment(
return;
}
- if (pGC->miTranslate) {
+ if (pGC->pScreen->miTranslate) {
tarc.x += pDraw->x;
tarc.y += pDraw->y;
}
@@ -837,7 +837,7 @@ miFillWideEllipse(
xorg = parc->x + (parc->width >> 1);
yorgu = parc->y + (parc->height >> 1);
yorgl = yorgu + (parc->height & 1);
- if (pGC->miTranslate)
+ if (pGC->pScreen->miTranslate)
{
xorg += pDraw->x;
yorgu += pDraw->y;
@@ -1024,7 +1024,7 @@ miPolyArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs)
parc->x -= xOrg;
parc->y -= yOrg;
}
- if (pGC->miTranslate)
+ if (pGC->pScreen->miTranslate)
{
xOrg += pDraw->x;
yOrg += pDraw->y;
diff --git a/mi/mibitblt.c b/mi/mibitblt.c
index d701e0e9e..5443a369a 100644
--- a/mi/mibitblt.c
+++ b/mi/mibitblt.c
@@ -137,7 +137,7 @@ miCopyArea(DrawablePtr pSrcDrawable,
dstx = xOut;
dsty = yOut;
- if (pGC->miTranslate)
+ if (pGC->pScreen->miTranslate)
{
dstx += pDstDrawable->x;
dsty += pDstDrawable->y;
@@ -800,7 +800,7 @@ miPutImage( DrawablePtr pDraw, GCPtr pGC, int depth,
free(pptFirst);
return;
}
- if (pGC->miTranslate)
+ if (pGC->pScreen->miTranslate)
{
x += pDraw->x;
y += pDraw->y;
diff --git a/mi/midispcur.c b/mi/midispcur.c
index 32c5c9df6..a830d924d 100644
--- a/mi/midispcur.c
+++ b/mi/midispcur.c
@@ -343,7 +343,7 @@ miDCPutBits (
if (sourceGC->serialNumber != pDrawable->serialNumber)
ValidateGC (pDrawable, sourceGC);
- if(sourceGC->miTranslate)
+ if(sourceGC->pScreen->miTranslate)
{
x = pDrawable->x + x_org;
y = pDrawable->y + y_org;
@@ -363,7 +363,7 @@ miDCPutBits (
if (maskGC->serialNumber != pDrawable->serialNumber)
ValidateGC (pDrawable, maskGC);
- if(maskGC->miTranslate)
+ if(maskGC->pScreen->miTranslate)
{
x = pDrawable->x + x_org;
y = pDrawable->y + y_org;
diff --git a/mi/mifillarc.c b/mi/mifillarc.c
index 6e13e681f..98ad1de22 100644
--- a/mi/mifillarc.c
+++ b/mi/mifillarc.c
@@ -40,6 +40,7 @@ Author: Bob Scheifler, MIT X Consortium
#include "mifpoly.h"
#include "mi.h"
#include "mifillarc.h"
+#include "scrnintstr.h"
#define QUADRANT (90 * 64)
#define HALFCIRCLE (180 * 64)
@@ -557,7 +558,7 @@ miFillEllipseI(
}
miFillArcSetup(arc, &info);
MIFILLARCSETUP();
- if (pGC->miTranslate)
+ if (pGC->pScreen->miTranslate)
{
xorg += pDraw->x;
yorg += pDraw->y;
@@ -600,7 +601,7 @@ miFillEllipseD(
}
miFillArcDSetup(arc, &info);
MIFILLARCSETUP();
- if (pGC->miTranslate)
+ if (pGC->pScreen->miTranslate)
{
xorg += pDraw->x;
yorg += pDraw->y;
@@ -670,7 +671,7 @@ miFillArcSliceI(
free(points);
return;
}
- if (pGC->miTranslate)
+ if (pGC->pScreen->miTranslate)
{
xorg += pDraw->x;
yorg += pDraw->y;
@@ -734,7 +735,7 @@ miFillArcSliceD(
free(points);
return;
}
- if (pGC->miTranslate)
+ if (pGC->pScreen->miTranslate)
{
xorg += pDraw->x;
yorg += pDraw->y;
diff --git a/mi/mifillrct.c b/mi/mifillrct.c
index 1c63a35fa..7a01e3725 100644
--- a/mi/mifillrct.c
+++ b/mi/mifillrct.c
@@ -56,6 +56,7 @@ SOFTWARE.
#include "pixmap.h"
#include "mi.h"
#include "misc.h"
+#include "scrnintstr.h"
/* mi rectangles
written by newman, with debts to all and sundry
@@ -86,7 +87,7 @@ miPolyFillRect(
int *pwFirst;
int *pw;
- if (pGC->miTranslate)
+ if (pGC->pScreen->miTranslate)
{
xorg = pDrawable->x;
yorg = pDrawable->y;
diff --git a/mi/mifpolycon.c b/mi/mifpolycon.c
index e48686a58..b547d144d 100644
--- a/mi/mifpolycon.c
+++ b/mi/mifpolycon.c
@@ -54,6 +54,7 @@ SOFTWARE.
#include "windowstr.h"
#include "pixmapstr.h"
#include "mifpoly.h"
+#include "scrnintstr.h"
static int GetFPolyYBounds(SppPointPtr pts, int n, double yFtrans,
int *by, int *ty);
@@ -105,7 +106,7 @@ miFillSppPoly(
DDXPointPtr ptsOut,
FirstPoint; /* output buffer */
- if (pgc->miTranslate)
+ if (pgc->pScreen->miTranslate)
{
xTrans += dst->x;
yTrans += dst->y;
diff --git a/mi/miglblt.c b/mi/miglblt.c
index 9edb500c4..1ba8433c3 100644
--- a/mi/miglblt.c
+++ b/mi/miglblt.c
@@ -109,7 +109,7 @@ miPolyGlyphBlt(
ChangeGCVal gcvals[3];
- if (pGC->miTranslate)
+ if (pGC->pScreen->miTranslate)
{
x += pDrawable->x;
y += pDrawable->y;
diff --git a/mi/mipoly.c b/mi/mipoly.c
index b3e2c2fb1..974cf959c 100644
--- a/mi/mipoly.c
+++ b/mi/mipoly.c
@@ -50,7 +50,7 @@ SOFTWARE.
* Written by Brian Kelleher; June 1986
*
* Draw polygons. This routine translates the point by the
- * origin if pGC->miTranslate is non-zero, and calls
+ * origin if pGC->pScreen->miTranslate is non-zero, and calls
* to the appropriate routine to actually scan convert the
* polygon.
*/
@@ -64,6 +64,7 @@ SOFTWARE.
#include "pixmapstr.h"
#include "mi.h"
#include "regionstr.h"
+#include "scrnintstr.h"
void
@@ -79,7 +80,7 @@ miFillPolygon( DrawablePtr dst, GCPtr pgc,
return;
ppt = pPts;
- if (pgc->miTranslate)
+ if (pgc->pScreen->miTranslate)
{
xorg = dst->x;
yorg = dst->y;
diff --git a/mi/mipolypnt.c b/mi/mipolypnt.c
index 3e43a523e..f77866258 100644
--- a/mi/mipolypnt.c
+++ b/mi/mipolypnt.c
@@ -54,6 +54,7 @@ SOFTWARE.
#include "gcstruct.h"
#include "windowstr.h"
#include "mi.h"
+#include "scrnintstr.h"
void
miPolyPoint(
@@ -90,7 +91,7 @@ miPolyPoint(
}
}
- if(pGC->miTranslate)
+ if(pGC->pScreen->miTranslate)
{
ppt = pptInit;
nptTmp = npt;
diff --git a/mi/miwideline.c b/mi/miwideline.c
index 057339dbe..0ae49a7da 100644
--- a/mi/miwideline.c
+++ b/mi/miwideline.c
@@ -51,6 +51,7 @@ from The Open Group.
#include "regionstr.h"
#include "miwideline.h"
#include "mi.h"
+#include "scrnintstr.h"
static Bool
InitSpans(Spans *spans, size_t nspans)
@@ -161,7 +162,7 @@ miFillPolyHelper (DrawablePtr pDrawable, GCPtr pGC, unsigned long pixel,
pwidth = spanRec.widths;
xorg = 0;
- if (pGC->miTranslate)
+ if (pGC->pScreen->miTranslate)
{
y += pDrawable->y;
xorg = pDrawable->x;
@@ -278,7 +279,7 @@ miFillRectPolyHelper (
ppt = spanRec.points;
pwidth = spanRec.widths;
- if (pGC->miTranslate)
+ if (pGC->pScreen->miTranslate)
{
y += pDrawable->y;
x += pDrawable->x;
@@ -494,7 +495,7 @@ miLineOnePoint (
else
{
wid = 1;
- if (pGC->miTranslate)
+ if (pGC->pScreen->miTranslate)
{
x += pDrawable->x;
y += pDrawable->y;
@@ -671,7 +672,7 @@ miLineArcI (
tpts = points;
twids = widths;
- if (pGC->miTranslate)
+ if (pGC->pScreen->miTranslate)
{
xorg += pDraw->x;
yorg += pDraw->y;
@@ -772,7 +773,7 @@ miLineArcD (
x0 = xorg - xbase;
ybase = ICEIL (yorg);
y0 = yorg - ybase;
- if (pGC->miTranslate)
+ if (pGC->pScreen->miTranslate)
{
xbase += pDraw->x;
ybase += pDraw->y;
diff --git a/mi/mizerarc.c b/mi/mizerarc.c
index 5adf3dd09..d01d05007 100644
--- a/mi/mizerarc.c
+++ b/mi/mizerarc.c
@@ -45,6 +45,7 @@ Author: Bob Scheifler, MIT X Consortium
#include "pixmapstr.h"
#include "mi.h"
#include "mizerarc.h"
+#include "scrnintstr.h"
#define FULLCIRCLE (360 * 64)
#define OCTANT (45 * 64)
@@ -788,7 +789,7 @@ miZeroPolyArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs)
while (maxw < n)
widths[maxw++] = 1;
}
- if (pGC->miTranslate)
+ if (pGC->pScreen->miTranslate)
{
for (pt = points; pt != pts; pt++)
{
@@ -820,7 +821,7 @@ miZeroPolyArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs)
while (maxw < n)
widths[maxw++] = 1;
}
- if (pGC->miTranslate)
+ if (pGC->pScreen->miTranslate)
{
for (pt = oddPts; pt != pts; pt++)
{
diff --git a/mi/mizerline.c b/mi/mizerline.c
index 7077b5198..57385fd79 100644
--- a/mi/mizerline.c
+++ b/mi/mizerline.c
@@ -130,7 +130,7 @@ miZeroLine(
xright = pDraw->x + pDraw->width - 1;
ybottom = pDraw->y + pDraw->height - 1;
- if (!pGC->miTranslate)
+ if (!pGC->pScreen->miTranslate)
{
/* do everything in drawable-relative coordinates */
xleft = 0;
@@ -170,7 +170,7 @@ miZeroLine(
xstart = ppt->x;
ystart = ppt->y;
- if (pGC->miTranslate)
+ if (pGC->pScreen->miTranslate)
{
xstart += pDraw->x;
ystart += pDraw->y;
@@ -201,7 +201,7 @@ miZeroLine(
x2 = ppt->x;
y2 = ppt->y;
- if (pGC->miTranslate && (mode != CoordModePrevious))
+ if (pGC->pScreen->miTranslate && (mode != CoordModePrevious))
{
x2 += pDraw->x;
y2 += pDraw->y;
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-05 00:50:13 +0000