diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2019-06-12 00:54:40 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-11-02 11:36:24 +0100 |
| commit | fcbd27105c968124aa9ab4a337fad51abcbbe35c (patch) | |
| tree | 105382826be27b21abf9069616ce71f84a2f7ed2 /nx-X11/programs/Xserver/hw/nxagent/NXglyph.c | |
| parent | 67b03f5d5ae1674fa69794728ba5f36e402accfc (diff) | |
| download | nx-libs-fcbd27105c968124aa9ab4a337fad51abcbbe35c.tar.gz nx-libs-fcbd27105c968124aa9ab4a337fad51abcbbe35c.tar.bz2 nx-libs-fcbd27105c968124aa9ab4a337fad51abcbbe35c.zip | |
NXglyph.c: mark NX changes
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/NXglyph.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/NXglyph.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglyph.c b/nx-X11/programs/Xserver/hw/nxagent/NXglyph.c index a0817c622..022ef09f4 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXglyph.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXglyph.c @@ -274,18 +274,21 @@ miGlyphs (CARD8 op, BoxRec extents; CARD32 component_alpha; +#ifdef NXAGENT_SERVER /* * Get rid of the warning. */ extents.x1 = 0; extents.y1 = 0; +#endif if (maskFormat) { GCPtr pGC; xRectangle rect; +#ifdef NXAGENT_SERVER if (nxagentGlyphsExtents != NullBox) { memcpy(&extents, nxagentGlyphsExtents, sizeof(BoxRec)); @@ -298,6 +301,9 @@ miGlyphs (CARD8 op, memcpy(nxagentGlyphsExtents, &extents, sizeof(BoxRec)); } +#else + GlyphExtents (nlist, list, glyphs, &extents); +#endif if (extents.x2 <= extents.x1 || extents.y2 <= extents.y1) return; @@ -369,6 +375,7 @@ miGlyphs (CARD8 op, glyph->info.width, glyph->info.height, 0, 0, -1, (void *) (glyph + 1)); +#ifdef NXAGENT_SERVER /* * The following line fixes a problem with glyphs that appeared * as clipped. It was a side effect due the validate function @@ -378,7 +385,7 @@ miGlyphs (CARD8 op, */ pPicture->pDrawable->serialNumber = NEXT_SERIAL_NUMBER; - +#endif pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER; if (maskFormat) { |