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

sun_init.c: Implement novtswitch & sharevts for Solaris 

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: John Martin <john.m.martin@oracle.com>
This commit is contained in:
Alan Coopersmith 2011-05-19 23:26:31 -07:00
parent 7e127f12a2
commit 78f946c297
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/xfree86/os-support/solaris/sun_init.c
View File

@ -186,6 +186,11 @@ xf86OpenConsole(void)
xf86Info.vtno = VTnum; xf86Info.vtno = VTnum;
from = X_CMDLINE; from = X_CMDLINE;
} }
else if (xf86Info.ShareVTs)
{
xf86Info.vtno = vtinfo.v_active;
from = X_CMDLINE;
}
else else
{ {
if ((ioctl(fd, VT_OPENQRY, &xf86Info.vtno) < 0) || if ((ioctl(fd, VT_OPENQRY, &xf86Info.vtno) < 0) ||
@ -217,6 +222,9 @@ OPENCONSOLE:
chown(consoleDev, getuid(), getgid()); chown(consoleDev, getuid(), getgid());
#ifdef HAS_USL_VTS #ifdef HAS_USL_VTS
if (xf86Info.ShareVTs)
return;
if (vtEnabled) if (vtEnabled)
{ {
/* /*
@ -261,12 +269,13 @@ OPENCONSOLE:
else /* serverGeneration != 1 */ else /* serverGeneration != 1 */
{ {
#ifdef HAS_USL_VTS #ifdef HAS_USL_VTS
if (vtEnabled) if (vtEnabled && !xf86Info.ShareVTs)
{ {
/* /*
* Now re-get the VT * Now re-get the VT
*/ */
switch_to(xf86Info.vtno, "xf86OpenConsole"); if (xf86Info.autoVTSwitch)
switch_to(xf86Info.vtno, "xf86OpenConsole");
#ifdef VT_SET_CONSUSER /* added in snv_139 */ #ifdef VT_SET_CONSUSER /* added in snv_139 */
if (strcmp(display, "0") == 0) if (strcmp(display, "0") == 0)
@ -355,7 +364,8 @@ xf86CloseConsole(void)
} }
/* Activate the VT that X was started on */ /* Activate the VT that X was started on */
switch_to(xf86StartVT, "xf86CloseConsole"); if (xf86Info.autoVTSwitch)
switch_to(xf86StartVT, "xf86CloseConsole");
} }
#endif /* HAS_USL_VTS */ #endif /* HAS_USL_VTS */