Merge remote-tracking branch 'kenji/layout_change'

libqtile/hook.py

@@ -148,6 +148,12 @@ def client_urgent_hint_changed(self, func):
         """
         return self._subscribe("client_urgent_hint_changed", func)
 
+    def layout_change(self, func):
+        """
+            Called on layout change.
+        """
+        return self._subscribe("layout_change", func)
+
 subscribe = Subscribe()
 
 class Unsubscribe(Subscribe):

libqtile/manager.py

@@ -243,6 +243,7 @@ def setGroup(self, new_group):
             new_group._setScreen(self)
         hook.fire("setgroup")
         hook.fire("focus_change")
+        hook.fire("layout_change", self.group.layouts[self.group.currentLayout])
 
     def _items(self, name):
         if name == "layout":
@@ -339,20 +340,23 @@ def layout(self, layout):
         for index, obj in enumerate(self.layouts):
             if obj.name == layout:
                 self.currentLayout = index
+                hook.fire("layout_change", self.layouts[self.currentLayout])
                 self.layoutAll()
                 return
         raise ValueError("No such layout: %s"%layout)
 
     def nextLayout(self):
         self.layout.hide()
         self.currentLayout = (self.currentLayout + 1)%(len(self.layouts))
+        hook.fire("layout_change", self.layouts[self.currentLayout])
         self.layoutAll()
         screen = self.screen.get_rect()
         self.layout.show(screen)
 
     def prevLayout(self):
         self.layout.hide()
         self.currentLayout = (self.currentLayout - 1)%(len(self.layouts))
+        hook.fire("layout_change", self.layouts[self.currentLayout])
         self.layoutAll()
         screen = self.screen.get_rect()
         self.layout.show(screen)

libqtile/widget/__init__.py

@@ -19,3 +19,4 @@
     pass
 from maildir import Maildir
 from volume import Volume
+from currentlayout import CurrentLayout

libqtile/widget/currentlayout.py

@@ -0,0 +1,26 @@
+import base
+from .. import manager, bar, hook
+
+class CurrentLayout(base._TextBox):
+    defaults = manager.Defaults(
+        ("font", "Arial", "Text font"),
+        ("fontsize", None, "Font pixel size. Calculated if None."),
+        ("padding", None, "Padding left and right. Calculated if None."),
+        ("background", None, "Background colour."),
+        ("foreground", "#ffffff", "Foreground colour.")
+    )
+
+    def __init__(self, width = bar.CALCULATED, **config):
+        base._TextBox.__init__(self, "", width, **config)
+
+    def _configure(self, qtile, bar):
+        base._TextBox._configure(self, qtile, bar)
+        self.text = self.bar.screen.group.layouts[0].name
+        self.setup_hooks()
+
+    def setup_hooks(self):
+        def hook_response(layout):
+            self.text = layout.name
+            self.bar.draw()
+        hook.subscribe.layout_change(hook_response)
+