The user can open the calendar directly, with `M-x cfw:open-calendar-buffer`, which sidesteps the workspace init logic in =calendar. This fixes +calendar/quit so it can deal with this use case. Mentioned in #4019
63 lines
1.8 KiB
EmacsLisp
63 lines
1.8 KiB
EmacsLisp
;;; app/calendar/autoload.el -*- lexical-binding: t; -*-
|
|
|
|
(defvar +calendar--wconf nil)
|
|
|
|
(defun +calendar--init ()
|
|
(if-let (win (cl-find-if (lambda (b) (string-match-p "^\\*cfw:" (buffer-name b)))
|
|
(doom-visible-windows)
|
|
:key #'window-buffer))
|
|
(select-window win)
|
|
(call-interactively +calendar-open-function)))
|
|
|
|
;;;###autoload
|
|
(defun =calendar ()
|
|
"Activate (or switch to) `calendar' in its workspace."
|
|
(interactive)
|
|
(if (featurep! :ui workspaces)
|
|
(progn
|
|
(+workspace-switch "Calendar" t)
|
|
(doom/switch-to-scratch-buffer)
|
|
(+calendar--init)
|
|
(+workspace/display))
|
|
(setq +calendar--wconf (current-window-configuration))
|
|
(delete-other-windows)
|
|
(switch-to-buffer (doom-fallback-buffer))
|
|
(+calendar--init)))
|
|
|
|
;;;###autoload
|
|
(defun +calendar/quit ()
|
|
"TODO"
|
|
(interactive)
|
|
(if (featurep! :ui workspaces)
|
|
(when (+workspace-exists-p "Calendar")
|
|
(+workspace/delete "Calendar"))
|
|
(when (window-configuration-p +calendar--wconf)
|
|
(set-window-configuration +calendar--wconf))
|
|
(setq +calendar--wconf nil))
|
|
(doom-kill-matching-buffers "^\\*cfw[:-]"))
|
|
|
|
;;;###autoload
|
|
(defun +calendar/open-calendar ()
|
|
"TODO"
|
|
(interactive)
|
|
(cfw:open-calendar-buffer
|
|
;; :custom-map cfw:my-cal-map
|
|
:contents-sources
|
|
(list
|
|
(cfw:org-create-source (face-foreground 'default)) ; orgmode source
|
|
)))
|
|
|
|
;;;###autoload
|
|
(defun +calendar-cfw:render-button-a (title command &optional state)
|
|
"render-button
|
|
TITLE
|
|
COMMAND
|
|
STATE"
|
|
(let ((text (concat " " title " "))
|
|
(keymap (make-sparse-keymap)))
|
|
(cfw:rt text (if state 'cfw:face-toolbar-button-on
|
|
'cfw:face-toolbar-button-off))
|
|
(define-key keymap [mouse-1] command)
|
|
(cfw:tp text 'keymap keymap)
|
|
(cfw:tp text 'mouse-face 'highlight)
|
|
text))
|