eea3df4877
Add macro to wrap things that depend on the display being initialized (and a frame active), such as getting the font. Advise the `server-create-window-system-frame` function which is called by emacsclient when creating a window-system frame. This is only run the first time a frame is created, so the advice removes itself. Fixes: syl20bnr/spacemacs#299 and syl20bnr/spacemacs#1894 (Among others)
43 lines
1.6 KiB
EmacsLisp
43 lines
1.6 KiB
EmacsLisp
;;; core-display-init.el --- Spacemacs Core File
|
|
;;
|
|
;; Copyright (c) 2012-2014 Sylvain Benner
|
|
;; Copyright (c) 2014-2015 Sylvain Benner & Contributors
|
|
;;
|
|
;; Author: Sylvain Benner <sylvain.benner@gmail.com>
|
|
;; URL: https://github.com/syl20bnr/spacemacs
|
|
;;
|
|
;; This file is not part of GNU Emacs.
|
|
;;
|
|
;;; License: GPLv3
|
|
|
|
(defvar spacemacs--after-display-system-init-list '()
|
|
"List of functions to be run after the display system is initialized.")
|
|
|
|
(defadvice server-create-window-system-frame
|
|
(after spacemacs-init-display activate)
|
|
"After Emacs server creates a frame, run functions queued in
|
|
`SPACEMACS--AFTER-DISPLAY-SYSTEM-INIT-LIST' to do any setup that needs to have
|
|
the display system initialized."
|
|
(progn
|
|
(dolist (fn (reverse spacemacs--after-display-system-init-list))
|
|
(funcall fn))
|
|
(ad-disable-advice 'server-create-window-system-frame
|
|
'after
|
|
'spacemacs-init-display)
|
|
(ad-activate 'server-create-window-system-frame)))
|
|
|
|
(defmacro spacemacs|do-after-display-system-init (&rest body)
|
|
"If the display-system is initialized, run `BODY', otherwise,
|
|
add it to a queue of actions to perform after the first graphical frame is
|
|
created."
|
|
`(let ((init (cond ((eq system-type 'darwin) 'ns-initialized)
|
|
((eq system-type 'windows-nt) 'w32-initialized)
|
|
((eq system-type 'gnu/linux) 'x-initialized)
|
|
(t 't)))) ; fallback to normal loading behavior
|
|
(if (symbol-value init)
|
|
(progn
|
|
,@body)
|
|
(push (lambda () ,@body) spacemacs--after-display-system-init-list))))
|
|
|
|
(provide 'core-display-init)
|