From a08fba49d036432bfcb8a65a997d1f7c01417e95 Mon Sep 17 00:00:00 2001 From: Nikos Tsipinakis Date: Mon, 3 Jul 2017 07:34:53 +0300 Subject: [PATCH] Remove bounce setting Bounce was functionally removed in b2883b213342c912a76329bb8f6c179ea3451ae5 during the transition from Xft to Cairo without any mention. There is no use to keeping it in the example dunstrc and storing the value in the code, This commit will probably be reversed if and when bounce is re-implemented. --- config.def.h | 1 - dunstrc | 6 ------ src/settings.c | 6 ------ src/settings.h | 1 - test/functional-tests/dunstrc.default | 1 - test/functional-tests/dunstrc.ignore_newline | 1 - test/functional-tests/dunstrc.ignore_newline_no_wrap | 1 - test/functional-tests/dunstrc.markup | 1 - test/functional-tests/dunstrc.nomarkup | 1 - test/functional-tests/dunstrc.nowrap | 1 - test/functional-tests/dunstrc.run_script | 1 - test/functional-tests/dunstrc.show_age | 1 - 12 files changed, 22 deletions(-) diff --git a/config.def.h b/config.def.h index 5edd53b..97844d1 100644 --- a/config.def.h +++ b/config.def.h @@ -23,7 +23,6 @@ int indicate_hidden = true; /* show count of hidden messages */ int idle_threshold = 0; /* don't timeout notifications when idle for x seconds */ int show_age_threshold = -1; /* show age of notification, when notification is older than x seconds */ enum alignment align = left; /* text alignment [left/center/right] */ -float bounce_freq = 1; /* determines the bounce frequency (if activated) */ int sticky_history = true; int history_length = 20; /* max amount of notifications kept in history */ int show_indicators = true; diff --git a/dunstrc b/dunstrc index 81fcb1b..9477b18 100644 --- a/dunstrc +++ b/dunstrc @@ -82,12 +82,6 @@ # Set to 0 to disable. idle_threshold = 120 - # The frequency with which text that is longer than the notification - # window allows bounces back and forth. - # This option conflicts with "word_wrap". - # Set to 0 to disable. - bounce_freq = 0 - ### Text ### font = Monospace 8 diff --git a/src/settings.c b/src/settings.c index 6f12729..f137c86 100644 --- a/src/settings.c +++ b/src/settings.c @@ -225,12 +225,6 @@ void load_settings(char *cmdline_config_path) "Define height of the window" ); - settings.bounce_freq = option_get_double( - "global", - "bounce_freq", "-bounce_freq", bounce_freq, - "Make long text bounce from side to side" - ); - { char *c = option_get_string( "global", diff --git a/src/settings.h b/src/settings.h index a4be2f9..773eb48 100644 --- a/src/settings.h +++ b/src/settings.h @@ -41,7 +41,6 @@ typedef struct _settings { int idle_threshold; int show_age_threshold; enum alignment align; - float bounce_freq; int sticky_history; int history_length; int show_indicators; diff --git a/test/functional-tests/dunstrc.default b/test/functional-tests/dunstrc.default index 200eb38..7abab08 100644 --- a/test/functional-tests/dunstrc.default +++ b/test/functional-tests/dunstrc.default @@ -5,7 +5,6 @@ sort = yes indicate_hidden = yes alignment = left - bounce_freq = 0 show_age_threshold = 60 word_wrap = yes ignore_newline = no diff --git a/test/functional-tests/dunstrc.ignore_newline b/test/functional-tests/dunstrc.ignore_newline index de3f9e9..609e709 100644 --- a/test/functional-tests/dunstrc.ignore_newline +++ b/test/functional-tests/dunstrc.ignore_newline @@ -5,7 +5,6 @@ sort = yes indicate_hidden = yes alignment = left - bounce_freq = 0 show_age_threshold = 60 word_wrap = yes ignore_newline = yes diff --git a/test/functional-tests/dunstrc.ignore_newline_no_wrap b/test/functional-tests/dunstrc.ignore_newline_no_wrap index 63ebac8..2a650bf 100644 --- a/test/functional-tests/dunstrc.ignore_newline_no_wrap +++ b/test/functional-tests/dunstrc.ignore_newline_no_wrap @@ -5,7 +5,6 @@ sort = yes indicate_hidden = yes alignment = left - bounce_freq = 0 show_age_threshold = 60 word_wrap = no ignore_newline = yes diff --git a/test/functional-tests/dunstrc.markup b/test/functional-tests/dunstrc.markup index eba3aea..87f09b1 100644 --- a/test/functional-tests/dunstrc.markup +++ b/test/functional-tests/dunstrc.markup @@ -5,7 +5,6 @@ sort = yes indicate_hidden = yes alignment = left - bounce_freq = 0 show_age_threshold = 60 word_wrap = yes ignore_newline = no diff --git a/test/functional-tests/dunstrc.nomarkup b/test/functional-tests/dunstrc.nomarkup index bb30e33..1ff4fb1 100644 --- a/test/functional-tests/dunstrc.nomarkup +++ b/test/functional-tests/dunstrc.nomarkup @@ -5,7 +5,6 @@ sort = yes indicate_hidden = yes alignment = left - bounce_freq = 0 show_age_threshold = 60 word_wrap = yes ignore_newline = no diff --git a/test/functional-tests/dunstrc.nowrap b/test/functional-tests/dunstrc.nowrap index f9d0a0a..497af8f 100644 --- a/test/functional-tests/dunstrc.nowrap +++ b/test/functional-tests/dunstrc.nowrap @@ -5,7 +5,6 @@ sort = yes indicate_hidden = yes alignment = left - bounce_freq = 0 show_age_threshold = 60 word_wrap = no ignore_newline = no diff --git a/test/functional-tests/dunstrc.run_script b/test/functional-tests/dunstrc.run_script index 32555dc..b76023b 100644 --- a/test/functional-tests/dunstrc.run_script +++ b/test/functional-tests/dunstrc.run_script @@ -5,7 +5,6 @@ sort = yes indicate_hidden = yes alignment = left - bounce_freq = 0 show_age_threshold = 60 word_wrap = yes ignore_newline = no diff --git a/test/functional-tests/dunstrc.show_age b/test/functional-tests/dunstrc.show_age index 1c3b5c7..9f83c0f 100644 --- a/test/functional-tests/dunstrc.show_age +++ b/test/functional-tests/dunstrc.show_age @@ -5,7 +5,6 @@ sort = yes indicate_hidden = yes alignment = left - bounce_freq = 0 show_age_threshold = 2 word_wrap = yes ignore_newline = no