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

Put all zoom-window state into a struct

Browse Source
This commit is contained in:
Wojciech Kozlowski 2019-12-19 00:14:49 +01:00
parent 72287e343a
commit 2ffd794ce3
2 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
external/zoom-window.el vendored
View File

@ -33,68 +33,59 @@
"Zoom window like tmux" "Zoom window like tmux"
:group 'windows) :group 'windows)
(defcustom zoom-window-mode-line-color "green" (defcustom zoom-window-mode-line-bg (face-background 'mode-line)
"Color of mode-line when zoom-window is enabled." "The face of the modeline when zoom-window is enabled."
:type 'string) :type 'string)
(defvar zoom-window--control-block nil) (cl-defstruct zoom-window-
(defvar zoom-window--window-configuration (make-hash-table :test #'equal)) (enabled nil)
(defvar zoom-window--orig-color nil) (mode-line-bg (face-background 'mode-line))
(buffers nil)
(window-configuration nil))
(defvar zoom-window--cb (make-zoom-window-))
(defun zoom-window--save-mode-line-color () (defun zoom-window--save-mode-line-color ()
"Save the original mode line color." "Save the original mode line color."
(setq zoom-window--orig-color (face-background 'mode-line))) (setf (zoom-window--mode-line-bg zoom-window--cb)
(face-background 'mode-line)))
(defun zoom-window--save-buffers () (defun zoom-window--save-buffers ()
"Save the current buffer list." "Save the current buffer list."
(let ((buffers (cl-loop for window in (window-list) (let ((buffers (cl-loop for window in (window-list)
collect (window-buffer window)))) collect (window-buffer window))))
(set-frame-parameter (window-frame nil) 'zoom-window-buffers buffers))) (setf (zoom-window--buffers zoom-window--cb) buffers)))
(defun zoom-window--get-buffers () (defun zoom-window--get-buffers ()
"Get the saved buffer list." "Get the saved buffer list."
(frame-parameter (window-frame nil) 'zoom-window-buffers)) (zoom-window--buffers zoom-window--cb))
(defun zoom-window--restore-mode-line-face () (defun zoom-window--restore-mode-line-face ()
"Restore the original mode line face." "Restore the original mode line face."
(let ((color zoom-window--orig-color)) (set-face-background 'mode-line (zoom-window--mode-line-bg zoom-window--cb)))
(set-face-background 'mode-line color (window-frame nil))))
(defun zoom-window--configuration-key ()
"Get the window configuration key."
(let ((parent-id (frame-parameter (window-frame nil) 'parent-id)))
(if (not parent-id)
:zoom-window ;; not support multiple frame
(format ":zoom-window-%d" parent-id))))
(defun zoom-window--save-window-configuration () (defun zoom-window--save-window-configuration ()
"Save the window configuration." "Save the window configuration."
(let ((key (zoom-window--configuration-key)) (setf (zoom-window--window-configuration zoom-window--cb)
(window-conf (list (current-window-configuration) (point-marker)))) (list (current-window-configuration) (point-marker))))
(puthash key window-conf zoom-window--window-configuration)))
(defun zoom-window--restore-window-configuration () (defun zoom-window--restore-window-configuration ()
"Restore the window configuration." "Restore the window configuration."
(let* ((key (zoom-window--configuration-key)) (let* ((window-context (zoom-window--window-configuration zoom-window--cb)))
(window-context (gethash key zoom-window--window-configuration 'not-found)))
(when (eq window-context 'not-found)
(error "Window configuration is not found"))
(let ((window-conf (cl-first window-context)) (let ((window-conf (cl-first window-context))
(marker (cl-second window-context))) (marker (cl-second window-context)))
(set-window-configuration window-conf) (set-window-configuration window-conf)
(when (marker-buffer marker) (when (marker-buffer marker)
(goto-char marker)) (goto-char marker))
(remhash key zoom-window--window-configuration)))) (setf (zoom-window--window-configuration zoom-window--cb) nil))))
(defun zoom-window--toggle-enabled () (defun zoom-window--toggle-enabled ()
"Toggle the enabled flag." "Toggle the enabled flag."
(let* ((curframe (window-frame nil)) (let ((status (zoom-window--enabled zoom-window--cb)))
(status (frame-parameter curframe 'zoom-window-enabled))) (setf (zoom-window--enabled zoom-window--cb) (not status))))
(set-frame-parameter curframe 'zoom-window-enabled (not status))))
(defun zoom-window--enable-p () (defun zoom-window--enable-p ()
"Return t if zoom is enabled." "Return t if zoom is enabled."
(frame-parameter (window-frame nil) 'zoom-window-enabled)) (zoom-window--enabled zoom-window--cb))
(defsubst zoom-window--goto-line (line) (defsubst zoom-window--goto-line (line)
"Go to the given LINE in the current buffer." "Go to the given LINE in the current buffer."
@ -113,22 +104,25 @@
(zoom-window--goto-line current-line) (zoom-window--goto-line current-line)
(move-to-column current-column))) (move-to-column current-column)))
(defun zoom-window--do-zoom ()
"Zoom window."
(zoom-window--save-mode-line-color)
(zoom-window--save-buffers)
(zoom-window--save-window-configuration)
(delete-other-windows)
(set-face-background 'mode-line zoom-window-mode-line-bg))
;;;###autoload ;;;###autoload
(defun zoom-window-zoom () (defun zoom-window-zoom ()
"Zoom/un-zoom window." "Zoom/un-zoom window."
(interactive) (interactive)
(let ((enabled (zoom-window--enable-p)) (let ((enabled (zoom-window--enable-p)))
(curframe (window-frame nil)))
(if (and (one-window-p) (not enabled)) (if (and (one-window-p) (not enabled))
(message "There is only one window!!") (message "There is only one window!!")
(if enabled (if enabled
(with-demoted-errors "Warning: %S" (with-demoted-errors "Warning: %S"
(zoom-window--do-unzoom)) (zoom-window--do-unzoom))
(zoom-window--save-mode-line-color) (zoom-window--do-zoom))
(zoom-window--save-buffers)
(zoom-window--save-window-configuration)
(delete-other-windows)
(set-face-background 'mode-line zoom-window-mode-line-color curframe))
(force-mode-line-update) (force-mode-line-update)
(zoom-window--toggle-enabled)))) (zoom-window--toggle-enabled))))

7
themes/havoc-common.el
View File

@ -192,9 +192,14 @@
;; --------------------------------------------------------------------- ;; ---------------------------------------------------------------------
`(header-line ((t (:background ,*line-header-bg* :foreground ,*line-active-fg*)))) `(header-line ((t (:background ,*line-header-bg* :foreground ,*line-active-fg*))))
;; ---------------------------------------------------------------------
;; Zoom window.
;; ---------------------------------------------------------------------
`(zoom-window-mode-line ((t (:background ,*zoom-window-bg*))))
) )
(setq zoom-window-mode-line-color *zoom-window-bg*) (setq zoom-window-mode-line-bg *zoom-window-bg*)
) )