[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/xelb 97d0695 3/3: Do not convert events with unsupporte
|
From: |
Chris Feng |
|
Subject: |
[elpa] externals/xelb 97d0695 3/3: Do not convert events with unsupported modifiers |
|
Date: |
Sun, 14 Jan 2018 10:57:50 -0500 (EST) |
branch: externals/xelb
commit 97d0695636d3ee0d359041dcb68cd8965a5cd79f
Author: Chris Feng <address@hidden>
Commit: Chris Feng <address@hidden>
Do not convert events with unsupported modifiers
* xcb-keysyms.el (xcb:keysyms:event->keysym): Reset the keysym when
failing to convert the modifiers.
---
xcb-keysyms.el | 30 ++++++++++++++++++++++++------
1 file changed, 24 insertions(+), 6 deletions(-)
diff --git a/xcb-keysyms.el b/xcb-keysyms.el
index 69e0d75..c3ffccc 100644
--- a/xcb-keysyms.el
+++ b/xcb-keysyms.el
@@ -650,12 +650,30 @@ Return (0 . 0) when conversion fails."
modifiers (mapcar (lambda (i)
(pcase i
((and x (pred integerp)) x)
- (`meta xcb:keysyms:meta-mask)
- (`control xcb:keysyms:control-mask)
- (`shift xcb:keysyms:shift-mask)
- (`hyper xcb:keysyms:hyper-mask)
- (`super xcb:keysyms:super-mask)
- (`alt xcb:keysyms:alt-mask)
+ (`meta
+ (when (= 0 xcb:keysyms:meta-mask)
+ (setq keysym 0))
+ xcb:keysyms:meta-mask)
+ (`control
+ (when (= 0 xcb:keysyms:control-mask)
+ (setq keysym 0))
+ xcb:keysyms:control-mask)
+ (`shift
+ (when (= 0 xcb:keysyms:shift-mask)
+ (setq keysym 0))
+ xcb:keysyms:shift-mask)
+ (`hyper
+ (when (= 0 xcb:keysyms:hyper-mask)
+ (setq keysym 0))
+ xcb:keysyms:hyper-mask)
+ (`super
+ (when (= 0 xcb:keysyms:super-mask)
+ (setq keysym 0))
+ xcb:keysyms:super-mask)
+ (`alt
+ (when (= 0 xcb:keysyms:alt-mask)
+ (setq keysym 0))
+ xcb:keysyms:alt-mask)
(_
;; Include but not limit to: down.
0)))