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

Fix the advice function for ido-buffer-window-other-frame

Browse source 
* exwm-config.el (exwm-config--ido-buffer-window-other-frame)
(exwm-config--fix/ido-buffer-window-other-frame): Do not use advice.
Fix issues when switching form/to floating frames.
This commit is contained in:
Chris Feng 2016-02-21 16:30:08 +08:00
parent e3d33a4aad
commit 734b401306
1 changed files with 30 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
exwm-config.el
View file

@ -26,6 +26,7 @@
;;; Code: ;;; Code:
(require 'exwm) (require 'exwm)
(require 'ido)
(defun exwm-config-default () (defun exwm-config-default ()
"Default configuration of EXWM." "Default configuration of EXWM."
@ -65,21 +66,37 @@
;; Other configurations ;; Other configurations
(exwm-config-misc)) (exwm-config-misc))
(defun exwm-config--ido-buffer-window-other-frame (orig-fun buffer)
"Wrapper for `ido-buffer-window-other-frame' to exclude invisible windows."
(with-current-buffer buffer
(if (and (eq major-mode 'exwm-mode)
(or exwm--floating-frame
(not exwm-layout-show-all-buffers)))
;; `ido-mode' works well with `exwm-mode' buffers
(funcall orig-fun buffer)
;; Other buffers should be selected within the same workspace
(get-buffer-window buffer exwm-workspace--current))))
(defun exwm-config--fix/ido-buffer-window-other-frame () (defun exwm-config--fix/ido-buffer-window-other-frame ()
"Fix `ido-buffer-window-other-frame'." "Fix `ido-buffer-window-other-frame'."
(advice-add 'ido-buffer-window-other-frame :around (defalias 'exwm-config-ido-buffer-window-other-frame
#'exwm-config--ido-buffer-window-other-frame)) (symbol-function #'ido-buffer-window-other-frame))
(defun ido-buffer-window-other-frame (buffer)
"This is a version redefined by EXWM.
You can find the original one at `exwm-config-ido-buffer-window-other-frame'."
(with-current-buffer (window-buffer (selected-window))
(if (and (eq major-mode 'exwm-mode)
exwm--floating-frame)
;; Switch from a floating frame.
(with-current-buffer buffer
(if (and (eq major-mode 'exwm-mode)
exwm--floating-frame
(eq exwm--frame exwm-workspace--current))
;; Switch to another floating frame.
(frame-root-window exwm--floating-frame)
;; Do not switch if the buffer is not on the current workspace.
(or (get-buffer-window buffer exwm-workspace--current)
(selected-window))))
(with-current-buffer buffer
(when (eq major-mode 'exwm-mode)
(if (eq exwm--frame exwm-workspace--current)
(when exwm--floating-frame
;; Switch to a floating frame on the current workspace.
(frame-selected-window exwm--floating-frame))
;; Do not switch to exwm-mode buffers on other workspace (which
;; won't work unless `exwm-layout-show-all-buffers' is set)
(unless exwm-layout-show-all-buffers
(selected-window)))))))))
(defun exwm-config-ido () (defun exwm-config-ido ()
"Configure Ido to work with EXWM." "Configure Ido to work with EXWM."