maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix emacsclient issues

Browse source 
* exwm-workspace.el (exwm-workspace--client-p): New function for testing
emacsclient frames.
(exwm-workspace--update-minibuffer-height)
(exwm-workspace--on-minibuffer-setup)
(exwm-workspace--on-minibuffer-exit, exwm-workspace--on-echo-area-dirty)
(exwm-workspace--on-echo-area-clear):
* exwm-input.el (exwm-input--on-buffer-list-update)
(exwm-input--on-minibuffer-setup):
* exwm-layout.el (exwm-layout--on-minibuffer-setup)
(exwm-layout--on-echo-area-change):
Use it.

* exwm-workspace.el (exwm-workspace--add-frame-as-workspace): Always
clear the 'client' frame parameter.
(exwm-workspace--init): Fix a typo.
This commit is contained in:
Chris Feng 2016-08-01 19:53:04 +08:00
parent e7ff9a9f90
commit f04b041cae
3 changed files with 42 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

10
exwm-input.el
View file

@ -79,6 +79,9 @@ It's updated in several occasions, and only used by `exwm-input--set-focus'.")
(exwm-input--set-active-window id)
(xcb:flush exwm--connection))))
(declare-function exwm-workspace--client-p "exwm-workspace.el"
(&optional frame))
(defvar exwm-input--update-focus-window nil "The (Emacs) window to be focused.
This value should always be overwritten.")
@ -87,7 +90,7 @@ This value should always be overwritten.")
"Run in `buffer-list-update-hook' to track input focus."
(when (and (not (minibufferp)) ;Do not set input focus on minibuffer window.
(eq (current-buffer) (window-buffer)) ;e.g. `with-temp-buffer'.
(frame-parameter nil 'exwm-outer-id)) ;e.g. emacsclient frame.
(not (exwm-workspace--client-p)))
(setq exwm-input--update-focus-window (selected-window))
(exwm-input--update-focus-defer)))
@ -183,8 +186,9 @@ This value should always be overwritten.")
(defun exwm-input--on-minibuffer-setup ()
"Run in `minibuffer-setup-hook' to set input focus."
;; Set input focus on the Emacs frame
(x-focus-frame (window-frame (minibuffer-selected-window))))
(unless (exwm-workspace--client-p)
;; Set input focus on the Emacs frame
(x-focus-frame (window-frame (minibuffer-selected-window)))))
(defun exwm-input--set-active-window (&optional id)
"Set _NET_ACTIVE_WINDOW."