Skip to content

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

NXglyph.c: adapt FindGlyph() to better match render/glyph.c

no function change
parent 73f88998
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 4 deletions
nx-X11/programs/Xserver/hw/nxagent/NXglyph.c
View file @ 67b03f5d
...@@ -161,18 +161,22 @@ AddGlyph (GlyphSetPtr glyphSet, GlyphPtr glyph, Glyph id) ...@@ -161,18 +161,22 @@ AddGlyph (GlyphSetPtr glyphSet, GlyphPtr glyph, Glyph id)
CheckDuplicates (&globalGlyphs[glyphSet->fdepth], "AddGlyph bottom"); CheckDuplicates (&globalGlyphs[glyphSet->fdepth], "AddGlyph bottom");
} }
GlyphPtr FindGlyph (GlyphSetPtr glyphSet, Glyph id) GlyphPtr
FindGlyph (GlyphSetPtr glyphSet, Glyph id)
{ {
GlyphRefPtr gr;
GlyphPtr glyph; GlyphPtr glyph;
gr = FindGlyphRef (&glyphSet->hash, id, FALSE, 0); #ifdef NXAGENT_SERVER
GlyphRefPtr gr = FindGlyphRef (&glyphSet->hash, id, FALSE, 0);
glyph = gr -> glyph; glyph = gr -> glyph;
#else
glyph = FindGlyphRef (&glyphSet->hash, id, FALSE, 0)->glyph;
#endif
if (glyph == DeletedGlyph) if (glyph == DeletedGlyph)
{ {
glyph = 0; glyph = 0;
} }
#ifdef NXAGENT_SERVER
else if (gr -> corruptedGlyph == 1) else if (gr -> corruptedGlyph == 1)
{ {
#ifdef DEBUG #ifdef DEBUG
...@@ -183,6 +187,7 @@ GlyphPtr FindGlyph (GlyphSetPtr glyphSet, Glyph id) ...@@ -183,6 +187,7 @@ GlyphPtr FindGlyph (GlyphSetPtr glyphSet, Glyph id)
nxagentAddGlyphs(glyphSet, &id, &(glyph -> info), 1, nxagentAddGlyphs(glyphSet, &id, &(glyph -> info), 1,
(CARD8*)(glyph + 1), glyph -> size - sizeof(xGlyphInfo)); (CARD8*)(glyph + 1), glyph -> size - sizeof(xGlyphInfo));
} }
#endif
return glyph; return glyph;
} }
......
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