summaryrefslogtreecommitdiff
authorPeter Hutterer <peter.hutterer@who-t.net>2012-06-06 04:38:49 (GMT)
committer Peter Hutterer <peter.hutterer@who-t.net>2012-06-06 21:23:56 (GMT)
commitff41753b1bee414b16c0f1e8d183776e87c94065 (patch) (side-by-side diff)
tree0e153fd4fe87f2ce6626d49adf3dc4e5547f8390
parent12f9aaff38ac2cf528387ce610e41fbd448698e2 (diff)
downloadxserver-ff41753b1bee414b16c0f1e8d183776e87c94065.zip
xserver-ff41753b1bee414b16c0f1e8d183776e87c94065.tar.gz
xkb: warn if XKB SlowKeys have been automatically enabled
Slow keys are enabled when the XKB AccessX features are generally enabled (ctrls->enabled_ctrls & XkbAccessXKeysMask) and either shift key is held for 8 seconds. For the unsuspecting user this appears as if the keyboard suddenly stops working. Print a warning to the log, so we can later tell them "told you so". Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--xkb/xkbAccessX.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
index 95e28e7..fe28e12 100644
--- a/xkb/xkbAccessX.c
+++ b/xkb/xkbAccessX.c
@@ -295,10 +295,15 @@ AccessXKRGExpire(OsTimerPtr timer, CARD32 now, pointer arg)
cn.eventType = 0;
cn.requestMajor = 0;
cn.requestMinor = 0;
- if (xkbi->desc->ctrls->enabled_ctrls & XkbSlowKeysMask)
+ if (xkbi->desc->ctrls->enabled_ctrls & XkbSlowKeysMask) {
AccessXKRGTurnOff((DeviceIntPtr) arg, &cn);
- else
+ LogMessage(X_INFO, "XKB SlowKeys are disabled.\n");
+ }
+ else {
AccessXKRGTurnOn((DeviceIntPtr) arg, XkbSlowKeysMask, &cn);
+ LogMessage(X_INFO, "XKB SlowKeys are now enabled. Hold shift to disable.\n");
+ }
+
return 0;
}