XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 10:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

dix: dixfonts: unexport functions not used by drivers

Browse Source 
No need to keep functions exported that aren't needed by external drivers.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-11-19 16:41:34 +01:00
parent 83b1f803ab
commit 36632bb02e
8 changed files with 66 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dix/cursor.c
View File

@@ -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"

1
dix/dispatch.c
View File

@@ -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"

56
dix/dixfont_priv.h Normal file
View File

@@ -0,0 +1,56 @@
/* SPDX-License-Identifier: MIT OR X11
*
* Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
*/
#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 */

6
dix/dixfonts.c
View File

@@ -58,6 +58,7 @@ Equipment Corporation.
#include <X11/fonts/libxfont2.h>
#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);

1
dix/gc.c
View File

@@ -51,6 +51,7 @@ SOFTWARE.
#include <X11/Xmd.h>
#include <X11/Xproto.h>
#include "dix/dixfont_priv.h"
#include "dix/gc_priv.h"
#include "os/osdep.h"

5
dix/main.c
View File

@@ -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();

1
dix/resource.c
View File

@@ -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"

53
include/dixfont.h
View File

@@ -28,59 +28,6 @@ SOFTWARE.
#include <X11/fonts/font.h>
#include <X11/fonts/fontstruct.h>
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 */ ,