all repos — fluxbox @ a2f673ccaff7d6562c58cf2453ffd6afb86031fe

custom fork of the fluxbox windowmanager 

optimization of how often fluxbox checks for the system time to display it in the clocktool

the idea (as a first patch) for this change was provided by
Thomas Habets (thomas at habets pp se). instead of having a
fixed interval each second, we now calculate the next point in
time based upon the format string used by the clocktool to render
the time. as long as no seconds are shown fluxbox now wakes up
once every minute.
Mathias Gumz akira at fluxbox dot org
commit

a2f673ccaff7d6562c58cf2453ffd6afb86031fe

parent

e102544c2d05b3bce65d3f6b76cf4a4450b1899a

1 files changed, 46 insertions(+), 4 deletions(-)

jump to
M src/ClockTool.cc → src/ClockTool.cc 
@@ -47,6 +47,48 @@ #endif
 #include <sys/time.h>
 #include <typeinfo>
 
+
+namespace {
+
+/**
+ * return true if clock shows seconds. If clock doesn't show seconds then
+ * there is no need to wake up every second to redraw the clock.
+ */
+
+int showSeconds(const std::string& fmt_string) {
+
+    return fmt_string.find("%c") != -1
+        || fmt_string.find("%r") != -1
+        || fmt_string.find("%s") != -1
+        || fmt_string.find("%S") != -1
+        || fmt_string.find("%T") != -1
+        || fmt_string.find("%X") != -1
+        || fmt_string.find("%+") != -1;
+}
+
+timeval calcNextTimeout(const std::string& fmt_string) {
+    timeval now;
+    timeval next;
+    gettimeofday(&now, 0);
+    next.tv_sec = 60 - (now.tv_sec % 60) - 1;
+    next.tv_usec = 1000000 - now.tv_usec;
+    if (next.tv_usec >= 1000000) {
+        next.tv_sec++;
+        next.tv_usec -= 1000000;
+    }
+
+    // wake up at next second-change
+    if (showSeconds(fmt_string)) {
+        next.tv_sec = 0;
+    }
+
+    return next;
+}
+
+
+} // end of anonymous namespace
+
+
 class ClockMenuItem: public FbTk::MenuItem {
 public:
     explicit ClockMenuItem(ClockTool &tool):

@@ -157,10 +199,8 @@ m_stringconvertor.setSource(time_locale);
 
     _FB_USES_NLS;
 
-    // setup timer to check the clock every 0.01 second
-    // if nothing has changed, it wont update the graphics
-    m_timer.setInterval(1);
-    // m_timer.setTimeout(delay); // don't need to set timeout on interval timer
+    m_timer.setTimeout(calcNextTimeout(*m_timeformat));
+
     FbTk::RefCount<FbTk::Command<void> > update_graphic(new FbTk::SimpleCommand<ClockTool>(*this,
                                                                                     &ClockTool::updateTime));
     m_timer.setCommand(update_graphic);

@@ -261,6 +301,8 @@ // update clock
     timeval now;
     gettimeofday(&now, 0);
     time_t the_time = now.tv_sec;
+
+    m_timer.setTimeout(calcNextTimeout(*m_timeformat));
 
     if (the_time != -1) {
         char time_string[255];