config/emacs
config/emacs
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify eyepersp

Browse Source
This commit is contained in:
Wojciech Kozlowski 2019-12-19 00:38:00 +01:00
parent 2ffd794ce3
commit 685ad488ca
1 changed files with 27 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
external/eyepersp.el vendored
View File

@ -24,62 +24,56 @@
(defvar eyepersp/perspectives nil) (defvar eyepersp/perspectives nil)
(defun eyepersp/get-persp-parameters (persp) (defun eyepersp/get-persp-parameters ()
"Return alist of parameters for perspective PERSP." "Return alist of parameters for current perspective."
(assoc persp eyepersp/perspectives)) (assoc (persp-curr) eyepersp/perspectives))
(defun eyepersp/delete-persp-parameters (persp) (defun eyepersp/delete-persp-parameters ()
"Delete PERSP state." "Delete perspective state."
(assoc-delete-all persp eyepersp/perspectives)) (assoc-delete-all (persp-curr) eyepersp/perspectives))
(defun eyepersp/persp-parameter-cons (param-name persp) (defun eyepersp/persp-parameter-cons (param-name)
"Return the cons for PARAM-NAME for perspective PERSP. "Return the cons for PARAM-NAME for perspective.
If none was set, returns nil." If none was set, returns nil."
(assoc param-name (eyepersp/get-persp-parameters persp))) (assoc param-name (eyepersp/get-persp-parameters)))
(defun eyepersp/persp-parameter (param-name persp) (defun eyepersp/persp-parameter (param-name)
"Return value of PARAM-NAME for perspective PERSP. "Return value of PARAM-NAME for perspective.
If none was set, returns nil." If none was set, returns nil."
(cdr (eyepersp/persp-parameter-cons param-name persp))) (cdr (eyepersp/persp-parameter-cons param-name)))
(defun eyepersp/set-persp-parameter (param-name value persp) (defun eyepersp/set-persp-parameter (param-name value)
"Set PARAM-NAME to VALUE for perspective PERSP." "Set PARAM-NAME to VALUE for current perspective."
(let ((param (eyepersp/persp-parameter-cons param-name persp))) (let ((param (eyepersp/persp-parameter-cons param-name)))
(when (not param) (when (not param)
(let ((persp-params (eyepersp/get-persp-parameters persp))) (let ((persp-params (eyepersp/get-persp-parameters)))
(when (not persp-params) (when (not persp-params)
(setq eyepersp/perspectives (setq eyepersp/perspectives
(cons `(,persp . nil) eyepersp/perspectives)) (cons `(,(persp-curr) . nil) eyepersp/perspectives))
(setq persp-params (car eyepersp/perspectives))) (setq persp-params (car eyepersp/perspectives)))
(setcdr persp-params (setcdr persp-params
(cons `(,param-name . nil) (cdr persp-params))) (cons `(,param-name . nil) (cdr persp-params)))
(setq param (cadr persp-params)))) (setq param (cadr persp-params))))
(setcdr param value))) (setcdr param value)))
(defun eyepersp/get-persp-workspace (&optional persp) (defun eyepersp/get-persp-workspace ()
"Get the correct workspace parameters for perspective. "Get the correct workspace parameters for perspective."
PERSP is the perspective, and defaults to the current
perspective."
(or persp (setq persp (persp-curr)))
(let ((param-names '(eyepersp-eyebrowse-window-configs (let ((param-names '(eyepersp-eyebrowse-window-configs
eyepersp-eyebrowse-current-slot eyepersp-eyebrowse-current-slot
eyepersp-eyebrowse-last-slot))) eyepersp-eyebrowse-last-slot)))
(--map (eyepersp/persp-parameter it persp) param-names))) (--map (eyepersp/persp-parameter it) param-names)))
(defun eyepersp/set-persp-workspace (workspace-params &optional persp) (defun eyepersp/set-persp-workspace (workspace-params)
"Set workspace parameters for perspective. "Set workspace parameters for perspective.
WORKSPACE-PARAMS should be a list containing 3 elements in WORKSPACE-PARAMS should be a list containing 3 elements in
this order: this order:
- window-configs, as returned by (eyebrowse--get 'window-configs) - window-configs, as returned by (eyebrowse--get 'window-configs),
- current-slot, as returned by (eyebrowse--get 'current-slot) - current-slot, as returned by (eyebrowse--get 'current-slot),
- last-slot, as returned by (eyebrowse--get 'last-slot) - last-slot, as returned by (eyebrowse--get 'last-slot)."
PERSP is the perspective, and defaults to the current
perspective."
(or persp (setq persp (persp-curr)))
(let ((param-names '(eyepersp-eyebrowse-window-configs (let ((param-names '(eyepersp-eyebrowse-window-configs
eyepersp-eyebrowse-current-slot eyepersp-eyebrowse-current-slot
eyepersp-eyebrowse-last-slot))) eyepersp-eyebrowse-last-slot)))
(--zip-with (eyepersp/set-persp-parameter it other persp) (--zip-with (eyepersp/set-persp-parameter it other)
param-names workspace-params))) param-names workspace-params)))
(defun eyepersp/load-eyebrowse-for-perspective () (defun eyepersp/load-eyebrowse-for-perspective ()
@ -113,8 +107,7 @@ If the perspective doesn't have a workspace, create one."
FRAME defaults to the current frame." FRAME defaults to the current frame."
(eyepersp/set-persp-workspace (list (eyebrowse--get 'window-configs) (eyepersp/set-persp-workspace (list (eyebrowse--get 'window-configs)
(eyebrowse--get 'current-slot) (eyebrowse--get 'current-slot)
(eyebrowse--get 'last-slot)) (eyebrowse--get 'last-slot))))
(persp-curr)))
(add-hook 'persp-before-switch-hook (add-hook 'persp-before-switch-hook
#'eyepersp/update-eyebrowse-for-perspective) #'eyepersp/update-eyebrowse-for-perspective)
@ -123,7 +116,7 @@ FRAME defaults to the current frame."
(add-hook 'persp-activated-hook (add-hook 'persp-activated-hook
#'eyepersp/load-eyebrowse-for-perspective) #'eyepersp/load-eyebrowse-for-perspective)
(add-hook 'persp-killed-hook (add-hook 'persp-killed-hook
(lambda () (eyepersp/delete-persp-parameters (persp-curr)))) #'eyepersp/delete-persp-parameters)
(provide 'eyepersp) (provide 'eyepersp)
;;; eyepersp.el ends here ;;; eyepersp.el ends here