summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Samyn <code@oleastre.be>2010-02-24 00:24:02 +0100
committerPeter Hutterer <peter.hutterer@who-t.net>2010-02-24 09:35:43 +1000
commitd87747df73114953ac39f3d77ca146adc3b80088 (patch)
treed73079969431887652c56782ca22e9db5cab80e9
parentdeb7cb9c89c64f61c870b5eaf8029a600077aecc (diff)
aiptek: Add keyboard feedback struct initialization.
Without a call to InitKbdFeedbackClassDeviceStruct, no keyboard events are seen by xev. This adds the call and required callback functions. Signed-off-by: Olivier Samyn <code@oleastre.be> [This patch only fixes the case for X server 1.6 and earlier.] Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/xf86Aiptek.c26
1 files changed, 26 insertions, 0 deletions
diff --git a/src/xf86Aiptek.c b/src/xf86Aiptek.c
index c53ccde..bd78121 100644
--- a/src/xf86Aiptek.c
+++ b/src/xf86Aiptek.c
@@ -1569,6 +1569,23 @@ xf86AiptekOpenDevice(DeviceIntPtr pDriver)
}
/*
+ * xf86AiptekBellCallback
+ */
+static void
+xf86AiptekBellCallback(int pct, DeviceIntPtr di, pointer ctrl, int x)
+{
+}
+
+/*
+ * xf86AiptekKbdCtrlCallback
+ */
+static void
+xf86AiptekKbdCtrlCallback(DeviceIntPtr di, KeybdCtrl* ctrl)
+{
+}
+
+
+/*
* xf86AiptekProc
*
* Call dispatcher for this driver.
@@ -1648,6 +1665,15 @@ xf86AiptekProc(DeviceIntPtr pAiptek, int requestCode)
ErrorF("Unable to init Key Class Device\n");
return !Success;
}
+
+ if(InitKbdFeedbackClassDeviceStruct(pAiptek,
+ xf86AiptekBellCallback,
+ xf86AiptekKbdCtrlCallback) == FALSE)
+ {
+ ErrorF("Unable to init Keyboard Feedback Class Device\n");
+ return !Success;
+ }
+
#endif
/* we don't label the axes here, done later in