Skip to content

N
nx-libs
Commit fcbd2710 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel
Browse files
Options

NXglyph.c: mark NX changes

parent 67b03f5d
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 1 deletion
nx-X11/programs/Xserver/hw/nxagent/NXglyph.c
View file @ fcbd2710
...@@ -274,18 +274,21 @@ miGlyphs (CARD8 op, ...@@ -274,18 +274,21 @@ miGlyphs (CARD8 op,
BoxRec extents; BoxRec extents;
CARD32 component_alpha; CARD32 component_alpha;
#ifdef NXAGENT_SERVER
/* /*
* Get rid of the warning. * Get rid of the warning.
*/ */
extents.x1 = 0; extents.x1 = 0;
extents.y1 = 0; extents.y1 = 0;
#endif
if (maskFormat) if (maskFormat)
{ {
GCPtr pGC; GCPtr pGC;
xRectangle rect; xRectangle rect;
#ifdef NXAGENT_SERVER
if (nxagentGlyphsExtents != NullBox) if (nxagentGlyphsExtents != NullBox)
{ {
memcpy(&extents, nxagentGlyphsExtents, sizeof(BoxRec)); memcpy(&extents, nxagentGlyphsExtents, sizeof(BoxRec));
...@@ -298,6 +301,9 @@ miGlyphs (CARD8 op, ...@@ -298,6 +301,9 @@ miGlyphs (CARD8 op,
memcpy(nxagentGlyphsExtents, &extents, sizeof(BoxRec)); memcpy(nxagentGlyphsExtents, &extents, sizeof(BoxRec));
} }
#else
GlyphExtents (nlist, list, glyphs, &extents);
#endif
if (extents.x2 <= extents.x1 || extents.y2 <= extents.y1) if (extents.x2 <= extents.x1 || extents.y2 <= extents.y1)
return; return;
...@@ -369,6 +375,7 @@ miGlyphs (CARD8 op, ...@@ -369,6 +375,7 @@ miGlyphs (CARD8 op,
glyph->info.width, glyph->info.height, glyph->info.width, glyph->info.height,
0, 0, -1, (void *) (glyph + 1)); 0, 0, -1, (void *) (glyph + 1));
#ifdef NXAGENT_SERVER
/* /*
* The following line fixes a problem with glyphs that appeared * The following line fixes a problem with glyphs that appeared
* as clipped. It was a side effect due the validate function * as clipped. It was a side effect due the validate function
...@@ -378,7 +385,7 @@ miGlyphs (CARD8 op, ...@@ -378,7 +385,7 @@ miGlyphs (CARD8 op,
*/ */
pPicture->pDrawable->serialNumber = NEXT_SERIAL_NUMBER; pPicture->pDrawable->serialNumber = NEXT_SERIAL_NUMBER;
#endif
pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER; pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
if (maskFormat) if (maskFormat)
{ {
......
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