CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src

[matthew green]

Module Name:    xsrc
Committed By:   mrg
Date:           Sat May 22 21:20:17 UTC 2010

Modified Files:
        xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_kbd.c

Log Message:
merge xf86-input-keyboard 1.4.0


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
    xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c
diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.6 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.7
--- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.6	Tue Aug 18 13:54:53 2009
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c	Sat May 22 21:20:17 2010
@@ -299,53 +299,6 @@
     }
 }
 
-#define ModifierSet(k) ((modifiers & (k)) == (k))
-
-static
-Bool SpecialKey(InputInfoPtr pInfo, int key, Bool down, int modifiers)
-{
-  KbdDevPtr pKbd = (KbdDevPtr) pInfo->private;
-
-  if(!pKbd->vtSwitchSupported)
-      return FALSE;
-
-  if ((ModifierSet(ControlMask | AltMask)) ||
-      (ModifierSet(ControlMask | AltLangMask))) {
-      if (VTSwitchEnabled && !xf86Info.vtSysreq && !xf86Info.dontVTSwitch) {
-         switch (key) {
-             case KEY_F1:
-             case KEY_F2:
-             case KEY_F3:
-             case KEY_F4:
-             case KEY_F5:
-             case KEY_F6:
-             case KEY_F7:
-             case KEY_F8:
-             case KEY_F9:
-             case KEY_F10:
-#ifdef VT_ACTIVATE
-                  if (down) {
-                    ioctl(xf86Info.consoleFd, VT_ACTIVATE, key - KEY_F1 + 1);
-                    return TRUE;
-                  }
-#endif
-             case KEY_F11:
-             case KEY_F12:
-#ifdef VT_ACTIVATE
-                  if (down) {
-                    ioctl(xf86Info.consoleFd, VT_ACTIVATE, key - KEY_F11 + 11);
-                    return TRUE;
-                  }
-#else
-		;
-#endif
-         }
-      }
-    }
-
-    return FALSE;
-}
-
 static void
 stdReadInput(InputInfoPtr pInfo)
 {
@@ -520,10 +473,8 @@
     pKbd->GetLeds	= GetKbdLeds;
     pKbd->SetKbdRepeat	= SetKbdRepeat;
     pKbd->KbdGetMapping	= KbdGetMapping;
-    pKbd->SpecialKey	= SpecialKey;
 
     pKbd->RemapScanCode = NULL;
-    pKbd->GetSpecialKey = NULL;
 
     pKbd->OpenKeyboard = OpenKeyboard;
     pKbd->vtSwitchSupported = FALSE;