Configurable output 2 #12

Merged
gergely merged 4 commits from Cadair/org-clock-waybar:configurable-output into main 2026-02-04 14:53:02 +01:00
Showing only changes of commit 17b05377b9 - Show all commits

View File

@@ -148,24 +148,24 @@ When nil, the percentage text will be an empty string."
The output is in JSON format constructed in a way so Waybar can process it. The output is in JSON format constructed in a way so Waybar can process it.
If there is no clocked in task, alt becomes empty and text will be set to the If there is no clocked in task, alt becomes empty and text will be set to the
value of `org-clock-waybar-not-clocked-in-text'." value of `org-clock-waybar-not-clocked-in-text'."
(let* ((text-func (or 'org-clock-waybar-text-function (let* ((text-func (or (and (fboundp ('org-clock-waybar-text-function)))
'org-clock-waybar-get-task-title)) #'org-clock-waybar-get-task-title))
(text (funcall text-func)) (text (funcall text-func))
(alt-func (or 'org-clock-waybar-alt-function (alt-func (or (and (fboundp ('org-clock-waybar-alt-function)))
'org-clock-waybar-get-task-category)) #'org-clock-waybar-get-task-category))
(alt (funcall alt-func)) (alt (funcall alt-func))
(tooltip-func (or 'org-clock-waybar-tooltip-function (tooltip-func (or (and (fboundp ('org-clock-waybar-tooltip-function)))
'org-clock-waybar-get-tooltip)) #'org-clock-waybar-get-tooltip))
(tooltip (funcall tooltip-func)) (tooltip (funcall tooltip-func))
(class-func (or 'org-clock-waybar-class-function (class-func (or (and (fboundp ('org-clock-waybar-class-function)))
'org-clock-waybar-get-tags)) #'org-clock-waybar-get-tags))
(class (funcall class-func)) (class (funcall class-func))
(percentage (when (fboundp 'org-clock-waybar-percentage-function) (percentage (when (fboundp 'org-clock-waybar-percentage-function)
(funcall 'org-clock-waybar-percentage-function))) (funcall #'org-clock-waybar-percentage-function)))
(output (json-new-object))) (output (json-new-object)))
(or (null title) (or (null text)
(stringp title) (stringp text)
(error "Title must be a string (org-clock-waybar)!")) (error "Text must be a string (org-clock-waybar)!"))
(or (null alt) (or (null alt)
(stringp alt) (stringp alt)
(error "Alt text must be a string (org-clock-waybar)!")) (error "Alt text must be a string (org-clock-waybar)!"))