diff options
| author | Chris Feng <chris.w.feng@gmail.com> | 2016-02-09T05·26+0800 |
|---|---|---|
| committer | Chris Feng <chris.w.feng@gmail.com> | 2016-02-09T05·26+0800 |
| commit | 35d04c34685a1c1e9f351a2c50b3eea2b2fb5f25 (patch) | |
| tree | 759a45d4d335fbae51e39a728008e3044df68424 /exwm-manage.el | |
| parent | fb9bfd291109d3bebc622f2c33a072fac475ac85 (diff) | |
Fix bugs on managing/unmanaging X windows
* exwm-manage.el (exwm-manage--scan): Unmap X windows before managing them. (exwm-manage--on-UnmapNotify): Do not ignore synthetic UnmapNotify events (according to ICCCM). Do not use the `from-configure' slot which was mistakenly introduced due to the bug in `exwm-manage--scan'. * exwm-workspace.el (exwm-workspace--confirm-kill-emacs): Do more cleanups.
Diffstat (limited to 'exwm-manage.el')
| -rw-r--r-- | exwm-manage.el | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/exwm-manage.el b/exwm-manage.el index d7edee06da..21e18ff9cf 100644 --- a/exwm-manage.el +++ b/exwm-manage.el @@ -171,8 +171,6 @@ corresponding buffer.") (make-instance 'xcb:ConfigureWindow :window id :value-mask xcb:ConfigWindow:BorderWidth :border-width 0)) - ;; (xcb:+request exwm--connection ;map the window - ;; (make-instance 'xcb:MapWindow :window id)) (dolist (button ;grab buttons to set focus / move / resize (list xcb:ButtonIndex:1 xcb:ButtonIndex:2 xcb:ButtonIndex:3)) (xcb:+request-checked+request-check exwm--connection @@ -272,6 +270,9 @@ corresponding buffer.") (xcb:+request-unchecked+reply exwm--connection (make-instance 'xcb:GetWindowAttributes :window i)) (when (and (= 0 override-redirect) (= xcb:MapState:Viewable map-state)) + (xcb:+request exwm--connection + (make-instance 'xcb:UnmapWindow :window i)) + (xcb:flush exwm--connection) (exwm-manage--manage-window i)))))) (defvar exwm-manage--ping-lock nil @@ -417,15 +418,13 @@ Would you like to kill it? " (exwm--log "MapRequest from #x%x" window) (exwm-manage--manage-window window)))))) -(defun exwm-manage--on-UnmapNotify (data synthetic) +(defun exwm-manage--on-UnmapNotify (data _synthetic) "Handle UnmapNotify event." - (unless synthetic - (let ((obj (make-instance 'xcb:UnmapNotify))) - (xcb:unmarshal obj data) - (with-slots (window from-configure) obj - (unless from-configure ;the parent is being resized - (exwm--log "UnmapNotify from #x%x" window) - (exwm-manage--unmanage-window window t)))))) + (let ((obj (make-instance 'xcb:UnmapNotify))) + (xcb:unmarshal obj data) + (with-slots (window) obj + (exwm--log "UnmapNotify from #x%x" window) + (exwm-manage--unmanage-window window t)))) (defun exwm-manage--on-DestroyNotify (data synthetic) "Handle DestroyNotify event." |