Skip to content

N
nx-libs
Commit 6a06a6c8 authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

dix: Move InitFonts up above screen initialization

Backport from X.org: commit 91ea0965dd4dfeba0a914c47ad4a64768e983b1b Author: Keith Packard <keithp@keithp.com> Date: Wed Nov 11 22:02:04 2015 -0800 dix: Move InitFonts up above screen initialization Font initialization was split into two stages, the first was to set up font privates with a call to ResetFontPrivateIndex, then much later the call to InitFonts to set up all of the FPEs. Doing the full font initialization before initializing the video drivers means that we can move the call to ResetFontPrivateIndex inside InitFonts. Reviewed-by: 's avatarAdam Jackson <ajax@redhat.com> Signed-off-by: 's avatarKeith Packard <keithp@keithp.com> Backported-to-NX-by: 's avatarMike Gabriel <mike.gabriel@das-netzwerkteam.de>
parent 03b772b5
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
nx-X11/programs/Xserver/dix/dixfonts.c
View file @ 6a06a6c8
......@@ -1953,6 +1953,8 @@ InitFonts ()
{
patternCache = MakeFontPatternCache();
ResetFontPrivateIndex();
register_fpe_functions();
}
......
nx-X11/programs/Xserver/dix/main.c
View file @ 6a06a6c8
......@@ -261,8 +261,8 @@ main(int argc, char *argv[], char *envp[])
ResetPixmapPrivates();
#endif
ResetColormapPrivates();
ResetFontPrivateIndex();
ResetDevicePrivateIndex();
InitFonts();
InitCallbackManager();
InitVisualWrap();
InitOutput(&screenInfo, argc, argv);
......@@ -294,7 +294,6 @@ main(int argc, char *argv[], char *envp[])
FatalError("failed to initialize core devices");
ReserveClientIds(serverClient);
InitFonts();
if (loadableFonts) {
SetFontPath(0, 0, (unsigned char *)defaultFontPath, &error);
} else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment