Mirrors/exwm
2
0
Fork 0
mirror of https://github.com/ch11ng/exwm.git synced 2024-11-27 13:07:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Avoid comparing raw button events

Browse source 
* exwm-input.el (exwm-input--move-keysym, exwm-input--move-mask)
(exwm-input--resize-keysym, exwm-input--resize-mask): Removed.
(exwm-input--on-ButtonPress): Compare using Emacs events rather than
raw X11 events or it would fail with num-lock no.
(exwm-input--init): No longer cache raw keysym/state for button events.
This commit is contained in:
Chris Feng 2017-09-10 18:00:01 +08:00
parent 7bc4ea5a6e
commit 75eb43e1e0
1 changed files with 6 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
exwm-input.el
View file

@ -43,11 +43,6 @@
(defvar exwm-input-resize-event 's-down-mouse-3 (defvar exwm-input-resize-event 's-down-mouse-3
"Emacs event to start resizing a window.") "Emacs event to start resizing a window.")
(defvar exwm-input--move-keysym nil)
(defvar exwm-input--move-mask nil)
(defvar exwm-input--resize-keysym nil)
(defvar exwm-input--resize-mask nil)
(defvar exwm-input--timestamp-window nil) (defvar exwm-input--timestamp-window nil)
(defvar exwm-input--timestamp-atom nil) (defvar exwm-input--timestamp-atom nil)
(defvar exwm-input--timestamp-callback nil) (defvar exwm-input--timestamp-callback nil)
@ -276,13 +271,14 @@ This value should always be overwritten.")
"Handle ButtonPress event." "Handle ButtonPress event."
(let ((obj (make-instance 'xcb:ButtonPress)) (let ((obj (make-instance 'xcb:ButtonPress))
(mode xcb:Allow:SyncPointer) (mode xcb:Allow:SyncPointer)
window buffer frame) button-event window buffer frame)
(xcb:unmarshal obj data) (xcb:unmarshal obj data)
(with-slots (detail time event state) obj (with-slots (detail time event state) obj
(setq window (get-buffer-window (exwm--id->buffer event) t) (setq button-event (xcb:keysyms:keysym->event exwm--connection
detail state)
window (get-buffer-window (exwm--id->buffer event) t)
buffer (window-buffer window)) buffer (window-buffer window))
(cond ((and (= state exwm-input--move-mask) (cond ((and (eq button-event exwm-input-move-event)
(= detail exwm-input--move-keysym)
;; Either an undecorated or a floating X window. ;; Either an undecorated or a floating X window.
(with-current-buffer buffer (with-current-buffer buffer
(or (not (eq major-mode 'exwm-mode)) (or (not (eq major-mode 'exwm-mode))
@ -290,8 +286,7 @@ This value should always be overwritten.")
;; Move ;; Move
(exwm-floating--start-moveresize (exwm-floating--start-moveresize
event xcb:ewmh:_NET_WM_MOVERESIZE_MOVE)) event xcb:ewmh:_NET_WM_MOVERESIZE_MOVE))
((and (= state exwm-input--resize-mask) ((and (eq button-event exwm-input-resize-event)
(= detail exwm-input--resize-keysym)
(with-current-buffer buffer (with-current-buffer buffer
(or (not (eq major-mode 'exwm-mode)) (or (not (eq major-mode 'exwm-mode))
exwm--floating-frame))) exwm--floating-frame)))
@ -709,21 +704,6 @@ Its usage is the same with `exwm-input-set-simulation-keys'."
"Initialize the keyboard module." "Initialize the keyboard module."
;; Refresh keyboard mapping ;; Refresh keyboard mapping
(xcb:keysyms:init exwm--connection) (xcb:keysyms:init exwm--connection)
;; Convert move/resize buttons
(let ((move-key (xcb:keysyms:event->keysym exwm--connection
exwm-input-move-event))
(resize-key (xcb:keysyms:event->keysym exwm--connection
exwm-input-resize-event)))
(when (= 0 (car move-key))
(user-error "[EXWM] Invalid key: %s"
(single-key-description exwm-input-move-event)))
(when (= 0 (car resize-key))
(user-error "[EXWM] Invalid key: %s"
(single-key-description exwm-input-resize-event)))
(setq exwm-input--move-keysym (car move-key)
exwm-input--move-mask (cdr move-key)
exwm-input--resize-keysym (car resize-key)
exwm-input--resize-mask (cdr resize-key)))
;; Create the X window and intern the atom used to fetch timestamp. ;; Create the X window and intern the atom used to fetch timestamp.
(setq exwm-input--timestamp-window (xcb:generate-id exwm--connection)) (setq exwm-input--timestamp-window (xcb:generate-id exwm--connection))
(xcb:+request exwm--connection (xcb:+request exwm--connection