diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-07-16 14:19:04 -0400 |
|---|---|---|
| committer | Jeremy Huddleston <jeremy@yuffie.local> | 2009-02-24 22:27:00 -0800 |
| commit | 95a7e9b00f03228f8a311f154263f2ca6958967a (patch) | |
| tree | 60d87ea198ec5ac5900ef2101ae8dd1dc3abd922 | |
| parent | 6c78f1b7361f589fb820cdd459dbeb83f3ef3a05 (diff) | |
Remove the numVideoScreens xprintism.
This was to account for cases where you had video and print screens in
the same server. Lunacy. Leave the slot in ScreenInfo, but rename it,
and stop looking at it.
(cherry picked from commit a82e6efb7b9b2ab9a1597b002f375c5ee105e7f5)
| -rw-r--r-- | dix/dixfonts.c | 15 | ||||
| -rw-r--r-- | dix/main.c | 3 | ||||
| -rw-r--r-- | include/scrnintstr.h | 2 |
3 files changed, 4 insertions, 16 deletions
diff --git a/dix/dixfonts.c b/dix/dixfonts.c index b2698e665..7f0684aa5 100644 --- a/dix/dixfonts.c +++ b/dix/dixfonts.c @@ -1908,21 +1908,12 @@ InitFonts (void) { patternCache = MakeFontPatternCache(); -#ifndef BUILTIN_FONTS - if (screenInfo.numScreens > screenInfo.numVideoScreens) { - PrinterFontRegisterFpeFunctions(); - FontFileCheckRegisterFpeFunctions(); - check_fs_register_fpe_functions(); - } else -#endif - { #ifdef BUILTIN_FONTS - BuiltinRegisterFpeFunctions(); + BuiltinRegisterFpeFunctions(); #else - FontFileRegisterFpeFunctions(); - fs_register_fpe_functions(); + FontFileRegisterFpeFunctions(); + fs_register_fpe_functions(); #endif - } } int diff --git a/dix/main.c b/dix/main.c index 4d6a096eb..b955790dc 100644 --- a/dix/main.c +++ b/dix/main.c @@ -321,7 +321,6 @@ int main(int argc, char *argv[], char *envp[]) SetInputCheck(&alwaysCheckForInput[0], &alwaysCheckForInput[1]); screenInfo.arraySize = MAXSCREENS; screenInfo.numScreens = 0; - screenInfo.numVideoScreens = -1; WindowTable = (WindowPtr *)xalloc(MAXSCREENS * sizeof(WindowPtr)); if (!WindowTable) FatalError("couldn't create root window table"); @@ -351,8 +350,6 @@ int main(int argc, char *argv[], char *envp[]) if (screenInfo.numScreens < 1) FatalError("no screens found"); - if (screenInfo.numVideoScreens < 0) - screenInfo.numVideoScreens = screenInfo.numScreens; InitExtensions(argc, argv); for (i = 0; i < screenInfo.numScreens; i++) { diff --git a/include/scrnintstr.h b/include/scrnintstr.h index 3b2cf9f81..85d360263 100644 --- a/include/scrnintstr.h +++ b/include/scrnintstr.h @@ -593,7 +593,7 @@ typedef struct _ScreenInfo { int arraySize; int numScreens; ScreenPtr screens[MAXSCREENS]; - int numVideoScreens; + int unused; } ScreenInfo; extern ScreenInfo screenInfo; |