aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2008-03-08 16:52:17 -0500
committerAdam Jackson <ajax@redhat.com>2008-03-08 16:52:17 -0500
commitf5bfc7ec3c132276ab7152b283f75387ee656ec2 (patch)
tree940c732323e4f015738d2daa0613851ecfa35983
parentRe-add XKB support. (diff)
downloadxf86-input-evdev-f5bfc7ec3c132276ab7152b283f75387ee656ec2.tar.gz
xf86-input-evdev-f5bfc7ec3c132276ab7152b283f75387ee656ec2.tar.bz2
xf86-input-evdev-f5bfc7ec3c132276ab7152b283f75387ee656ec2.zip
Nuke the keyboard bell code.
It did nothing, and the core won't invoke it anymore anyway.
-rw-r--r--src/evdev.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/evdev.c b/src/evdev.c
index 1771ee8..6dd6c8d 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -405,12 +405,6 @@ static KeySym map[] = {
};
static void
-EvdevKbdBell(int percent, DeviceIntPtr dev, pointer ctrl, int unused)
-{
- /* hat */
-}
-
-static void
EvdevKbdCtrl(DeviceIntPtr device, KeybdCtrl *ctrl)
{
static struct { int xbit, code; } bits[] = {
@@ -488,7 +482,7 @@ EvdevAddKeyClass(DeviceIntPtr device)
{
xf86Msg(X_CONFIG, "XKB: disabled\n");
if (!InitKeyboardDeviceStruct((DevicePtr)device, &keySyms, modMap,
- EvdevKbdBell, EvdevKbdCtrl))
+ NULL, EvdevKbdCtrl))
return !Success;
}
#ifdef XKB
@@ -507,7 +501,7 @@ EvdevAddKeyClass(DeviceIntPtr device)
pEvdev->xkb_layout, pEvdev->xkb_variant,
pEvdev->xkb_options);
if (!XkbInitKeyboardDeviceStruct(device, &pEvdev->xkbnames,
- &keySyms, modMap, EvdevKbdBell,
+ &keySyms, modMap, NULL,
EvdevKbdCtrl))
return !Success;
}