Merge branch 'main' into main

We now default to using `~/.cache/waybar-current-task.json` if the `xdg` package is not present.

README.md

@@ -10,6 +10,27 @@ You can set the file to be written by customizing `org-clock-waybar-filename`; i
 `$XDG_CACHE_HOME/waybar-current-task.json` (`$XDG_CACHE_HOME` defaults to `$HOME/.cache` on XDG
 compatible systems, like Linux.)
 
+### Quelpa
+
+If you only have [`quelpa`](https://github.com/quelpa/quelpa) installed:
+
+```elisp
+(quelpa
+ '(org-clock-waybar
+   :fetcher git
+   :url "https://gitea.polonkai.eu/gergely/org-clock-waybar.git"))
+```
+
+or, if you have [`quelpa-use-package`](https://github.com/quelpa/quelpa-use-package) installed,
+too:
+
+```elisp
+(quelpa-use-package org-clock-waybar
+  :quelpa (org-clock-waybar
+           :fetcher git
+           :url "https://gitea.polonkai.eu/gergely/org-clock-waybar.git"))
+```
+
 ## Waybar configuration
 
 To add the current task to Waybar, add this snippet to your config:

org-clock-waybar.el

@@ -1,4 +1,4 @@
-;;; org-clock-waybar --- Summary
+;;; org-clock-waybar.el --- Summary
 
 ;; Copyright (C) 2021 Gergely Polonkai
 
@@ -38,7 +38,7 @@
 
 ;;; Code:
 
-(require 'xdg)
+(require 'xdg nil t)
 (require 'json)
 (require 'org-clock)
 
@@ -47,7 +47,9 @@
   :group 'emacs)
 
 (defcustom org-clock-waybar-filename
-  (expand-file-name "waybar-current-task.json" (xdg-cache-home))
+  (if (fboundp 'xdg-cache-home)
+      (expand-file-name "waybar-current-task.json" (xdg-cache-home))
+    (expand-file-name "~/.cache/waybar-current-task.json"))
   "Name of the file to save task data to."
   :type 'string
   :group 'org-clock-waybar)
@@ -84,9 +86,9 @@
 (defun org-clock-waybar--get-tags ()
   "Get the tags of the currently clocked-in task."
   (when (org-clocking-p)
-    (save-window-excursion
+    (or (org-with-point-at org-clock-marker (org-get-tags))
-      (org-clock-goto)
+        "")
-      (org-get-tags))))
+    ))
 
 (defun org-clock-waybar--get-clocked-task-json ()
   "Get the currently clocked-in task’s data as a stringified JSON object.
@@ -94,8 +96,8 @@
 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
 value of `org-clock-waybar-not-clocked-in-text'."
-  (let* ((category (org-clock-waybar--get-task-title))
+  (let* ((category (org-clock-waybar--get-task-category))
-         (title (org-clock-waybar--get-task-category))
+         (title (org-clock-waybar--get-task-title))
          (tooltip (org-clock-waybar--get-tooltip))
          (output (json-new-object)))
     (setq output (json-add-to-object
@@ -122,13 +124,18 @@ value of `org-clock-waybar-not-clocked-in-text'."
 This function is ought to be used via Emacsclient:
 
 emacsclient --eval '(org-clock-waybar-output-task)'"
-  (org-clock-waybar--get-clocked-task-json))
+  (let* ((output (org-clock-waybar--get-clocked-task-json))
+         (start 0)
+         (end (length output)))
+    (set-text-properties start end nil output)
+    output))
 
 (defun org-clock-waybar-setup ()
   "Setup org-clock-waybar.
 
 It adds `org-clock-waybar-save-task' to both `org-clock-in-hook' and
 `org-clock-out-hook'."
+  (add-hook 'org-clock-cancel-hook #'org-clock-waybar-save-task)
   (add-hook 'org-clock-in-hook #'org-clock-waybar-save-task)
   (add-hook 'org-clock-out-hook #'org-clock-waybar-save-task)
   (add-hook 'kill-emacs-hook #'org-clock-waybar-save-task))