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

Pass vtXX argument to default back-end server.

Browse source
This commit is contained in:
David Reveman 2008-07-09 18:50:30 -04:00
parent 3078ea3bfd
commit d23a64fb67
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
hw/dmx/dmxinit.c
View file

@ -124,6 +124,7 @@ Bool dmxIgnoreBadFontPaths = FALSE;
Bool dmxAddRemoveScreens = TRUE;
int dmxLaunchIndex = 0;
char *dmxLaunchVT = NULL;
#ifdef DMXVNC
Bool dmxVnc = FALSE;
@ -761,7 +762,7 @@ void InitOutput(ScreenInfo *pScreenInfo, int argc, char *argv[])
}
if (!dmxConfigDisplaysFromCommandLine ())
dmxLaunchDisplay (argc, argv, dmxLaunchIndex);
dmxLaunchDisplay (argc, argv, dmxLaunchIndex, dmxLaunchVT);
/* ddxProcessArgument has been called at this point, but any data
* from the configuration file has not been applied. Do so, and be
@ -1133,8 +1134,8 @@ int ddxProcessArgument(int argc, char *argv[], int i)
}
else if ((argv[i][0] == 'v') && (argv[i][1] == 't'))
{
/* ignore vtXX arguments */
retval = 1;
dmxLaunchVT = argv[i];
retval = 1;
}
else if (!strcmp(argv[i], "--")) {
dmxLaunchIndex = i + 1;

6
hw/dmx/dmxlaunch.c
View file

@ -265,7 +265,7 @@ dmxSetupAuth (char *name, int authFd)
}
Bool
dmxLaunchDisplay (int argc, char *argv[], int index)
dmxLaunchDisplay (int argc, char *argv[], int index, char *vt)
{
sighandler_t oldSigUsr1;
pid_t pid;
@ -349,6 +349,10 @@ dmxLaunchDisplay (int argc, char *argv[], int index)
return FALSE;
}
if (vt)
if (!dmxAddXbeArguments (&vt, 1))
return FALSE;
if (!dmxAddXbeArguments (&endArg, 1))
return FALSE;

2
hw/dmx/dmxlaunch.h
View file

@ -26,7 +26,7 @@
#ifndef DMXLAUNCH_H
#define DMXLAUNCH_H
extern Bool dmxLaunchDisplay (int argc, char *argv[], int index);
extern Bool dmxLaunchDisplay (int argc, char *argv[], int index, char *vt);
extern void dmxAbortDisplay (void);
#endif /* DMXLAUNCH_H */