andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

New algorithm for calculating glyph extents in Xgl

Browse Source
This commit is contained in:
David Reveman 2005-05-01 22:55:25 +00:00
parent e4b33f4e91
commit 5b4462ed9b
1 changed files with 82 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
hw/xgl/xglglyph.c
View File

@ -844,15 +844,21 @@ xglGlyphExtents (PicturePtr pDst,
BoxPtr extents) BoxPtr extents)
{ {
GlyphPtr glyph; GlyphPtr glyph;
BoxRec line;
int x1, x2, y1, y2; int x1, x2, y1, y2;
int n; int n;
int x; int x;
int y; int y;
Bool x_overlap, overlap = FALSE; Bool overlap = FALSE;
x = 0; x = 0;
y = 0; y = 0;
extents->x1 = MAXSHORT;
extents->x2 = MINSHORT;
extents->y1 = MAXSHORT;
extents->y2 = MINSHORT;
while (!list->len) while (!list->len)
{ {
if (--nlist) if (--nlist)
@ -863,11 +869,6 @@ xglGlyphExtents (PicturePtr pDst,
} }
else else
{ {
extents->x1 = MAXSHORT;
extents->x2 = MINSHORT;
extents->y1 = MAXSHORT;
extents->y2 = MINSHORT;
return FALSE; return FALSE;
} }
} }
@ -880,10 +881,10 @@ xglGlyphExtents (PicturePtr pDst,
if (y1 < MINSHORT) if (y1 < MINSHORT)
y1 = MINSHORT; y1 = MINSHORT;
extents->x1 = x1; line.x1 = x1;
extents->x2 = x1; line.x2 = x1;
extents->y1 = y1; line.y1 = y1;
extents->y2 = y1; line.y2 = y1;
while (nlist--) while (nlist--)
{ {
@ -908,33 +909,55 @@ xglGlyphExtents (PicturePtr pDst,
if (y2 > MAXSHORT) if (y2 > MAXSHORT)
y2 = MAXSHORT; y2 = MAXSHORT;
x_overlap = FALSE; if (x1 >= line.x2)
if (x1 >= extents->x2) {
extents->x2 = x2; line.x2 = x2;
else if (x2 <= extents->x1) if (y1 < line.y1)
extents->x1 = x1; line.y1 = y1;
if (y2 > line.y2)
line.y2 = y2;
}
else if (x2 <= line.x1)
{
line.x1 = x1;
if (y1 < line.y1)
line.y1 = y1;
if (y2 > line.y2)
line.y2 = y2;
}
else else
{ {
x_overlap = TRUE; if (line.y1 >= extents->y2)
if (x1 < extents->x1) {
extents->x1 = x1; extents->y2 = line.y2;
if (x2 > extents->x2) if (line.y1 < extents->y1)
extents->x2 = x2; extents->y1 = line.y1;
}
else if (line.y2 <= extents->y1)
{
extents->y1 = line.y1;
if (line.y2 > extents->y2)
extents->y2 = line.y2;
}
else
{
if (line.y1 < extents->y1)
extents->y1 = line.y1;
if (line.y2 > extents->y2)
extents->y2 = line.y2;
overlap = TRUE;
} }
if (y1 >= extents->y2) if (line.x1 < extents->x1)
extents->y2 = y2; extents->x1 = line.x1;
else if (y2 <= extents->y1) if (line.x2 > extents->x2)
extents->y1 = y1; extents->x2 = line.x2;
else
{
if (y1 < extents->y1)
extents->y1 = y1;
if (y2 > extents->y2)
extents->y2 = y2;
if (x_overlap) line.x1 = x1;
overlap = TRUE; line.y1 = y1;
line.x2 = x2;
line.y2 = y2;
} }
x += glyph->info.xOff; x += glyph->info.xOff;
@ -942,6 +965,33 @@ xglGlyphExtents (PicturePtr pDst,
} }
} }
if (line.y1 >= extents->y2)
{
extents->y2 = line.y2;
if (line.y1 < extents->y1)
extents->y1 = line.y1;
}
else if (line.y2 <= extents->y1)
{
extents->y1 = line.y1;
if (line.y2 > extents->y2)
extents->y2 = line.y2;
}
else
{
if (line.y1 < extents->y1)
extents->y1 = line.y1;
if (line.y2 > extents->y2)
extents->y2 = line.y2;
overlap = TRUE;
}
if (line.x1 < extents->x1)
extents->x1 = line.x1;
if (line.x2 > extents->x2)
extents->x2 = line.x2;
xglPictureClipExtents (pDst, extents); xglPictureClipExtents (pDst, extents);
return overlap; return overlap;