diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2007-07-08 14:31:35 +0300 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2007-08-01 01:53:31 +0300 |
| commit | 4d3379d418a781938358e511fd41deb4115a032c (patch) | |
| tree | 0eac38e6a4689e4990ba0853cd18b75535aba23c /dix/main.c | |
| parent | 9ac7e8a559fe6008cafc95e8264680c50e72ba19 (diff) | |
Fonts: Fix builtin fonts
Make sure the font path is always 'built-ins' when we use built-in fonts,
rather than having it as a fixed path for a while, then clobbering it
halfway through startup.
Diffstat (limited to 'dix/main.c')
| -rw-r--r-- | dix/main.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/dix/main.c b/dix/main.c index 48d16b123..c5d3783c8 100644 --- a/dix/main.c +++ b/dix/main.c @@ -399,14 +399,10 @@ main(int argc, char *argv[], char *envp[]) FatalError("failed to initialize core devices"); InitFonts(); -#ifdef BUILTIN_FONTS - defaultFontPath = "built-ins"; -#else if (loadableFonts) { SetFontPath(0, 0, (unsigned char *)defaultFontPath, &error); - } else -#endif - { + } + else { if (SetDefaultFontPath(defaultFontPath) != Success) ErrorF("failed to set default font path '%s'", defaultFontPath); @@ -414,6 +410,7 @@ main(int argc, char *argv[], char *envp[]) if (!SetDefaultFont(defaultTextFont)) { FatalError("could not open default font '%s'", defaultTextFont); } + #ifdef NULL_ROOT_CURSOR cm.width = 0; cm.height = 0; @@ -430,6 +427,7 @@ main(int argc, char *argv[], char *envp[]) defaultCursorFont); } #endif + #ifdef DPMSExtension /* check all screens, looking for DPMS Capabilities */ DPMSCapableFlag = DPMSSupported(); |