Solve merge with master

Author: bynect

.github/workflows/main.yml

@@ -32,6 +32,7 @@ jobs:
           - fedora
           - ubuntu-focal
           - ubuntu-jammy
+          - ubuntu-noble
 
     env:
       CC: ${{ matrix.CC }}
@@ -59,7 +60,7 @@ jobs:
         run: ./test/test-install.sh
 
       - name: valgrind memleaks
-        run: make -j clean test-valgrind
+        run: make clean && make -j test-valgrind
 
     runs-on: ubuntu-latest
     container:
@@ -83,7 +84,7 @@ jobs:
         run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
 
       - name: coverage
-        run: make clean test-coverage
+        run: make clean && make -j test-coverage
 
       - name: Generate coverage report
         run: lcov -c -d . -o lcov.info

.valgrind.suppressions

@@ -179,3 +179,18 @@
    fun:notification_load_icon_with_scaling
    ...
 }
+
+{
+   # Something new on Ubuntu Noble Numbat
+   rsvg_conditional_jump-ubuntu_focal
+   Memcheck:Cond
+   obj:/usr/lib/*/librsvg-2.so.2.50.0
+   ...
+   fun:rsvg_handle_new
+   obj:/usr/lib/*/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.so
+   obj:/usr/lib/*/libgdk_pixbuf-2.0.so.0.4200.10
+   fun:gdk_pixbuf_new_from_file
+   fun:notification_setup_raw_image
+   fun:notification_load_icon_with_scaling
+   ...
+}

CHANGELOG.md

@@ -1,5 +1,34 @@
 # Dunst changelog
 
+## 1.12.0 -- 2024-11-30
+
+### Added
+- Export rules via dbus with `dunstctl rules [--json]` (#1212)
+- Added checks and messages for missing DBUS\_SESSION\_BUS\_ADDRESS (#1389)
+- Add `-e/--exit` flag to `dunstctl is-paused` to exit with 1 when paused (#1378)
+- Add color gradients for the progress bar (by providing a list of colors instead of one) (#1370)
+- Use TESTDIR env var as the base for the test program (#1376)
+- Add `dunstctl reload` to hot reload the configuration (#1350)
+- Add an optional id to `dunstctl close` (#1351)
+- Print compile-time options in `dunst --version` (#1336)
+
+### Changed
+- BREAKING: Implement dynamic height (changes the the `height` setting, see manual) (#1342)
+- Change the preferred syntax of `offset` from `NxN` to `(N,N)` (#1330)
+- Install the systemd service file in the session.slice (#1397)
+- Open url with `dunstctl action` if no action is present (#1345,#1395)
+- Remove default icons (now no icons are hard-coded) (#1365,#1358)
+- Various updates to documentation and test suite
+
+### Fixed
+- Order of context menu was reversed (#1394,#1375)
+- Resolve ~ and $HOME in `icon_path` (#1383,#1371)
+- Fix broken link to freedesktop's notification specs in man page (#1381)
+- Remove the message about shortcuts deprecation (#1353)
+- Fix vertical padding behaviour (#1342)
+- Fix bash completion (#1347)
+- Fix file suffix for fish completions during installation (#1339)
+
 ## 1.11.0 -- 2024-04-15
 
 ### Added

Makefile

@@ -3,7 +3,7 @@
 
 include config.mk
 
-VERSION := "1.11.0-non-git"
+VERSION := "1.12.0-non-git"
 ifneq ($(wildcard ./.git/),)
 VERSION := $(shell ${GIT} describe --tags 2>/dev/null || echo ${VERSION})
 endif
@@ -29,14 +29,20 @@ endif
 
 SYSCONF_FORCE_NEW ?= $(shell [ -f ${DESTDIR}${SYSCONFFILE} ] || echo 1)
 
-CFLAGS  := ${DEFAULT_CPPFLAGS} ${CPPFLAGS} ${DEFAULT_CFLAGS} ${CFLAGS} ${INCS} -MMD -MP
-LDFLAGS := ${DEFAULT_LDFLAGS} ${LDFLAGS} ${LIBS}
+ifneq (0,${DUNSTIFY})
+DUNSTIFY_CFLAGS  := ${DEFAULT_CFLAGS} ${CFLAGS} ${CPPFLAGS} $(shell $(PKG_CONFIG) --cflags libnotify)
+DUNSTIFY_LDFLAGS := ${DEFAULT_LDFLAGS} ${LDFLAGS} $(shell $(PKG_CONFIG) --libs libnotify)
+endif
+
+CPPFLAGS := ${DEFAULT_CPPFLAGS} ${CPPFLAGS}
+CFLAGS   := ${DEFAULT_CFLAGS} ${CFLAGS} ${INCS} -MMD -MP
+LDFLAGS  := ${DEFAULT_LDFLAGS} ${LDFLAGS} ${LIBS}
 
 SRC := $(sort $(shell ${FIND} src/ ! \( -path src/wayland -prune -o -path src/x11 -prune \) -name '*.c'))
 
 ifneq (0,${WAYLAND})
 # with Wayland support
-CFLAGS += -DHAVE_WL_CURSOR_SHAPE -DHAVE_WL_EXT_IDLE_NOTIFY
+CPPFLAGS += -DHAVE_WL_CURSOR_SHAPE -DHAVE_WL_EXT_IDLE_NOTIFY
 SRC += $(sort $(shell ${FIND} src/wayland -name '*.c'))
 endif
 
@@ -59,35 +65,39 @@ DEPS := ${SRC:.c=.d} ${TEST_SRC:.c=.d}
 .PHONY: all debug
 all: doc dunst service
 
-debug: CFLAGS   += ${CPPFLAGS_DEBUG} ${CFLAGS_DEBUG}
-debug: LDFLAGS  += ${LDFLAGS_DEBUG}
 debug: CPPFLAGS += ${CPPFLAGS_DEBUG}
+debug: CFLAGS   += ${CFLAGS_DEBUG}
+debug: LDFLAGS  += ${LDFLAGS_DEBUG}
 debug: all
 
 -include $(DEPS)
 
 ${OBJ} ${TEST_OBJ}: Makefile config.mk
 
+src/dunst.o: src/dunst.c
+	${CC} -o $@ -c $< ${CPPFLAGS} ${CFLAGS} \
+		-D_CCDATE="$(shell date '+%Y-%m-%d')" -D_CFLAGS="$(filter-out $(filter -I%,${INCS}),${CFLAGS})" -D_LDFLAGS="${LDFLAGS}"
+
 %.o: %.c
-	${CC} -o $@ -c $< ${CFLAGS}
+	${CC} -o $@ -c $< ${CPPFLAGS} ${CFLAGS}
 
 dunst: ${OBJ} main.o
 	${CC} -o ${@} ${OBJ} main.o ${CFLAGS} ${LDFLAGS}
 
 ifneq (0,${DUNSTIFY})
 all: dunstify
 dunstify: dunstify.o
-	${CC} -o ${@} dunstify.o ${CFLAGS} ${LDFLAGS}
+	${CC} -o ${@} dunstify.o ${DUNSTIFY_CFLAGS} ${DUNSTIFY_LDFLAGS}
 endif
 
-.PHONY: test test-valgrind test-coverage
+.PHONY: test test-valgrind test-coverage functional-tests
 test: test/test clean-coverage-run
 	# Make sure an error code is returned when the test fails
 	/usr/bin/env bash -c 'set -euo pipefail;\
-	./test/test -v | ./test/greenest.awk '
+	TESTDIR=./test ./test/test -v | ./test/greenest.awk '
 
 test-valgrind: test/test
-	${VALGRIND} \
+	TESTDIR=./test ${VALGRIND} \
 		--suppressions=.valgrind.suppressions \
 		--track-origins=yes \
 		--leak-check=full \
@@ -110,13 +120,16 @@ test-coverage-report: test-coverage
 		-o docs/internal/coverage/index.html
 
 test/%.o: test/%.c src/%.c
-	${CC} -o $@ -c $< ${CFLAGS}
+	${CC} -o $@ -c $< ${CFLAGS} ${CPPFLAGS}
 
 test/test: ${OBJ} ${TEST_OBJ}
 	${CC} -o ${@} ${TEST_OBJ} $(filter-out ${TEST_OBJ:test/%=src/%},${OBJ}) ${CFLAGS} ${LDFLAGS}
 
+functional-tests: dunst dunstify
+	PREFIX=. ./test/functional-tests/test.sh
+
 .PHONY: doc doc-doxygen
-doc: docs/dunst.1 docs/dunst.5 docs/dunstctl.1
+doc: docs/dunst.1 docs/dunst.5 docs/dunstctl.1 docs/dunstify.1
 
 # Can't dedup this as we need to explicitly provide the name and title text to
 # pod2man :(
@@ -126,6 +139,8 @@ docs/dunst.5: docs/dunst.5.pod
 	${POD2MAN} --name=dunst -c "Dunst Reference" --section=5 --release=${VERSION} $< > $@
 docs/dunstctl.1: docs/dunstctl.pod
 	${POD2MAN} --name=dunstctl -c "dunstctl reference" --section=1 --release=${VERSION} $< > $@
+docs/dunstify.1: docs/dunstify.pod
+	${POD2MAN} --name=dunstify -c "dunstify reference" --section=1 --release=${VERSION} $< > $@
 
 doc-doxygen:
 	${DOXYGEN} docs/internal/Doxyfile
@@ -183,6 +198,7 @@ clean-doc:
 	rm -f docs/dunst.1
 	rm -f docs/dunst.5
 	rm -f docs/dunstctl.1
+	rm -f docs/dunstify.1
 	rm -fr docs/internal/html
 	rm -fr docs/internal/coverage
 
@@ -204,14 +220,15 @@ clean-wayland-protocols:
         install-service install-service-dbus install-service-systemd \
         uninstall uninstall-dunstctl uninstall-dunstrc \
         uninstall-service uninstall-service-dbus uninstall-service-systemd \
-	uninstall-keepconf uninstall-purge
+        uninstall-keepconf uninstall-purge
 install: install-dunst install-dunstctl install-dunstrc install-service
 
 install-dunst: dunst doc
 	install -Dm755 dunst ${DESTDIR}${BINDIR}/dunst
 	install -Dm644 docs/dunst.1 ${DESTDIR}${MANPREFIX}/man1/dunst.1
 	install -Dm644 docs/dunst.5 ${DESTDIR}${MANPREFIX}/man5/dunst.5
 	install -Dm644 docs/dunstctl.1 ${DESTDIR}${MANPREFIX}/man1/dunstctl.1
+	install -Dm644 docs/dunstify.1 ${DESTDIR}${MANPREFIX}/man1/dunstify.1
 
 install-dunstctl: dunstctl
 	install -Dm755 dunstctl ${DESTDIR}${BINDIR}/dunstctl
@@ -243,13 +260,13 @@ install-completions:
 	install -Dm644 completions/dunstctl.bashcomp ${DESTDIR}${BASHCOMPLETIONDIR}/dunstctl
 	install -Dm644 completions/_dunst.zshcomp ${DESTDIR}${ZSHCOMPLETIONDIR}/_dunst
 	install -Dm644 completions/_dunstctl.zshcomp ${DESTDIR}${ZSHCOMPLETIONDIR}/_dunstctl
-	install -Dm644 completions/dunst.fishcomp ${DESTDIR}${FISHCOMPLETIONDIR}/dunst
-	install -Dm644 completions/dunstctl.fishcomp ${DESTDIR}${FISHCOMPLETIONDIR}/dunstctl
+	install -Dm644 completions/dunst.fishcomp ${DESTDIR}${FISHCOMPLETIONDIR}/dunst.fish
+	install -Dm644 completions/dunstctl.fishcomp ${DESTDIR}${FISHCOMPLETIONDIR}/dunstctl.fish
 
 ifneq (0,${DUNSTIFY})
 install: install-completions-dunstify
 install-completions-dunstify:
-	install -Dm644 completions/dunstify.fishcomp ${DESTDIR}${FISHCOMPLETIONDIR}/dunstify
+	install -Dm644 completions/dunstify.fishcomp ${DESTDIR}${FISHCOMPLETIONDIR}/dunstify.fish
 endif
 endif
 
@@ -261,6 +278,7 @@ uninstall-keepconf: uninstall-service uninstall-dunstctl uninstall-completions
 	rm -f ${DESTDIR}${MANPREFIX}/man1/dunst.1
 	rm -f ${DESTDIR}${MANPREFIX}/man5/dunst.5
 	rm -f ${DESTDIR}${MANPREFIX}/man1/dunstctl.1
+	rm -f ${DESTDIR}${MANPREFIX}/man1/dunstify.1
 
 uninstall-dunstrc:
 	rm -f ${DESTDIR}${SYSCONFFILE}
@@ -284,6 +302,6 @@ uninstall-completions:
 	rm -f ${DESTDIR}${BASHCOMPLETIONDIR}/dunstctl
 	rm -f ${DESTDIR}${ZSHCOMPLETIONDIR}/_dunst
 	rm -f ${DESTDIR}${ZSHCOMPLETIONDIR}/_dunstctl
-	rm -f ${DESTDIR}${FISHCOMPLETIONDIR}/dunst
-	rm -f ${DESTDIR}${FISHCOMPLETIONDIR}/dunstctl
-	rm -f ${DESTDIR}${FISHCOMPLETIONDIR}/dunstify
+	rm -f ${DESTDIR}${FISHCOMPLETIONDIR}/dunst.fish
+	rm -f ${DESTDIR}${FISHCOMPLETIONDIR}/dunstctl.fish
+	rm -f ${DESTDIR}${FISHCOMPLETIONDIR}/dunstify.fish

README.md

@@ -90,10 +90,13 @@ distro's repositories, don't worry, it's not hard to build it yourself.
 - libxss
 - glib
 - pango/cairo
+- gdk-pixbuf
 - libnotify (can build without, for dunstify, see [make parameters](#make-parameters))
 - wayland-client (can build without, see [make parameters](#make-parameters))
 - wayland-protocols (optional, for recompiling protocols)
 - xdg-utils (optional, xdg-open is the default 'browser' for opening URLs)
+- jq (optional, for installed completions and tools in contrib)
+- busctl (optional, for dunstctl rules and dunstctl history)
 
 The names will be different depending on your [distribution](https://github.com/dunst-project/dunst/wiki/Dependencies).
 

RELEASE_NOTES

@@ -1,3 +1,35 @@
+===================================================================================
+Release Notes For v1.12.0
+===================================================================================
+
+There have been many important contributions in the last few months.
+Some notable changes are: adding hot-reload for the configuration, exporting
+rules via dunstctl, adding color gradients, removing default hard-coded icons.
+For detailed information consult the changelog.
+
+Important notice for all users:
+
+The behaviour of the setting `height` has been changed in a breaking way.
+Before you could specify a single value that would be used as the max height
+of a notification. In this release the dynamic height was implemented to make
+this settings behave more similarly to `width`.
+Now the values accepted are either a single number (for a *fixed height*) or
+a tuple of numbers (for a min/max range).
+
+The way of specifying a maximum height before was:
+    height = 300
+
+The equivalent way now is:
+    height = (0, 300)
+
+Furthermore the preferred syntax for the `offset` settings has been changed
+from NxN to (N,N). The old syntax is supported nevertheless.
+
+If you are a maintainer it would be helpful to include the message above when
+an user updates from an older version of dunst.
+
+Take a look at the changelog for all the bug fixes and improvements.
+
 ===================================================================================
 Release Notes For v1.11.0
 ===================================================================================

completions/_dunstctl.zshcomp

@@ -1,13 +1,11 @@
 #compdef _dunstctl dunstctl
 
-# ZSH arguments completion script for the dunstctl commnd
+# ZSH arguments completion script for the dunstctl command
 # Depends on: gAWK (rule), jq (history-pop)
 
 local curcontext="$curcontext" ret=1
 local -a state line subs
 
-local DUNSTRC="${XDG_CONFIG_HOME:-$HOME/.config}/dunst/dunstrc"
-
 _arguments -C \
   '1:cmd:->cmds' \
   '2:opt:->opts' \
@@ -19,19 +17,21 @@ case $state in
     local -a commands
     commands=(
       'action:Perform the default action, or open the context menu of the notification at the given position'
-      'close:Close the last notification'
-      'close-all:Close the all notifications'
+      'close:Close the last notification or optionally the notification with given ID'
+      'close-all:Close all the notifications'
       'context:Open context menu'
       'count:Show the number of notifications'
       'history:Display notification history (in JSON)'
-      'history-pop:Pop the latest notification from history or optionally the notification with given ID.'
-      'is-paused:Check if dunst is running or paused'
+      'history-pop:Pop the latest notification from history or optionally the notification with given ID'
+      'is-paused:Check if pause level is greater than 0'
       'set-paused:Set the pause status'
-      'get-pause-level:Get current dunst's pause level'
-      'set-pause-level:Set current dunst's pause level'
+      'get-pause-level:Get the current pause level'
+      'set-pause-level:Set the pause level'
       'rule:Enable or disable a rule by its name'
+      'rules:Displays configured rules'
+      'reload:Reload the settings of the running instance, optionally with specific configuration files'
       'debug:Print debugging information'
-      'help:Show this help'
+      'help:Show help'
     )
     _describe commands commands && ret=0
     ;;
@@ -63,7 +63,7 @@ case $state in
       rule)
         local -a rules;
         rules=(
-          `awk '/^\[.*\]/{ if ( match($0, /^\[global|urgency|experimental/) == 0 ) { print substr($0, 2, length($0)-2) }   }' < "$DUNSTRC"`
+          `dunstctl rules --json | jq -r '.data[][].name.data'`
         )
         _describe rules_opts rules && ret=0
         ;;

completions/dunst.bashcomp

@@ -5,7 +5,7 @@ _dunst() {
     opts='-v -version --version -verbosity -conf -config -print --print -startup_notification --startup_notification -h -help --help' 
 
     case "$prev" in
-        -verbosity) COMPREPLY=("crit" "warn" "mesg" "info" "debug") 
+        -verbosity) COMPREPLY=( $( compgen -W 'crit warn mesg info debug' -- "$cur") ) 
             return ;;
         -conf|--config) _filedir
             return ;;

completions/dunstctl.bashcomp

@@ -1,27 +1,27 @@
 _dunstctl() {
-    local opts cur prev split=false
-    local DUNSTRC=${XDG_CONFIG_HOME:-$HOME/.config}/dunst/dunstrc
+    local opts cur prev
     _get_comp_words_by_ref cur prev
     COMPREPLY=()
-    opts='action close close-all context count debug help history history-clear history-pop history-rm is-paused rule set-paused'
+    opts='action close close-all context count debug help history history-clear history-pop history-rm is-paused rule rules set-paused get-pause-level set-pause-level reload'
 
     case "$prev" in
-        count) COMPREPLY=('displayed' 'history' 'waiting')
+        count) COMPREPLY=( $( compgen -W 'displayed history waiting' -- "$cur" ) )
             return ;;
-        set-paused) COMPREPLY=('true' 'false' 'toggle')
+        set-paused) COMPREPLY=( $( compgen -W 'true false toggle' -- "$cur" ) )
             return ;;
         history-pop|history-rm)
-            COMPREPLY=( $(dunstctl history | grep -A2 '"id" :' |
-                          awk '/"data" :/{print $3}' | sort -u) )
+            COMPREPLY=( $( compgen -W "$(dunstctl history | jq -r '.data[][].id.data')" -- "$cur" ) )
             return ;;
         rule)
-            COMPREPLY=( $(awk \
-                '/^\[.*\]/{ if ( match($0, /^\[global|experimental/) == 0 ) print substr($0, 2, length($0)-2) }' "$DUNSTRC" ) )
+            COMPREPLY=( $( compgen -W "$(dunstctl rules --json | jq -r '.data[][].name.data')" -- "$cur" ) )
+            return ;;
+        rules)
+            COMPREPLY=( $( compgen -W "--json" -- "$cur" ) )
             return ;;
     esac
 
     case "${COMP_WORDS[1]}" in
-        rule) COMPREPLY=('enabled' 'disable' 'toggle')
+        rule) COMPREPLY=( $( compgen -W 'enable disable toggle' -- "$cur" ) )
             return ;;
     esac