fixed issue 176

[chaz/tint2] / src / tint.c

diff --git a/src/tint.c b/src/tint.c
index 1380d657dce79f36431581024c3f0d15ab321ef1..fd30d39f2f606e032dfa1b37c5df3970e53d4ff5 100644 (file)
--- a/src/tint.c
+++ b/src/tint.c
@@ -435,6 +435,8 @@ void event_property_notify (XEvent *e)
                                        else
                                                return;
                                }
+                               else
+                                       return;
                        }
                }
                //printf("atom root_win = %s, %s\n", XGetAtomName(server.dsp, at), tsk->title);
@@ -707,6 +709,19 @@ int main (int argc, char *argv[])
 
                // Wait for X Event or a Timer
                if (pselect(max_fd+1, &fdset, 0, 0, 0, &empty_mask) > 0) {
+                       // we need to iterate over the whole timer list, since fd_set can only be checked with the
+                       // brute force method FD_ISSET for every possible timer
+                       timer_iter = timer_list;
+                       while (timer_iter) {
+                               timer = timer_iter->data;
+                               if (FD_ISSET(timer->id, &fdset)) {
+                                       uint64_t dummy;
+                                       if ( -1  != read(timer->id, &dummy, sizeof(uint64_t)) )
+                                               timer->_callback();
+                               }
+                               timer_iter = timer_iter->next;
+                       }
+
                        while (XPending (server.dsp)) {
                                XNextEvent(server.dsp, &e);
 
@@ -724,9 +739,8 @@ int main (int argc, char *argv[])
                                                if (!g_tooltip.enabled) break;
                                                Panel* panel = get_panel(e.xmotion.window);
                                                Area* area = click_area(panel, e.xmotion.x, e.xmotion.y);
-                                               if (area->_get_tooltip_text) {
+                                               if (area->_get_tooltip_text)
                                                        tooltip_trigger_show(area, panel, e.xmotion.x_root, e.xmotion.y_root);
-                                               }
                                                else
                                                        tooltip_trigger_hide();
                                                break;
@@ -784,19 +798,6 @@ int main (int argc, char *argv[])
                                                break;
                                }
                        }
-
-                       // we need to iterate over the whole timer list, since fd_set can only be checked with the
-                       // brute force method FD_ISSET for every possible timer
-                       timer_iter = timer_list;
-                       while (timer_iter) {
-                               timer = timer_iter->data;
-                               if (FD_ISSET(timer->id, &fdset)) {
-                                       uint64_t dummy;
-                                       read(timer->id, &dummy, sizeof(uint64_t));
-                                       timer->_callback();
-                               }
-                               timer_iter = timer_iter->next;
-                       }
                }
 
                switch (signal_pending) {