Simplify default font path setup.
This commit is contained in:
parent
2efe1abb6f
commit
166177e36b
|
@ -139,7 +139,6 @@ char *defaultCursorFont = COMPILEDCURSORFONT;
|
|||
char *defaultDisplayClass = COMPILEDDISPLAYCLASS;
|
||||
FontPtr defaultFont; /* not declared in dix.h to avoid including font.h in
|
||||
every compilation of dix code */
|
||||
Bool loadableFonts = FALSE;
|
||||
CursorPtr rootCursor;
|
||||
Bool blackRoot=FALSE;
|
||||
Bool whiteRoot=FALSE;
|
||||
|
|
|
@ -364,13 +364,8 @@ int main(int argc, char *argv[], char *envp[])
|
|||
FatalError("failed to initialize core devices");
|
||||
|
||||
InitFonts();
|
||||
if (loadableFonts)
|
||||
SetFontPath(serverClient, 0, (unsigned char *)defaultFontPath,
|
||||
&error);
|
||||
else {
|
||||
if (SetDefaultFontPath(defaultFontPath) != Success)
|
||||
ErrorF("failed to set default font path '%s'",
|
||||
defaultFontPath);
|
||||
if (SetDefaultFontPath(defaultFontPath) != Success) {
|
||||
ErrorF("failed to set default font path '%s'", defaultFontPath);
|
||||
}
|
||||
if (!SetDefaultFont(defaultTextFont)) {
|
||||
FatalError("could not open default font '%s'", defaultTextFont);
|
||||
|
|
|
@ -1184,9 +1184,6 @@ OsVendorInit()
|
|||
signal(SIGCHLD, SIG_DFL); /* Need to wait for child processes */
|
||||
#endif
|
||||
OsDelayInitColors = TRUE;
|
||||
#ifndef BUILTIN_FONTS
|
||||
loadableFonts = TRUE;
|
||||
#endif
|
||||
|
||||
if (!beenHere)
|
||||
xf86LogInit();
|
||||
|
|
|
@ -17,7 +17,6 @@ extern Bool screenSaverSuspended;
|
|||
|
||||
extern char *defaultFontPath;
|
||||
extern int monitorResolution;
|
||||
extern Bool loadableFonts;
|
||||
extern int defaultColorVisualClass;
|
||||
|
||||
extern Bool Must_have_memory;
|
||||
|
|
Loading…
Reference in New Issue
Block a user