Merge branch 'master' of https://github.com/tobi-wan-kenobi/bumblebee-status

README.md

@@ -63,20 +63,20 @@ Here are some screenshots for all themes that currently exist:
 
 Gruvbox Powerline (`-t gruvbox-powerline`) (contributed by [@paxy97](https://github.com/paxy97)):
 
-![Gruvbox Powerline](https://github.com/tobi-wan-kenobi/bumblebee-status/blob/master/screenshots/powerline-gruvbox.png)
+![Gruvbox Powerline](https://github.com/tobi-wan-kenobi/bumblebee-status/blob/master/screenshots/themes/powerline-gruvbox.png)
 
 Solarized Powerline (`-t solarized-powerline`):
 
-![Solarized Powerline](https://github.com/tobi-wan-kenobi/bumblebee-status/blob/master/screenshots/powerline-solarized.png)
+![Solarized Powerline](https://github.com/tobi-wan-kenobi/bumblebee-status/blob/master/screenshots/themes/powerline-solarized.png)
 
 Solarized (`-t solarized`):
 
-![Solarized](https://github.com/tobi-wan-kenobi/bumblebee-status/blob/master/screenshots/solarized.png)
+![Solarized](https://github.com/tobi-wan-kenobi/bumblebee-status/blob/master/screenshots/themes/solarized.png)
 
 Powerline (`-t powerline`):
 
-![Powerline](https://github.com/tobi-wan-kenobi/bumblebee-status/blob/master/screenshots/powerline.png)
+![Powerline](https://github.com/tobi-wan-kenobi/bumblebee-status/blob/master/screenshots/themes/powerline.png)
 
 Default (nothing or `-t default`):
 
-![Default](https://github.com/tobi-wan-kenobi/bumblebee-status/blob/master/screenshots/default.png)
+![Default](https://github.com/tobi-wan-kenobi/bumblebee-status/blob/master/screenshots/themes/default.png)

bumblebee/modules/xrandr.py

@@ -0,0 +1,54 @@
+import bumblebee.module
+import re
+import sys
+import subprocess
+
+def description():
+    return "Shows all connected screens"
+
+def parameters():
+    return [
+    ]
+
+class Module(bumblebee.module.Module):
+    def __init__(self, output, config, alias):
+        super(Module, self).__init__(output, config, alias)
+        self._state = "off"
+
+    def widgets(self):
+        process = subprocess.Popen([ "xrandr", "-q" ], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        output, error = process.communicate()
+
+        widgets = []
+
+        # TODO: sort by position
+        for line in output.split("\n"):
+            if not " connected" in line:
+                continue
+            screen = line.split(" ", 2)[0]
+            m = re.search(r'\d+x\d+\+(\d+)\+\d+', line)
+
+            widget = bumblebee.output.Widget(self, screen)
+            if m:
+                self._state = "on"
+                widget.set("pos", int(m.group(1)))
+            else:
+                self._state = "off"
+                widget.set("pos", sys.maxint());
+
+            widgets.append(widget)
+
+        widgets.sort(key=lambda widget : widget.get("pos"))
+
+        return widgets
+
+    def state(self, widget):
+        return self._state
+
+    def warning(self, widget):
+        return False
+
+    def critical(self, widget):
+        return False
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

bumblebee/outputs/i3.py

@@ -51,6 +51,10 @@ class Output(bumblebee.output.Output):
                     "separator_block_width": 0,
                 })
 
+            sep = theme.default_separators(widget)
+            sep = sep if sep else False
+            width = theme.separator_block_width(widget)
+            width = width if width else 0
             self._data.append({
                 u"full_text": "{}{}{}".format(
                     theme.prefix(widget),
@@ -61,8 +65,8 @@ class Output(bumblebee.output.Output):
                 "background": theme.background(widget),
                 "name": widget.module(),
                 "instance": widget.instance(),
-                "separator": theme.default_separators(widget),
+                "separator": sep,
-                "separator_block_width": theme.separator_block_width(widget),
+                "separator_block_width": width,
             })
             theme.next_widget()
 

themes/default.json

@@ -126,6 +126,9 @@
 		}
 	},
 	"caffeine": {
-		"states": { "activated": {"prefix": "   " }, "deactivated": { "prefix": "   " } }
+		"states": { "activated": {"prefix": " caf on " }, "deactivated": { "prefix": " caf off " } }
+	},
+	"xrandr": {
+		"states": { "on": { "prefix": " off "}, "off": { "prefix": " on "} }
 	}
 }

themes/gruvbox-powerline.json

@@ -159,5 +159,8 @@
 	},
 	"caffeine": {
 		"states": { "activated": {"prefix": "   " }, "deactivated": { "prefix": "   " } }
+	},
+	"xrandr": {
+		"states": { "on": { "prefix": "   "}, "off": { "prefix": "   "} }
 	}
 }

themes/powerline.json

@@ -158,5 +158,8 @@
 	},
 	"caffeine": {
 		"states": { "activated": {"prefix": "   " }, "deactivated": { "prefix": "   " } }
+	},
+	"xrandr": {
+		"states": { "on": { "prefix": "   "}, "off": { "prefix": "   "} }
 	}
 }

themes/solarized-powerline.json

@@ -159,5 +159,8 @@
 	},
 	"caffeine": {
 		"states": { "activated": {"prefix": "   " }, "deactivated": { "prefix": "   " } }
+	},
+	"xrandr": {
+		"states": { "on": { "prefix": "   "}, "off": { "prefix": "   "} }
 	}
 }

themes/solarized.json

@@ -18,7 +18,7 @@
 		"bg-warning": "#b58900",
 
 		"default_separators": false,
-		"separator": "|"
+		"separator": ""
 	},
 	"date": {
 		"prefix": " "
@@ -152,5 +152,8 @@
 	},
 	"caffeine": {
 		"states": { "activated": {"prefix": " caf on " }, "deactivated": { "prefix": " caf off " } }
+	},
+	"xrandr": {
+		"states": { "on": { "prefix": " off "}, "off": { "prefix": " on "} }
 	}
 }