summaryrefslogtreecommitdiff
path: root/dix
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2012-06-28 15:15:53 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2012-07-02 10:09:08 -0700
commita00066d2916b6910429cc1c7feedafbaee0d4750 (patch)
tree4a81771b0db3f43c8e104370c01a45e0e7c6d159 /dix
parent212b9803238d2de2e77cbe5de62d3f616ae50daf (diff)
Add dixGetGlyphs to replace GetGlyphs from libXfont to simplify linking
No other Xfont consumer used it, and this saves us from having to link callers against libXfont for one simple function when doing -no-undefined symbols builds. The function is given a new name to avoid clashing with existing libXfont binaries, but a #define is provided to preserve the API so we don't have to fix all the callers at the same time. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Diffstat (limited to 'dix')
-rw-r--r--dix/dixfonts.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index 19fd31e3e..dd9331195 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -115,6 +115,15 @@ LoadGlyphs(ClientPtr client, FontPtr pfont, unsigned nchars, int item_size,
return Successful;
}
+void
+dixGetGlyphs(FontPtr font, unsigned long count, unsigned char *chars,
+ FontEncoding fontEncoding,
+ unsigned long *glyphcount, /* RETURN */
+ CharInfoPtr *glyphs) /* RETURN */
+{
+ (*font->get_glyphs) (font, count, chars, fontEncoding, glyphcount, glyphs);
+}
+
/*
* adding RT_FONT prevents conflict with default cursor font
*/