Merge branch 'master' into partial-update-on-input

To make sure that all conflicts are resolved and because the
autohide feature is so nice.

bumblebee/config.py

@@ -63,6 +63,8 @@ def create_parser():
         help="Location of the debug log file")
     parser.add_argument("-i", "--iconset", default="auto",
         help="Specify the name of an iconset to use (overrides theme default)")
+    parser.add_argument("-a", "--autohide", nargs="+", default=[],
+        help="Specify a list of modules to hide when not in warning/error state")
 
     return parser
 
@@ -108,4 +110,7 @@ class Config(bumblebee.store.Store):
     def logfile(self):
         return os.path.expanduser(self._args.logfile)
 
+    def autohide(self):
+        return self._args.autohide
+
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

bumblebee/output.py

@@ -152,6 +152,9 @@ class I3BarOutput(object):
         """Draw a single widget"""
         if widget.get_module() and widget.get_module().hidden():
             return
+        if widget.get_module() and widget.get_module().name in self._config.autohide():
+            if not any(state in widget.state() for state in ["warning", "critical"]):
+                return
 
         separator = self._theme.separator(widget)
         if separator: