Merge remote-tracking branch 'origin/released'

Conflicts:
	pixman/pixman/pixman-mmx.c
	xorg-server/Xext/shm.c
	xorg-server/Xext/syncsrv.h
	xorg-server/Xext/xvmain.c
	xorg-server/Xi/exevents.c
	xorg-server/Xi/opendev.c
	xorg-server/composite/compalloc.c
	xorg-server/composite/compoverlay.c
	xorg-server/dix/colormap.c
	xorg-server/dix/devices.c
	xorg-server/dix/dispatch.c
	xorg-server/dix/dixfonts.c
	xorg-server/dix/eventconvert.c
	xorg-server/dix/events.c
	xorg-server/dix/gc.c
	xorg-server/dix/getevents.c
	xorg-server/dix/main.c
	xorg-server/dix/privates.c
	xorg-server/dix/registry.c
	xorg-server/dix/resource.c
	xorg-server/exa/exa_accel.c
	xorg-server/exa/exa_migration_classic.c
	xorg-server/exa/exa_unaccel.c
	xorg-server/fb/fb.h
	xorg-server/fb/fbcopy.c
	xorg-server/fb/fbpixmap.c
	xorg-server/glx/dispatch.h
	xorg-server/glx/glapi.h
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glapitable.h
	xorg-server/glx/glprocs.h
	xorg-server/glx/glxcmds.c
	xorg-server/glx/glxcmdsswap.c
	xorg-server/glx/glxdricommon.c
	xorg-server/glx/glxdriswrast.c
	xorg-server/glx/glxext.c
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch.h
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_size.h
	xorg-server/glx/indirect_size_get.h
	xorg-server/glx/indirect_table.c
	xorg-server/glx/indirect_util.c
	xorg-server/glx/rensize.c
	xorg-server/glx/single2swap.c
	xorg-server/glx/singlepix.c
	xorg-server/glx/singlepixswap.c
	xorg-server/glx/singlesize.c
	xorg-server/hw/dmx/dmxinit.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/hostx.c
	xorg-server/hw/kdrive/ephyr/hostx.h
	xorg-server/hw/kdrive/src/kinput.c
	xorg-server/hw/xfree86/common/compiler.h
	xorg-server/hw/xwin/InitInput.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/ddraw.h
	xorg-server/hw/xwin/glx/glwrap.c
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/hw/xwin/glx/wgl_ext_api.h
	xorg-server/hw/xwin/glx/winpriv.c
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winallpriv.c
	xorg-server/hw/xwin/winauth.c
	xorg-server/hw/xwin/winclipboard.h
	xorg-server/hw/xwin/winclipboardinit.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winclipboardunicode.c
	xorg-server/hw/xwin/winclipboardwndproc.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winclipboardxevents.c
	xorg-server/hw/xwin/wincmap.c
	xorg-server/hw/xwin/winconfig.c
	xorg-server/hw/xwin/wincreatewnd.c
	xorg-server/hw/xwin/wincursor.c
	xorg-server/hw/xwin/windialogs.c
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/wingc.c
	xorg-server/hw/xwin/wingetsp.c
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winkeybd.h
	xorg-server/hw/xwin/winlayouts.h
	xorg-server/hw/xwin/winmisc.c
	xorg-server/hw/xwin/winmonitors.c
	xorg-server/hw/xwin/winmouse.c
	xorg-server/hw/xwin/winmsg.c
	xorg-server/hw/xwin/winmsg.h
	xorg-server/hw/xwin/winmultiwindowclass.c
	xorg-server/hw/xwin/winmultiwindowicons.c
	xorg-server/hw/xwin/winmultiwindowshape.c
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/hw/xwin/winnativegdi.c
	xorg-server/hw/xwin/winpfbdd.c
	xorg-server/hw/xwin/winpixmap.c
	xorg-server/hw/xwin/winpolyline.c
	xorg-server/hw/xwin/winprefs.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/hw/xwin/winregistry.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winsetsp.c
	xorg-server/hw/xwin/winshaddd.c
	xorg-server/hw/xwin/winshadddnl.c
	xorg-server/hw/xwin/winshadgdi.c
	xorg-server/hw/xwin/wintrayicon.c
	xorg-server/hw/xwin/winwin32rootless.c
	xorg-server/hw/xwin/winwin32rootlesswindow.c
	xorg-server/hw/xwin/winwin32rootlesswndproc.c
	xorg-server/hw/xwin/winwindow.c
	xorg-server/hw/xwin/winwindow.h
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/hw/xwin/winwndproc.c
	xorg-server/include/callback.h
	xorg-server/include/dixstruct.h
	xorg-server/include/misc.h
	xorg-server/include/os.h
	xorg-server/include/scrnintstr.h
	xorg-server/mi/micmap.c
	xorg-server/mi/miinitext.c
	xorg-server/mi/mioverlay.c
	xorg-server/mi/misprite.c
	xorg-server/mi/mivaltree.c
	xorg-server/mi/miwindow.c
	xorg-server/miext/damage/damage.c
	xorg-server/miext/rootless/rootlessGC.c
	xorg-server/miext/rootless/rootlessWindow.c
	xorg-server/os/WaitFor.c
	xorg-server/os/access.c
	xorg-server/os/connection.c
	xorg-server/os/io.c
	xorg-server/os/log.c
	xorg-server/os/osinit.c
	xorg-server/os/utils.c
	xorg-server/os/xdmcp.c
	xorg-server/os/xprintf.c
	xorg-server/os/xstrans.c
	xorg-server/render/mipict.c
	xorg-server/xkb/xkbActions.c
	xorg-server/xkb/xkbInit.c
	xorg-server/xkeyboard-config/compat/default.in

1 files changed, 178 insertions, 207 deletions

diff --git a/xorg-server/hw/kdrive/linux/linux.c b/xorg-server/hw/kdrive/linux/linux.c
index 194e7cd59..498c2398d 100644
--- a/xorg-server/hw/kdrive/linux/linux.c
+++ b/xorg-server/hw/kdrive/linux/linux.c
@@ -34,51 +34,51 @@
 #include <linux/apm_bios.h>
 
 #ifdef KDRIVE_MOUSE
-extern KdPointerDriver	LinuxMouseDriver;
-extern KdPointerDriver	Ps2MouseDriver;
-extern KdPointerDriver	MsMouseDriver;
+extern KdPointerDriver LinuxMouseDriver;
+extern KdPointerDriver Ps2MouseDriver;
+extern KdPointerDriver MsMouseDriver;
 #endif
 #ifdef TSLIB
-extern KdPointerDriver	TsDriver;
+extern KdPointerDriver TsDriver;
 #endif
 #ifdef KDRIVE_EVDEV
-extern KdPointerDriver	LinuxEvdevMouseDriver;
+extern KdPointerDriver LinuxEvdevMouseDriver;
 extern KdKeyboardDriver LinuxEvdevKeyboardDriver;
 #endif
 #ifdef KDRIVE_KBD
-extern KdKeyboardDriver	LinuxKeyboardDriver;
+extern KdKeyboardDriver LinuxKeyboardDriver;
 #endif
 
-static int  vtno;
-int  LinuxConsoleFd;
-int  LinuxApmFd = -1;
-static int  activeVT;
+static int vtno;
+int LinuxConsoleFd;
+int LinuxApmFd = -1;
+static int activeVT;
 static Bool enabled;
 
 static void
-LinuxVTRequest (int sig)
+LinuxVTRequest(int sig)
 {
     kdSwitchPending = TRUE;
 }
 
 /* Check before chowning -- this avoids touching the file system */
 static void
-LinuxCheckChown (char *file)
+LinuxCheckChown(char *file)
 {
-    struct stat	    st;
-    __uid_t	    u;
-    __gid_t	    g;
-
-    if (stat (file, &st) < 0)
-	return;
-    u = getuid ();
-    g = getgid ();
+    struct stat st;
+    __uid_t u;
+    __gid_t g;
+
+    if (stat(file, &st) < 0)
+        return;
+    u = getuid();
+    g = getgid();
     if (st.st_uid != u || st.st_gid != g)
-	chown (file, u, g);
+        chown(file, u, g);
 }
 
 static int
-LinuxInit (void)
+LinuxInit(void)
 {
     int fd = -1;
     char vtname[11];
@@ -86,39 +86,31 @@ LinuxInit (void)
 
     LinuxConsoleFd = -1;
     /* check if we're run with euid==0 */
-    if (geteuid() != 0)
-    {
-	FatalError("LinuxInit: Server must be suid root\n");
+    if (geteuid() != 0) {
+        FatalError("LinuxInit: Server must be suid root\n");
     }
 
     if (kdVirtualTerminal >= 0)
-	vtno = kdVirtualTerminal;
-    else
-    {
-	if ((fd = open("/dev/tty0",O_WRONLY,0)) < 0)
-	{
-	    FatalError(
-		       "LinuxInit: Cannot open /dev/tty0 (%s)\n",
-		       strerror(errno));
-	}
-	if ((ioctl(fd, VT_OPENQRY, &vtno) < 0) ||
-	    (vtno == -1))
-	{
-	    FatalError("xf86OpenConsole: Cannot find a free VT\n");
-	}
-	close(fd);
+        vtno = kdVirtualTerminal;
+    else {
+        if ((fd = open("/dev/tty0", O_WRONLY, 0)) < 0) {
+            FatalError("LinuxInit: Cannot open /dev/tty0 (%s)\n",
+                       strerror(errno));
+        }
+        if ((ioctl(fd, VT_OPENQRY, &vtno) < 0) || (vtno == -1)) {
+            FatalError("xf86OpenConsole: Cannot find a free VT\n");
+        }
+        close(fd);
     }
 
-    snprintf(vtname,sizeof(vtname),"/dev/tty%d",vtno); /* /dev/tty1-64 */
+    snprintf(vtname, sizeof(vtname), "/dev/tty%d", vtno);       /* /dev/tty1-64 */
 
-    if ((LinuxConsoleFd = open(vtname, O_RDWR|O_NDELAY, 0)) < 0)
-    {
-	FatalError("LinuxInit: Cannot open %s (%s)\n",
-		   vtname, strerror(errno));
+    if ((LinuxConsoleFd = open(vtname, O_RDWR | O_NDELAY, 0)) < 0) {
+        FatalError("LinuxInit: Cannot open %s (%s)\n", vtname, strerror(errno));
     }
 
     /* change ownership of the vt */
-    LinuxCheckChown (vtname);
+    LinuxCheckChown(vtname);
 
     /*
      * the current VT device we're running on is not "console", we want
@@ -126,109 +118,100 @@ LinuxInit (void)
      *
      * Why is this needed?
      */
-    LinuxCheckChown ("/dev/tty0");
+    LinuxCheckChown("/dev/tty0");
     /*
      * Linux doesn't switch to an active vt after the last close of a vt,
      * so we do this ourselves by remembering which is active now.
      */
-    memset (&vts, '\0', sizeof (vts));	/* valgrind */
-    if (ioctl(LinuxConsoleFd, VT_GETSTATE, &vts) == 0)
-    {
-	activeVT = vts.v_active;
+    memset(&vts, '\0', sizeof(vts));    /* valgrind */
+    if (ioctl(LinuxConsoleFd, VT_GETSTATE, &vts) == 0) {
+        activeVT = vts.v_active;
     }
 
     return 1;
 }
 
 static void
-LinuxSetSwitchMode (int mode)
+LinuxSetSwitchMode(int mode)
 {
-    struct sigaction	act;
-    struct vt_mode	VT;
+    struct sigaction act;
+    struct vt_mode VT;
 
-    if (ioctl(LinuxConsoleFd, VT_GETMODE, &VT) < 0)
-    {
-	FatalError ("LinuxInit: VT_GETMODE failed\n");
+    if (ioctl(LinuxConsoleFd, VT_GETMODE, &VT) < 0) {
+        FatalError("LinuxInit: VT_GETMODE failed\n");
     }
 
-    if (mode == VT_PROCESS)
-    {
-	act.sa_handler = LinuxVTRequest;
-	sigemptyset (&act.sa_mask);
-	act.sa_flags = 0;
-	sigaction (SIGUSR1, &act, 0);
+    if (mode == VT_PROCESS) {
+        act.sa_handler = LinuxVTRequest;
+        sigemptyset(&act.sa_mask);
+        act.sa_flags = 0;
+        sigaction(SIGUSR1, &act, 0);
 
-	VT.mode = mode;
-	VT.relsig = SIGUSR1;
-	VT.acqsig = SIGUSR1;
+        VT.mode = mode;
+        VT.relsig = SIGUSR1;
+        VT.acqsig = SIGUSR1;
     }
-    else
-    {
-	act.sa_handler = SIG_IGN;
-	sigemptyset (&act.sa_mask);
-	act.sa_flags = 0;
-	sigaction (SIGUSR1, &act, 0);
-
-	VT.mode = mode;
-	VT.relsig = 0;
-	VT.acqsig = 0;
+    else {
+        act.sa_handler = SIG_IGN;
+        sigemptyset(&act.sa_mask);
+        act.sa_flags = 0;
+        sigaction(SIGUSR1, &act, 0);
+
+        VT.mode = mode;
+        VT.relsig = 0;
+        VT.acqsig = 0;
     }
-    if (ioctl(LinuxConsoleFd, VT_SETMODE, &VT) < 0)
-    {
-	FatalError("LinuxInit: VT_SETMODE failed\n");
+    if (ioctl(LinuxConsoleFd, VT_SETMODE, &VT) < 0) {
+        FatalError("LinuxInit: VT_SETMODE failed\n");
     }
 }
 
 static void
-LinuxApmBlock (pointer blockData, OSTimePtr pTimeout, pointer pReadmask)
+LinuxApmBlock(pointer blockData, OSTimePtr pTimeout, pointer pReadmask)
 {
 }
 
 static Bool LinuxApmRunning;
 
 static void
-LinuxApmWakeup (pointer blockData, int result, pointer pReadmask)
+LinuxApmWakeup(pointer blockData, int result, pointer pReadmask)
 {
-    fd_set  *readmask = (fd_set *) pReadmask;
-
-    if (result > 0 && LinuxApmFd >= 0 && FD_ISSET (LinuxApmFd, readmask))
-    {
-	apm_event_t event;
-	Bool	    running = LinuxApmRunning;
-	int	    cmd = APM_IOC_SUSPEND;
-
-	while (read (LinuxApmFd, &event, sizeof (event)) == sizeof (event))
-	{
-	    switch (event) {
-	    case APM_SYS_STANDBY:
-	    case APM_USER_STANDBY:
-		running = FALSE;
-		cmd = APM_IOC_STANDBY;
-		break;
-	    case APM_SYS_SUSPEND:
-	    case APM_USER_SUSPEND:
-	    case APM_CRITICAL_SUSPEND:
-		running = FALSE;
-		cmd = APM_IOC_SUSPEND;
-		break;
-	    case APM_NORMAL_RESUME:
-	    case APM_CRITICAL_RESUME:
-	    case APM_STANDBY_RESUME:
-		running = TRUE;
-		break;
-	    }
-	}
-	if (running && !LinuxApmRunning)
-	{
-	    KdResume ();
-	    LinuxApmRunning = TRUE;
-	}
-	else if (!running && LinuxApmRunning)
-	{
-	    KdSuspend ();
-	    LinuxApmRunning = FALSE;
-	    ioctl (LinuxApmFd, cmd, 0);
-	}
+    fd_set *readmask = (fd_set *) pReadmask;
+
+    if (result > 0 && LinuxApmFd >= 0 && FD_ISSET(LinuxApmFd, readmask)) {
+        apm_event_t event;
+        Bool running = LinuxApmRunning;
+        int cmd = APM_IOC_SUSPEND;
+
+        while (read(LinuxApmFd, &event, sizeof(event)) == sizeof(event)) {
+            switch (event) {
+            case APM_SYS_STANDBY:
+            case APM_USER_STANDBY:
+                running = FALSE;
+                cmd = APM_IOC_STANDBY;
+                break;
+            case APM_SYS_SUSPEND:
+            case APM_USER_SUSPEND:
+            case APM_CRITICAL_SUSPEND:
+                running = FALSE;
+                cmd = APM_IOC_SUSPEND;
+                break;
+            case APM_NORMAL_RESUME:
+            case APM_CRITICAL_RESUME:
+            case APM_STANDBY_RESUME:
+                running = TRUE;
+                break;
+            }
+        }
+        if (running && !LinuxApmRunning) {
+            KdResume();
+            LinuxApmRunning = TRUE;
+        }
+        else if (!running && LinuxApmRunning) {
+            KdSuspend();
+            LinuxApmRunning = FALSE;
+            ioctl(LinuxApmFd, cmd, 0);
+        }
     }
 }
 
@@ -239,127 +222,115 @@ LinuxApmWakeup (pointer blockData, int result, pointer pReadmask)
 #endif
 
 static void
-LinuxEnable (void)
+LinuxEnable(void)
 {
     if (enabled)
-	return;
-    if (kdSwitchPending)
-    {
-	kdSwitchPending = FALSE;
-	ioctl (LinuxConsoleFd, VT_RELDISP, VT_ACKACQ);
+        return;
+    if (kdSwitchPending) {
+        kdSwitchPending = FALSE;
+        ioctl(LinuxConsoleFd, VT_RELDISP, VT_ACKACQ);
     }
     /*
      * Open the APM driver
      */
-    LinuxApmFd = open ("/dev/apm_bios", 2);
+    LinuxApmFd = open("/dev/apm_bios", 2);
     if (LinuxApmFd < 0 && errno == ENOENT)
-	LinuxApmFd = open ("/dev/misc/apm_bios", 2);
-    if (LinuxApmFd >= 0)
-    {
-	LinuxApmRunning = TRUE;
-	fcntl (LinuxApmFd, F_SETFL, fcntl (LinuxApmFd, F_GETFL) | NOBLOCK);
-	RegisterBlockAndWakeupHandlers (LinuxApmBlock, LinuxApmWakeup, 0);
-	AddEnabledDevice (LinuxApmFd);
+        LinuxApmFd = open("/dev/misc/apm_bios", 2);
+    if (LinuxApmFd >= 0) {
+        LinuxApmRunning = TRUE;
+        fcntl(LinuxApmFd, F_SETFL, fcntl(LinuxApmFd, F_GETFL) | NOBLOCK);
+        RegisterBlockAndWakeupHandlers(LinuxApmBlock, LinuxApmWakeup, 0);
+        AddEnabledDevice(LinuxApmFd);
     }
 
     /*
      * now get the VT
      */
-    LinuxSetSwitchMode (VT_AUTO);
-    if (ioctl(LinuxConsoleFd, VT_ACTIVATE, vtno) != 0)
-    {
-	FatalError("LinuxInit: VT_ACTIVATE failed\n");
+    LinuxSetSwitchMode(VT_AUTO);
+    if (ioctl(LinuxConsoleFd, VT_ACTIVATE, vtno) != 0) {
+        FatalError("LinuxInit: VT_ACTIVATE failed\n");
     }
-    if (ioctl(LinuxConsoleFd, VT_WAITACTIVE, vtno) != 0)
-    {
-	FatalError("LinuxInit: VT_WAITACTIVE failed\n");
+    if (ioctl(LinuxConsoleFd, VT_WAITACTIVE, vtno) != 0) {
+        FatalError("LinuxInit: VT_WAITACTIVE failed\n");
     }
-    LinuxSetSwitchMode (VT_PROCESS);
-    if (ioctl(LinuxConsoleFd, KDSETMODE, KD_GRAPHICS) < 0)
-    {
-	FatalError("LinuxInit: KDSETMODE KD_GRAPHICS failed\n");
+    LinuxSetSwitchMode(VT_PROCESS);
+    if (ioctl(LinuxConsoleFd, KDSETMODE, KD_GRAPHICS) < 0) {
+        FatalError("LinuxInit: KDSETMODE KD_GRAPHICS failed\n");
     }
     enabled = TRUE;
 }
 
 static void
-LinuxDisable (void)
+LinuxDisable(void)
 {
     ioctl(LinuxConsoleFd, KDSETMODE, KD_TEXT);  /* Back to text mode ... */
-    if (kdSwitchPending)
-    {
-	kdSwitchPending = FALSE;
-	ioctl (LinuxConsoleFd, VT_RELDISP, 1);
+    if (kdSwitchPending) {
+        kdSwitchPending = FALSE;
+        ioctl(LinuxConsoleFd, VT_RELDISP, 1);
     }
     enabled = FALSE;
-    if (LinuxApmFd >= 0)
-    {
-	RemoveBlockAndWakeupHandlers (LinuxApmBlock, LinuxApmWakeup, 0);
-	RemoveEnabledDevice (LinuxApmFd);
-	close (LinuxApmFd);
-	LinuxApmFd = -1;
+    if (LinuxApmFd >= 0) {
+        RemoveBlockAndWakeupHandlers(LinuxApmBlock, LinuxApmWakeup, 0);
+        RemoveEnabledDevice(LinuxApmFd);
+        close(LinuxApmFd);
+        LinuxApmFd = -1;
     }
 }
 
 static void
-LinuxFini (void)
+LinuxFini(void)
 {
-    struct vt_mode   VT;
-    struct vt_stat  vts;
-    int		    fd;
+    struct vt_mode VT;
+    struct vt_stat vts;
+    int fd;
 
     if (LinuxConsoleFd < 0)
-	return;
+        return;
 
-    if (ioctl(LinuxConsoleFd, VT_GETMODE, &VT) != -1)
-    {
-	VT.mode = VT_AUTO;
-	ioctl(LinuxConsoleFd, VT_SETMODE, &VT); /* set dflt vt handling */
+    if (ioctl(LinuxConsoleFd, VT_GETMODE, &VT) != -1) {
+        VT.mode = VT_AUTO;
+        ioctl(LinuxConsoleFd, VT_SETMODE, &VT); /* set dflt vt handling */
     }
-    memset (&vts, '\0', sizeof (vts));	/* valgrind */
-    ioctl (LinuxConsoleFd, VT_GETSTATE, &vts);
-    if (vtno == vts.v_active)
-    {
-	/*
-	 * Find a legal VT to switch to, either the one we started from
-	 * or the lowest active one that isn't ours
-	 */
-	if (activeVT < 0 ||
-	    activeVT == vts.v_active ||
-	    !(vts.v_state & (1 << activeVT)))
-	{
-	    for (activeVT = 1; activeVT < 16; activeVT++)
-		if (activeVT != vtno && (vts.v_state & (1 << activeVT)))
-		    break;
-	    if (activeVT == 16)
-		activeVT = -1;
-	}
-	/*
-	 * Perform a switch back to the active VT when we were started
-	 */
-	if (activeVT >= -1)
-	{
-	    ioctl (LinuxConsoleFd, VT_ACTIVATE, activeVT);
-	    ioctl (LinuxConsoleFd, VT_WAITACTIVE, activeVT);
-	    activeVT = -1;
-	}
+    memset(&vts, '\0', sizeof(vts));    /* valgrind */
+    ioctl(LinuxConsoleFd, VT_GETSTATE, &vts);
+    if (vtno == vts.v_active) {
+        /*
+         * Find a legal VT to switch to, either the one we started from
+         * or the lowest active one that isn't ours
+         */
+        if (activeVT < 0 ||
+            activeVT == vts.v_active || !(vts.v_state & (1 << activeVT))) {
+            for (activeVT = 1; activeVT < 16; activeVT++)
+                if (activeVT != vtno && (vts.v_state & (1 << activeVT)))
+                    break;
+            if (activeVT == 16)
+                activeVT = -1;
+        }
+        /*
+         * Perform a switch back to the active VT when we were started
+         */
+        if (activeVT >= -1) {
+            ioctl(LinuxConsoleFd, VT_ACTIVATE, activeVT);
+            ioctl(LinuxConsoleFd, VT_WAITACTIVE, activeVT);
+            activeVT = -1;
+        }
     }
-    close(LinuxConsoleFd);                /* make the vt-manager happy */
+    close(LinuxConsoleFd);      /* make the vt-manager happy */
     LinuxConsoleFd = -1;
-    fd = open ("/dev/tty0", O_RDWR|O_NDELAY, 0);
-    if (fd >= 0)
-    {
-	memset (&vts, '\0', sizeof (vts));	/* valgrind */
-	ioctl (fd, VT_GETSTATE, &vts);
-	if (ioctl (fd, VT_DISALLOCATE, vtno) < 0)
-	    fprintf (stderr, "Can't deallocate console %d %s\n", vtno, strerror(errno));
-	close (fd);
+    fd = open("/dev/tty0", O_RDWR | O_NDELAY, 0);
+    if (fd >= 0) {
+        memset(&vts, '\0', sizeof(vts));        /* valgrind */
+        ioctl(fd, VT_GETSTATE, &vts);
+        if (ioctl(fd, VT_DISALLOCATE, vtno) < 0)
+            fprintf(stderr, "Can't deallocate console %d %s\n", vtno,
+                    strerror(errno));
+        close(fd);
     }
     return;
 }
 
 void
-KdOsAddInputDrivers (void)
+KdOsAddInputDrivers(void)
 {
 #ifdef KDRIVE_MOUSE
     KdAddPointerDriver(&LinuxMouseDriver);
@@ -383,10 +354,10 @@ LinuxBell(int volume, int pitch, int duration)
 {
     if (volume && pitch)
         ioctl(LinuxConsoleFd, KDMKTONE, ((1193190 / pitch) & 0xffff) |
-              (((unsigned long)duration * volume / 50) << 16));
+              (((unsigned long) duration * volume / 50) << 16));
 }
 
-KdOsFuncs   LinuxFuncs = {
+KdOsFuncs LinuxFuncs = {
     .Init = LinuxInit,
     .Enable = LinuxEnable,
     .Disable = LinuxDisable,
@@ -395,7 +366,7 @@ KdOsFuncs   LinuxFuncs = {
 };
 
 void
-OsVendorInit (void)
+OsVendorInit(void)
 {
-    KdOsInit (&LinuxFuncs);
+    KdOsInit(&LinuxFuncs);
 }