nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace var "now" with calls to time()

Browse Source 
we can't depend on the variable now to contain the current
time, since the mainloop that updates that variable might be blocking
while other things can still access the variable.
This commit is contained in:
Sascha Kruse 2013-02-19 01:50:19 +00:00
parent 1ac31d9397
commit 52f0f485bc
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dunst.c
View File

@ -71,7 +71,6 @@ static const char *color_strings[2][3];
static Atom utf8; static Atom utf8;
static DC *dc; static DC *dc;
static Window win; static Window win;
static time_t now;
static bool visible = false; static bool visible = false;
static screen_info scr; static screen_info scr;
static dimension_t geometry; static dimension_t geometry;
@ -574,7 +573,7 @@ void check_timeouts(void)
/* don't timeout when user is idle */ /* don't timeout when user is idle */
if (is_idle()) { if (is_idle()) {
n->start = now; n->start = time(NULL);
continue; continue;
} }
@ -584,7 +583,7 @@ void check_timeouts(void)
} }
/* remove old message */ /* remove old message */
if (difftime(now, n->start) > n->timeout) { if (difftime(time(NULL), n->start) > n->timeout) {
force_redraw = true; force_redraw = true;
/* close_notification may conflict with iter, so restart */ /* close_notification may conflict with iter, so restart */
close_notification(n, 1); close_notification(n, 1);
@ -632,7 +631,7 @@ void update_lists()
if (!n) if (!n)
return; return;
n->start = now; n->start = time(NULL);
if (!n->redisplayed && n->script) { if (!n->redisplayed && n->script) {
run_script(n); run_script(n);
} }
@ -698,7 +697,7 @@ char *generate_final_text(notification *n)
/* print age */ /* print age */
int hours, minutes, seconds; int hours, minutes, seconds;
time_t t_delta = now - n->timestamp; time_t t_delta = time(NULL) - n->timestamp;
if (show_age_threshold >= 0 && t_delta >= show_age_threshold) { if (show_age_threshold >= 0 && t_delta >= show_age_threshold) {
hours = t_delta / 3600; hours = t_delta / 3600;
@ -1199,7 +1198,7 @@ int init_notification(notification * n, int id)
if (strcmp(orig->appname, n->appname) == 0 if (strcmp(orig->appname, n->appname) == 0
&& strcmp(orig->msg, n->msg) == 0) { && strcmp(orig->msg, n->msg) == 0) {
orig->dup_count++; orig->dup_count++;
orig->start = now; orig->start = time(NULL);
free_notification(n); free_notification(n);
wake_up(); wake_up();
return orig->id; return orig->id;
@ -1226,7 +1225,7 @@ int init_notification(notification * n, int id)
n->timeout = n->timeout == -1 ? timeouts[n->urgency] : n->timeout; n->timeout = n->timeout == -1 ? timeouts[n->urgency] : n->timeout;
n->start = 0; n->start = 0;
n->timestamp = now; n->timestamp = time(NULL);
n->redisplayed = false; n->redisplayed = false;
@ -1423,8 +1422,6 @@ void update(void)
time_t last_time = time(&last_time); time_t last_time = time(&last_time);
static time_t last_redraw = 0; static time_t last_redraw = 0;
now = time(&now);
/* move messages from notification_queue to displayed_notifications */ /* move messages from notification_queue to displayed_notifications */
update_lists(); update_lists();
if (displayed->length > 0 && ! visible) { if (displayed->length > 0 && ! visible) {
@ -1434,10 +1431,10 @@ void update(void)
hide_win(); hide_win();
} }
if (visible && (force_redraw || now - last_redraw > 0)) { if (visible && (force_redraw || time(NULL) - last_redraw > 0)) {
draw_win(); draw_win();
force_redraw = false; force_redraw = false;
last_redraw = now; last_redraw = time(NULL);
} }
} }
@ -1978,8 +1975,6 @@ void load_options(char *cmdline_config_path)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
now = time(&now);
history = g_queue_new(); history = g_queue_new();
displayed = g_queue_new(); displayed = g_queue_new();
queue = g_queue_new(); queue = g_queue_new();