*fix* merged tooltip to the new timer syntax

*todo* check what happens if no clock and no battery are on the panel



git-svn-id: http://tint2.googlecode.com/svn/trunk@268 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
Andreas.Fink85
2009-11-16 07:27:28 +00:00
parent 11aa0bdc27
commit 99b045a323
4 changed files with 64 additions and 52 deletions

View File

@@ -518,14 +518,18 @@ void add_entry (char *key, char *value)
else if (strcmp (key, "tooltip_show_timeout") == 0) {
double timeout = atof(value);
int sec = (int)timeout;
int usec = (timeout-sec)*1e6;
g_tooltip.show_timeout.it_value = (struct timeval){.tv_sec=sec, .tv_usec=usec};
int nsec = (timeout-sec)*1e9;
if (nsec < 0) // can happen because of double is not precise such that (sec > timeout)==TRUE
nsec = 0;
g_tooltip.show_timeout = (struct timespec){.tv_sec=sec, .tv_nsec=nsec};
}
else if (strcmp (key, "tooltip_hide_timeout") == 0) {
double timeout = atof(value);
int sec = (int)timeout;
int usec = (timeout-sec)*1e6;
g_tooltip.hide_timeout.it_value = (struct timeval){.tv_sec=sec, .tv_usec=usec};
int nsec = (timeout-sec)*1e9;
if (nsec < 0) // can happen because of double is not precise such that (sec > timeout)==TRUE
nsec = 0;
g_tooltip.hide_timeout = (struct timespec){.tv_sec=sec, .tv_nsec=nsec};
}
else if (strcmp (key, "tooltip_padding") == 0) {
extract_values(value, &value1, &value2, &value3);