diff --git a/src/dunst.c b/src/dunst.c index 80a1400..0a2b495 100644 --- a/src/dunst.c +++ b/src/dunst.c @@ -157,7 +157,7 @@ int dunst_main(int argc, char *argv[]) n->progress = -1; n->timeout = 10 * G_USEC_PER_SEC; n->markup = MARKUP_NO; - n->urgency = LOW; + n->urgency = URG_LOW; notification_init(n); queues_notification_insert(n, 0); // we do not call wakeup now, wake_up does not work here yet diff --git a/src/notification.c b/src/notification.c index eae26a1..8c046c1 100644 --- a/src/notification.c +++ b/src/notification.c @@ -113,13 +113,13 @@ void notification_run_script(notification *n) const char *notification_urgency_to_string(enum urgency urgency) { switch (urgency) { - case NONE: + case URG_NONE: return "NONE"; - case LOW: + case URG_LOW: return "LOW"; - case NORM: + case URG_NORM: return "NORMAL"; - case CRIT: + case URG_CRIT: return "CRITICAL"; default: return "UNDEF"; @@ -437,8 +437,8 @@ void notification_init(notification *n) n->dup_count = 0; - /* urgency > CRIT -> array out of range */ - n->urgency = n->urgency > CRIT ? CRIT : n->urgency; + /* urgency > URG_CRIT -> array out of range */ + n->urgency = n->urgency > URG_CRIT ? URG_CRIT : n->urgency; if (!n->color_strings[ColFG]) { n->color_strings[ColFG] = xctx.color_strings[ColFG][n->urgency]; diff --git a/src/notification.h b/src/notification.h index 5c507b2..df574ac 100644 --- a/src/notification.h +++ b/src/notification.h @@ -10,10 +10,10 @@ #define DUNST_NOTIF_MAX_CHARS 5000 enum urgency { - NONE = -1, - LOW = 0, - NORM = 1, - CRIT = 2, + URG_NONE = -1, + URG_LOW = 0, + URG_NORM = 1, + URG_CRIT = 2, }; typedef struct _raw_image { diff --git a/src/rules.c b/src/rules.c index d23c7a0..086c627 100644 --- a/src/rules.c +++ b/src/rules.c @@ -14,7 +14,7 @@ void rule_apply(rule_t *r, notification *n) { if (r->timeout != -1) n->timeout = r->timeout; - if (r->urgency != NONE) + if (r->urgency != URG_NONE) n->urgency = r->urgency; if (r->history_ignore != -1) n->history_ignore = r->history_ignore; @@ -62,9 +62,9 @@ void rule_init(rule_t *r) r->body = NULL; r->icon = NULL; r->category = NULL; - r->msg_urgency = NONE; + r->msg_urgency = URG_NONE; r->timeout = -1; - r->urgency = NONE; + r->urgency = URG_NONE; r->markup = MARKUP_NULL; r->new_icon = NULL; r->history_ignore = false; @@ -86,6 +86,6 @@ bool rule_matches_notification(rule_t *r, notification *n) && (!r->icon || !fnmatch(r->icon, n->icon, 0)) && (!r->category || !fnmatch(r->category, n->category, 0)) && (r->match_transient == -1 || (r->match_transient == n->transient)) - && (r->msg_urgency == NONE || r->msg_urgency == n->urgency)); + && (r->msg_urgency == URG_NONE || r->msg_urgency == n->urgency)); } /* vim: set tabstop=8 shiftwidth=8 expandtab textwidth=0: */ diff --git a/src/settings.c b/src/settings.c index 350a0d1..0d4a569 100644 --- a/src/settings.c +++ b/src/settings.c @@ -54,11 +54,11 @@ static enum urgency ini_get_urgency(const char *section, const char *key, const if (strlen(urg) > 0) { if (strcmp(urg, "low") == 0) - ret = LOW; + ret = URG_LOW; else if (strcmp(urg, "normal") == 0) - ret = NORM; + ret = URG_NORM; else if (strcmp(urg, "critical") == 0) - ret = CRIT; + ret = URG_CRIT; else fprintf(stderr, "unknown urgency: %s, ignoring\n", @@ -492,15 +492,15 @@ void load_settings(char *cmdline_config_path) "Frame color for notifications with low urgency" ); - settings.timeouts[LOW] = option_get_time( + settings.timeouts[URG_LOW] = option_get_time( "urgency_low", - "timeout", "-lto", defaults.timeouts[LOW], + "timeout", "-lto", defaults.timeouts[URG_LOW], "Timeout for notifications with low urgency" ); - settings.icons[LOW] = option_get_string( + settings.icons[URG_LOW] = option_get_string( "urgency_low", - "icon", "-li", defaults.icons[LOW], + "icon", "-li", defaults.icons[URG_LOW], "Icon for notifications with low urgency" ); @@ -522,15 +522,15 @@ void load_settings(char *cmdline_config_path) "Frame color for notifications with normal urgency" ); - settings.timeouts[NORM] = option_get_time( + settings.timeouts[URG_NORM] = option_get_time( "urgency_normal", - "timeout", "-nto", defaults.timeouts[NORM], + "timeout", "-nto", defaults.timeouts[URG_NORM], "Timeout for notifications with normal urgency" ); - settings.icons[NORM] = option_get_string( + settings.icons[URG_NORM] = option_get_string( "urgency_normal", - "icon", "-ni", defaults.icons[NORM], + "icon", "-ni", defaults.icons[URG_NORM], "Icon for notifications with normal urgency" ); @@ -552,15 +552,15 @@ void load_settings(char *cmdline_config_path) "Frame color for notifications with critical urgency" ); - settings.timeouts[CRIT] = option_get_time( + settings.timeouts[URG_CRIT] = option_get_time( "urgency_critical", - "timeout", "-cto", defaults.timeouts[CRIT], + "timeout", "-cto", defaults.timeouts[URG_CRIT], "Timeout for notifications with critical urgency" ); - settings.icons[CRIT] = option_get_string( + settings.icons[URG_CRIT] = option_get_string( "urgency_critical", - "icon", "-ci", defaults.icons[CRIT], + "icon", "-ci", defaults.icons[URG_CRIT], "Icon for notifications with critical urgency" ); diff --git a/src/x11/x.c b/src/x11/x.c index 0710b67..aaa4eda 100644 --- a/src/x11/x.c +++ b/src/x11/x.c @@ -980,26 +980,26 @@ void x_setup(void) x_shortcut_grab(&settings.context_ks); x_shortcut_ungrab(&settings.context_ks); - xctx.color_strings[ColFG][LOW] = settings.lowfgcolor; - xctx.color_strings[ColFG][NORM] = settings.normfgcolor; - xctx.color_strings[ColFG][CRIT] = settings.critfgcolor; + xctx.color_strings[ColFG][URG_LOW] = settings.lowfgcolor; + xctx.color_strings[ColFG][URG_NORM] = settings.normfgcolor; + xctx.color_strings[ColFG][URG_CRIT] = settings.critfgcolor; - xctx.color_strings[ColBG][LOW] = settings.lowbgcolor; - xctx.color_strings[ColBG][NORM] = settings.normbgcolor; - xctx.color_strings[ColBG][CRIT] = settings.critbgcolor; + xctx.color_strings[ColBG][URG_LOW] = settings.lowbgcolor; + xctx.color_strings[ColBG][URG_NORM] = settings.normbgcolor; + xctx.color_strings[ColBG][URG_CRIT] = settings.critbgcolor; if (settings.lowframecolor) - xctx.color_strings[ColFrame][LOW] = settings.lowframecolor; + xctx.color_strings[ColFrame][URG_LOW] = settings.lowframecolor; else - xctx.color_strings[ColFrame][LOW] = settings.frame_color; + xctx.color_strings[ColFrame][URG_LOW] = settings.frame_color; if (settings.normframecolor) - xctx.color_strings[ColFrame][NORM] = settings.normframecolor; + xctx.color_strings[ColFrame][URG_NORM] = settings.normframecolor; else - xctx.color_strings[ColFrame][NORM] = settings.frame_color; + xctx.color_strings[ColFrame][URG_NORM] = settings.frame_color; if (settings.critframecolor) - xctx.color_strings[ColFrame][CRIT] = settings.critframecolor; + xctx.color_strings[ColFrame][URG_CRIT] = settings.critframecolor; else - xctx.color_strings[ColFrame][CRIT] = settings.frame_color; + xctx.color_strings[ColFrame][URG_CRIT] = settings.frame_color; /* parse and set xctx.geometry and monitor position */ if (settings.geom[0] == '-') { diff --git a/test/notification.c b/test/notification.c index e5812dd..c4e3494 100644 --- a/test/notification.c +++ b/test/notification.c @@ -60,11 +60,11 @@ TEST test_notification_is_duplicate(void *notifications) ASSERT(notification_is_duplicate(a, b)); - b->urgency = LOW; + b->urgency = URG_LOW; ASSERT_FALSE(notification_is_duplicate(a, b)); - b->urgency = NORM; + b->urgency = URG_NORM; ASSERT(notification_is_duplicate(a, b)); - b->urgency = CRIT; + b->urgency = URG_CRIT; ASSERT_FALSE(notification_is_duplicate(a, b)); PASS(); @@ -107,7 +107,7 @@ SUITE(suite_notification) a->summary = "Summary"; a->body = "Body"; a->icon = "Icon"; - a->urgency = NORM; + a->urgency = URG_NORM; notification *b = notification_create(); memcpy(b, a, sizeof(*b));