diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-05-27 09:53:05 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-05-27 09:53:05 +0000 |
| commit | ef4dc4bb7c015536c7e994c8f27e26ff72e0ff8f (patch) | |
| tree | e0cf3da7a8f0b84051d7a5b2ecc3e9042581f188 | |
| parent | readme: add OSC 8, 17, 19, 117, 119 and 777 to list of supported OSC (diff) | |
| parent | config: notify: change default value to use ${app-id} (diff) | |
Merge branch 'app-id-in-notify'
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | config.c | 2 | ||||
| -rw-r--r-- | doc/foot.ini.5.scd | 2 | ||||
| -rw-r--r-- | foot.ini | 2 | ||||
| -rw-r--r-- | notify.c | 6 |
5 files changed, 8 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f15f47d4..539e2f25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -84,6 +84,8 @@ * `ctrl + w` (_extend-to-word-boundary_) can now be used across lines (https://codeberg.org/dnkl/foot/issues/421). * Ignore auto-detected URLs that overlap with OSC-8 URLs. +* Default value for the `notify` option to use `-a ${app-id} -i + ${app-id} ...` instead of `-a foot -i foot ...`. ### Deprecated @@ -2574,7 +2574,7 @@ config_load(struct config *conf, const char *conf_path, } conf->notify.raw_cmd = xstrdup( - "notify-send -a foot -i foot ${title} ${body}"); + "notify-send -a ${app-id} -i ${app-id} ${title} ${body}"); tokenize_cmdline(conf->notify.raw_cmd, &conf->notify.argv); conf->url.launch.raw_cmd = xstrdup("xdg-open ${url}"); diff --git a/doc/foot.ini.5.scd b/doc/foot.ini.5.scd index 50ddb787..534f3e58 100644 --- a/doc/foot.ini.5.scd +++ b/doc/foot.ini.5.scd @@ -228,7 +228,7 @@ in this order: Notifications are *inhibited* if the foot window has keyboard focus. - Default: _notify-send -a foot -i foot ${title} ${body}_. + Default: _notify-send -a ${app-id} -i ${app-id} ${title} ${body}_. *selection-target* Clipboard target to automatically copy selected text to. One of @@ -21,7 +21,7 @@ # pad=2x2 # optionally append 'center' # resize-delay-ms=100 -# notify=notify-send -a foot -i foot ${title} ${body} +# notify=notify-send -a ${app-id} -i ${app-id} ${title} ${body} # bold-text-in-bright=no # bell=none @@ -34,9 +34,9 @@ notify_notify(const struct terminal *term, const char *title, const char *body) size_t argc = 0; if (!spawn_expand_template( - &term->conf->notify, 2, - (const char *[]){"title", "body"}, - (const char *[]){title, body}, + &term->conf->notify, 3, + (const char *[]){"app-id", "title", "body"}, + (const char *[]){term->conf->app_id, title, body}, &argc, &argv)) { return; |
