summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/config.c3
-rw-r--r--src/main.c13
2 files changed, 5 insertions, 11 deletions
diff --git a/src/config.c b/src/config.c
index 8cb3763..47f964d 100644
--- a/src/config.c
+++ b/src/config.c
@@ -298,7 +298,8 @@ bool parse_option(struct tofi *tofi, const char *filename, size_t lineno, const
} else if (strcasecmp(option, "drun-launch") == 0) {
tofi->drun_launch = parse_bool(filename, lineno, value, &err);
} else if (strcasecmp(option, "drun-print-exec") == 0) {
- tofi->drun_print_exec = parse_bool(filename, lineno, value, &err);
+ log_warning("drun-print-exec is deprecated, as it is now always true.\n"
+ " This option may be removed in a future version of tofi.\n");
} else if (strcasecmp(option, "hint-font") == 0) {
tofi->window.entry.harfbuzz.disable_hinting = !parse_bool(filename, lineno, value, &err);
} else if (strcasecmp(option, "late-keyboard-init") == 0) {
diff --git a/src/main.c b/src/main.c
index c9f770b..be13a28 100644
--- a/src/main.c
+++ b/src/main.c
@@ -805,7 +805,8 @@ static void usage()
" --history <true|false> Sort results by number of usages.\n"
" --drun-launch <true|false> Launch apps directly in drun mode.\n"
" --drun-print-exec <true|false> Print a command line in drun mode.\n"
-" This will become the default in future.\n"
+" This is now always the case,\n"
+" and this option is deprecated.\n"
" --hint-font <true|false> Perform font hinting.\n"
" --late-keyboard-init (EXPERIMENTAL) Delay keyboard\n"
" initialisation until after the first\n"
@@ -954,16 +955,8 @@ static void do_submit(struct tofi *tofi)
}
if (tofi->drun_launch) {
drun_launch(res);
- } else if (tofi->drun_print_exec) {
- drun_print(res);
} else {
- log_warning("Using drun mode without --drun-print-exec=true is deprecated.\n"
- " In the next version of tofi, this will become the default behaviour,\n"
- " so fix your compositor configs now e.g. by replacing\n"
- " tofi-drun | xargs swaymsg exec gio launch\n"
- " with\n"
- " tofi-drun --drun-print-exec=true | xargs swaymsg exec --\n");
- printf("%s\n", res);
+ drun_print(res);
}
} else {
printf("%s\n", res);