summaryrefslogtreecommitdiff
path: root/xkb/xkbPrKeyEv.c
diff options
context:
space:
mode:
Diffstat (limited to 'xkb/xkbPrKeyEv.c')
-rw-r--r--xkb/xkbPrKeyEv.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/xkb/xkbPrKeyEv.c b/xkb/xkbPrKeyEv.c
index 972f35170..f768bedff 100644
--- a/xkb/xkbPrKeyEv.c
+++ b/xkb/xkbPrKeyEv.c
@@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <ctype.h>
#include <stdio.h>
@@ -35,6 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/Xproto.h>
#include <X11/keysym.h>
+#include "dix/input_priv.h"
#include "xkb/xkbsrv_priv.h"
#include "misc.h"
@@ -68,7 +67,7 @@ XkbProcessKeyboardEvent(DeviceEvent *event, DeviceIntPtr keybd)
/* do anything to implement the behavior, but it *does* report that */
/* key is hardwired */
- if (!(behavior.type & XkbKB_Permanent)) {
+ if (!keybd->ignoreXkbActionsBehaviors && !(behavior.type & XkbKB_Permanent)) {
switch (behavior.type) {
case XkbKB_Default:
/* Neither of these should happen in practice, but ignore them