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

Fix emacsclient bugs

Browse source 
`emacsclient` started with `-c` or `-t` argument create a new frame that shall
not be used to manage X windows.
Also fix some related input focus issues (with some remaining unfixed).
Close #17.
This commit is contained in:
Chris Feng 2015-08-10 10:55:28 +08:00
parent edc70eb661
commit 2d4104a0ec
4 changed files with 49 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

53
exwm-layout.el
View file

@ -160,32 +160,43 @@
(defun exwm-layout--refresh ()
"Refresh layout."
(let ((frame (selected-frame))
windows placeholder)
(placeholder (get-buffer "*scratch*"))
windows)
(if (not (memq frame exwm-workspace--list))
;; Refresh a floating frame
(progn
(cl-assert (eq major-mode 'exwm-mode))
(let ((window (frame-first-window frame)))
(if (frame-parameter frame 'exwm-window-id)
;; Refresh a floating frame
(progn
(cl-assert (eq major-mode 'exwm-mode))
(let ((window (frame-first-window frame)))
(with-current-buffer (window-buffer window)
(exwm--log "Refresh floating window #x%x" exwm--id)
(exwm-layout--show exwm--id window))))
;; Other frames (e.g. terminal/graphical frame of emacsclient)
;; We shall bury all `exwm-mode' buffers in this case
(unless placeholder ;create the *scratch* buffer if it's killed
(setq placeholder (get-buffer-create "*scratch*"))
(set-buffer-major-mode placeholder))
(setq windows (window-list frame 0)) ;exclude minibuffer
(dolist (window windows)
(with-current-buffer (window-buffer window)
(exwm--log "Refresh floating window #x%x" exwm--id)
(exwm-layout--show exwm--id window))))
(when (eq major-mode 'exwm-mode)
(set-window-buffer window placeholder)))))
;; Refresh the whole workspace
;; Workspaces other than the active one can also be refreshed (RandR)
(exwm--log "Refresh workspace %s" frame)
(let ((placeholder (get-buffer "*scratch*")))
(unless placeholder ;create the *scratch* buffer if it's killed
(setq placeholder (get-buffer-create "*scratch*"))
(set-buffer-major-mode placeholder))
(dolist (pair exwm--id-buffer-alist)
(with-current-buffer (cdr pair)
;; Exclude windows on other workspaces and floating frames
(when (and (eq frame exwm--frame) (not exwm--floating-frame))
(setq windows (get-buffer-window-list (current-buffer) 0))
(if (not windows)
(exwm-layout--hide exwm--id)
(exwm-layout--show exwm--id (car windows))
(dolist (i (cdr windows))
(set-window-buffer i placeholder))))))))))
(unless placeholder ;create the *scratch* buffer if it's killed
(setq placeholder (get-buffer-create "*scratch*"))
(set-buffer-major-mode placeholder))
(dolist (pair exwm--id-buffer-alist)
(with-current-buffer (cdr pair)
;; Exclude windows on other workspaces and floating frames
(when (and (eq frame exwm--frame) (not exwm--floating-frame))
(setq windows (get-buffer-window-list (current-buffer) 0))
(if (not windows)
(exwm-layout--hide exwm--id)
(exwm-layout--show exwm--id (car windows))
(dolist (i (cdr windows))
(set-window-buffer i placeholder)))))))))
(defun exwm-layout--on-minibuffer-setup ()
"Refresh layout when minibuffer grows."