frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Adam Jackson 2008-07-16 14:19:04 -04:00
parent 1a573e402e
commit a82e6efb7b
3 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dix/dixfonts.c
View File

@ -1908,14 +1908,6 @@ InitFonts (void)
{ {
patternCache = MakeFontPatternCache(); patternCache = MakeFontPatternCache();
#ifndef BUILTIN_FONTS
if (screenInfo.numScreens > screenInfo.numVideoScreens) {
PrinterFontRegisterFpeFunctions();
FontFileCheckRegisterFpeFunctions();
check_fs_register_fpe_functions();
} else
#endif
{
#ifdef BUILTIN_FONTS #ifdef BUILTIN_FONTS
BuiltinRegisterFpeFunctions(); BuiltinRegisterFpeFunctions();
#else #else
@ -1923,7 +1915,6 @@ InitFonts (void)
fs_register_fpe_functions(); fs_register_fpe_functions();
#endif #endif
} }
}
int int
GetDefaultPointSize () GetDefaultPointSize ()

3
dix/main.c
View File

@ -309,7 +309,6 @@ int main(int argc, char *argv[], char *envp[])
SetInputCheck(&alwaysCheckForInput[0], &alwaysCheckForInput[1]); SetInputCheck(&alwaysCheckForInput[0], &alwaysCheckForInput[1]);
screenInfo.arraySize = MAXSCREENS; screenInfo.arraySize = MAXSCREENS;
screenInfo.numScreens = 0; screenInfo.numScreens = 0;
screenInfo.numVideoScreens = -1;
WindowTable = (WindowPtr *)xalloc(MAXSCREENS * sizeof(WindowPtr)); WindowTable = (WindowPtr *)xalloc(MAXSCREENS * sizeof(WindowPtr));
if (!WindowTable) if (!WindowTable)
FatalError("couldn't create root window table"); FatalError("couldn't create root window table");
@ -339,8 +338,6 @@ int main(int argc, char *argv[], char *envp[])
if (screenInfo.numScreens < 1) if (screenInfo.numScreens < 1)
FatalError("no screens found"); FatalError("no screens found");
if (screenInfo.numVideoScreens < 0)
screenInfo.numVideoScreens = screenInfo.numScreens;
InitExtensions(argc, argv); InitExtensions(argc, argv);
for (i = 0; i < screenInfo.numScreens; i++) for (i = 0; i < screenInfo.numScreens; i++)
{ {

2
include/scrnintstr.h
View File

@ -612,7 +612,7 @@ typedef struct _ScreenInfo {
int arraySize; int arraySize;
int numScreens; int numScreens;
ScreenPtr screens[MAXSCREENS]; ScreenPtr screens[MAXSCREENS];
int numVideoScreens; int unused;
} ScreenInfo; } ScreenInfo;
extern ScreenInfo screenInfo; extern ScreenInfo screenInfo;