Index: programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c,v
retrieving revision 1.2
diff -u -p -r1.2 lnx_kbd.c
--- programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c	23 Apr 2004 19:54:08 -0000	1.2
+++ programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c	10 Jan 2005 12:08:29 -0000
@@ -356,7 +356,7 @@ Bool SpecialKey(InputInfoPtr pInfo, int 
 
   if ((ModifierSet(ControlMask | AltMask)) ||
       (ModifierSet(ControlMask | AltLangMask))) {
-      if (VTSwitchEnabled && !xf86Info.vtSysreq) {
+      if (VTSwitchEnabled && !xf86Info.vtSysreq && !xf86Info.dontVTSwitch) {
           switch (key) {
              case KEY_F1:
              case KEY_F2:
@@ -382,7 +382,7 @@ Bool SpecialKey(InputInfoPtr pInfo, int 
       }
   }
 #ifdef USE_VT_SYSREQ
-    if (VTSwitchEnabled && xf86Info.vtSysreq) {
+    if (VTSwitchEnabled && xf86Info.vtSysreq && !xf86Info.dontVTSwitch) {
         switch (key) {
             case KEY_F1:
             case KEY_F2: