fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-22 09:10:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Apply default options more properly.

Browse source
This commit is contained in:
David Reveman 2008-09-03 14:01:06 +02:00
parent 7865c254f3
commit 03ce9acf74
1 changed files with 32 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
hw/dmx/dmxinit.c
View file

@ -1000,9 +1000,37 @@ void ddxGiveUp(void)
AbortDDX(); AbortDDX();
} }
#ifdef PANORAMIX
static Bool dmxNoPanoramiXExtension = FALSE;
#endif
/** This function is called in Xserver/os/osinit.c from \a OsInit(). */ /** This function is called in Xserver/os/osinit.c from \a OsInit(). */
void OsVendorInit(void) void OsVendorInit(void)
{ {
if (!dmxPropTrans)
{
dmxPropTrans = xalloc (sizeof (DMXPropTrans));
dmxPropTrans->name = "_COMPIZ_WINDOW_DECOR";
dmxPropTrans->format = "xP";
dmxPropTrans->type = 0;
dmxPropTransNum = 1;
}
#ifdef PANORAMIX
noPanoramiXExtension = dmxNoPanoramiXExtension;
PanoramiXExtensionDisabledHack = TRUE;
#endif
#ifdef XV
if (!dmxXvImageFormats)
{
dmxXvImageFormats = xalloc (sizeof (char *) * 2);
dmxXvImageFormats[0] = "YV12";
dmxXvImageFormats[1] = "YUY2";
dmxXvImageFormatsNum = 2;
}
#endif
} }
/** This function is called in Xserver/os/utils.c from \a FatalError() /** This function is called in Xserver/os/utils.c from \a FatalError()
@ -1019,15 +1047,6 @@ int ddxProcessArgument(int argc, char *argv[], int i)
{ {
int retval = 0; int retval = 0;
if (i == 1)
{
defaultFontPath = "built-ins";
#ifdef PANORAMIX
noPanoramiXExtension = FALSE;
PanoramiXExtensionDisabledHack = TRUE;
#endif
}
if (!strcmp(argv[i], "-display")) { if (!strcmp(argv[i], "-display")) {
if (++i < argc) dmxConfigStoreDisplay(argv[i], argv[i], if (++i < argc) dmxConfigStoreDisplay(argv[i], argv[i],
NULL, 0, NULL, 0, 0); NULL, 0, NULL, 0, 0);
@ -1103,10 +1122,10 @@ int ddxProcessArgument(int argc, char *argv[], int i)
} else if (!strcmp(argv[i], "-noaddremovescreens")) { } else if (!strcmp(argv[i], "-noaddremovescreens")) {
dmxAddRemoveScreens = FALSE; dmxAddRemoveScreens = FALSE;
retval = 1; retval = 1;
#ifdef DMXVNC #ifdef PANORAMIX
} else if (!strcmp(argv[i], "-novnc")) { else if (!strcmp (argv[i], "-xinerama")) {
dmxVnc = FALSE; dmxNoPanoramiXExtension = TRUE;
retval = 1; retval = 1;
#endif #endif
#ifdef RANDR #ifdef RANDR
} else if (!strcmp(argv[i], "-outputs")) { } else if (!strcmp(argv[i], "-outputs")) {
@ -1186,29 +1205,6 @@ int ddxProcessArgument(int argc, char *argv[], int i)
retval = argc - i; retval = argc - i;
} }
if (i == (argc - 1))
{
if (!dmxPropTrans)
{
dmxPropTrans = xalloc (sizeof (DMXPropTrans));
dmxPropTrans->name = "_COMPIZ_WINDOW_DECOR";
dmxPropTrans->format = "xP";
dmxPropTrans->type = 0;
dmxPropTransNum = 1;
}
#ifdef XV
if (!dmxXvImageFormats)
{
dmxXvImageFormats = xalloc (sizeof (char *) * 2);
dmxXvImageFormats[0] = "YV12";
dmxXvImageFormats[1] = "YUY2";
dmxXvImageFormatsNum = 2;
}
#endif
}
if (!serverGeneration) dmxConfigSetMaxScreens(); if (!serverGeneration) dmxConfigSetMaxScreens();
return retval; return retval;
} }