aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/dix
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-02-09 22:31:19 +0000
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-04-10 16:03:10 +0200
commit6a06a6c81047a08ba35c3c4995ae8139d355f366 (patch)
tree1e2dc789ad1ee31f3dc8a1ea78f14affba55863c /nx-X11/programs/Xserver/dix
parent03b772b5fe3c366a25e0ff05e37ab89bb1d7cdff (diff)
downloadnx-libs-6a06a6c81047a08ba35c3c4995ae8139d355f366.tar.gz
nx-libs-6a06a6c81047a08ba35c3c4995ae8139d355f366.tar.bz2
nx-libs-6a06a6c81047a08ba35c3c4995ae8139d355f366.zip
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: Adam Jackson <ajax@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com> Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Diffstat (limited to 'nx-X11/programs/Xserver/dix')
-rw-r--r--nx-X11/programs/Xserver/dix/dixfonts.c2
-rw-r--r--nx-X11/programs/Xserver/dix/main.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/dix/dixfonts.c b/nx-X11/programs/Xserver/dix/dixfonts.c
index 782aa251b..e43af3bbb 100644
--- a/nx-X11/programs/Xserver/dix/dixfonts.c
+++ b/nx-X11/programs/Xserver/dix/dixfonts.c
@@ -1953,6 +1953,8 @@ InitFonts ()
{
patternCache = MakeFontPatternCache();
+ ResetFontPrivateIndex();
+
register_fpe_functions();
}
diff --git a/nx-X11/programs/Xserver/dix/main.c b/nx-X11/programs/Xserver/dix/main.c
index ab8e41394..86d495466 100644
--- a/nx-X11/programs/Xserver/dix/main.c
+++ b/nx-X11/programs/Xserver/dix/main.c
@@ -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 {