From 36632bb02e922d1b85a759ed4847aef403d8f95b Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 19 Nov 2025 16:41:34 +0100 Subject: [PATCH] dix: dixfonts: unexport functions not used by drivers No need to keep functions exported that aren't needed by external drivers. Signed-off-by: Enrico Weigelt, metux IT consult --- dix/cursor.c | 1 + dix/dispatch.c | 1 + dix/dixfont_priv.h | 56 ++++++++++++++++++++++++++++++++++++++++++++++ dix/dixfonts.c | 6 ++--- dix/gc.c | 1 + dix/main.c | 5 +++-- dix/resource.c | 1 + include/dixfont.h | 53 ------------------------------------------- 8 files changed, 66 insertions(+), 58 deletions(-) create mode 100644 dix/dixfont_priv.h diff --git a/dix/cursor.c b/dix/cursor.c index ef3cc9954a..d5ec8a640b 100644 --- a/dix/cursor.c +++ b/dix/cursor.c @@ -51,6 +51,7 @@ SOFTWARE. #include "dix/cursor_priv.h" #include "dix/dix_priv.h" +#include "dix/dixfont_priv.h" #include "dix/screenint_priv.h" #include "os/bug_priv.h" diff --git a/dix/dispatch.c b/dix/dispatch.c index 3f1b58db6e..fab9072774 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -107,6 +107,7 @@ Equipment Corporation. #include "dix/colormap_priv.h" #include "dix/cursor_priv.h" #include "dix/dix_priv.h" +#include "dix/dixfont_priv.h" #include "dix/extension_priv.h" #include "dix/input_priv.h" #include "dix/gc_priv.h" diff --git a/dix/dixfont_priv.h b/dix/dixfont_priv.h new file mode 100644 index 0000000000..211986dbfb --- /dev/null +++ b/dix/dixfont_priv.h @@ -0,0 +1,56 @@ +/* SPDX-License-Identifier: MIT OR X11 + * + * Copyright © 2024 Enrico Weigelt, metux IT consult + */ +#ifndef _XSERVER_DIXFONT_PRIV_H +#define _XSERVER_DIXFONT_PRIV_H + +#include "include/dixfont.h" + +Bool SetDefaultFont(const char *defaultfontname); + +int SetDefaultFontPath(const char *path); + +int OpenFont(ClientPtr client, + XID fid, + Mask flags, + unsigned lenfname, + const char *pfontname); + +int CloseFont(void *pfont, XID fid); + +int SetFontPath(ClientPtr client, int npaths, unsigned char *paths); + +void DeleteClientFontStuff(ClientPtr client); + +/* Quartz support on Mac OS X pulls in the QuickDraw + framework whose InitFonts function conflicts here. */ +void dixInitFonts(void); +void dixFreeFonts(void); + +int ListFonts(ClientPtr client, + unsigned char *pattern, + unsigned int length, + unsigned int max_names); + +int ImageText(ClientPtr client, + DrawablePtr pDraw, + GCPtr pGC, + int nChars, + unsigned char *data, + int xorg, + int yorg, + int reqType, + XID did); + +int PolyText(ClientPtr client, + DrawablePtr pDraw, + GCPtr pGC, + unsigned char *pElt, + unsigned char *endReq, + int xorg, + int yorg, + int reqType, + XID did); + +#endif /* _XSERVER_DIXFONT_PRIV_H */ diff --git a/dix/dixfonts.c b/dix/dixfonts.c index cfb195b0b7..998bbd7414 100644 --- a/dix/dixfonts.c +++ b/dix/dixfonts.c @@ -58,6 +58,7 @@ Equipment Corporation. #include #include "dix/dix_priv.h" +#include "dix/dixfont_priv.h" #include "dix/gc_priv.h" #include "dix/request_priv.h" #include "dix/rpcbuf_priv.h" @@ -1846,8 +1847,7 @@ get_client_resolutions(int *num) return &res; } -void -FreeFonts(void) +void dixFreeFonts(void) { if (patternCache) { xfont2_free_font_pattern_cache(patternCache); @@ -2036,7 +2036,7 @@ static const xfont2_client_funcs_rec xfont2_client_funcs = { xfont2_pattern_cache_ptr fontPatternCache; void -InitFonts(void) +dixInitFonts(void) { if (fontPatternCache) xfont2_free_font_pattern_cache(fontPatternCache); diff --git a/dix/gc.c b/dix/gc.c index 39b56eeb22..e51b5b4716 100644 --- a/dix/gc.c +++ b/dix/gc.c @@ -51,6 +51,7 @@ SOFTWARE. #include #include +#include "dix/dixfont_priv.h" #include "dix/gc_priv.h" #include "os/osdep.h" diff --git a/dix/main.c b/dix/main.c index 873d6cf84b..539fc51490 100644 --- a/dix/main.c +++ b/dix/main.c @@ -89,6 +89,7 @@ Equipment Corporation. #include "dix/callback_priv.h" #include "dix/cursor_priv.h" #include "dix/dix_priv.h" +#include "dix/dixfont_priv.h" #include "dix/extension_priv.h" #include "dix/input_priv.h" #include "dix/gc_priv.h" @@ -191,7 +192,7 @@ dix_main(int argc, char *argv[], char *envp[]) InitEvents(); xfont2_init_glyph_caching(); dixResetRegistry(); - InitFonts(); + dixInitFonts(); InitCallbackManager(); InitOutput(argc, argv); @@ -347,7 +348,7 @@ dix_main(int argc, char *argv[], char *envp[]) dixFreeRegistry(); - FreeFonts(); + dixFreeFonts(); FreeAllAtoms(); diff --git a/dix/resource.c b/dix/resource.c index 288f71154e..f1e0cca4a4 100644 --- a/dix/resource.c +++ b/dix/resource.c @@ -123,6 +123,7 @@ Equipment Corporation. #include "dix/colormap_priv.h" #include "dix/dix_priv.h" +#include "dix/dixfont_priv.h" #include "dix/dixgrabs_priv.h" #include "dix/gc_priv.h" #include "dix/registry_priv.h" diff --git a/include/dixfont.h b/include/dixfont.h index 1069c47a7c..cb1d726ca6 100644 --- a/include/dixfont.h +++ b/include/dixfont.h @@ -28,59 +28,6 @@ SOFTWARE. #include #include -extern _X_EXPORT Bool SetDefaultFont(const char * /*defaultfontname */ ); - -extern _X_EXPORT int OpenFont(ClientPtr /*client */ , - XID /*fid */ , - Mask /*flags */ , - unsigned /*lenfname */ , - const char * /*pfontname */ ); - -extern _X_EXPORT int CloseFont(void *pfont, - XID fid); - -extern _X_EXPORT int ListFonts(ClientPtr /*client */ , - unsigned char * /*pattern */ , - unsigned int /*length */ , - unsigned int /*max_names */ ); - -extern _X_EXPORT int PolyText(ClientPtr /*client */ , - DrawablePtr /*pDraw */ , - GCPtr /*pGC */ , - unsigned char * /*pElt */ , - unsigned char * /*endReq */ , - int /*xorg */ , - int /*yorg */ , - int /*reqType */ , - XID /*did */ ); - -extern _X_EXPORT int ImageText(ClientPtr /*client */ , - DrawablePtr /*pDraw */ , - GCPtr /*pGC */ , - int /*nChars */ , - unsigned char * /*data */ , - int /*xorg */ , - int /*yorg */ , - int /*reqType */ , - XID /*did */ ); - -extern _X_EXPORT int SetFontPath(ClientPtr /*client */ , - int /*npaths */ , - unsigned char * /*paths */ ); - -extern _X_EXPORT int SetDefaultFontPath(const char * /*path */ ); - -extern _X_EXPORT void DeleteClientFontStuff(ClientPtr /*client */ ); - -/* Quartz support on Mac OS X pulls in the QuickDraw - framework whose InitFonts function conflicts here. */ -#ifdef __APPLE__ -#define InitFonts Darwin_X_InitFonts -#endif -extern _X_EXPORT void InitFonts(void); - -extern _X_EXPORT void FreeFonts(void); - extern _X_EXPORT void GetGlyphs(FontPtr /*font */ , unsigned long /*count */ , unsigned char * /*chars */ ,