add xdisplay

Signed-off-by: Mattias Andrée <maandree@operamail.com>

3 files changed, 50 insertions, 3 deletions

diff --git a/TODO b/TODO
index 27a3f16..f921b7d 100644
--- a/TODO
+++ b/TODO
@@ -7,7 +7,6 @@ List of plugins to implement:
      Network usage
      CPU usage
      Current CPU speed
-     X display
      Xmonad
      Battery
      Music players
diff --git a/examples/plugin-test b/examples/plugin-test
index 3fce9bc..06891cf 100644
--- a/examples/plugin-test
+++ b/examples/plugin-test
@@ -12,6 +12,7 @@ from plugins.uname import Uname
 from plugins.df import Discs
 from plugins.mem import Memory
 from plugins.discstats import DiscStats
+from plugins.xdisplay import XDisplay
 
 
 OUTPUT, HEIGHT, YPOS, TOP = 0, 24, 24, True
@@ -145,7 +146,9 @@ def redraw():
     discstats = ['%s:%s' % (d[2:], colourise(i)) for d, i in discstats]
     discstats = 'Disc stats: %s' % (' '.join(discstats))
     
-    text = '%s │ %s │ %s │ %s │ %s │ %s │ %s │ %s │ %s\n%s │ %s'
-    text %= (time, uptime, idle, loadavg, users, uname, mem, swp, shm, discs, discstats)
+    xdisplay = ':%i' % XDisplay().display
+    
+    text = '%s │ %s │ %s │ %s │ %s │ %s %s │ %s │ %s │ %s\n%s │ %s'
+    text %= (time, uptime, idle, loadavg, users, uname, xdisplay, mem, swp, shm, discs, discstats)
     bar.draw_coloured_text(0, 10, 0, 2, text)
 
diff --git a/src/plugins/xdisplay.py b/src/plugins/xdisplay.py
new file mode 100644
index 0000000..c4957f4
--- /dev/null
+++ b/src/plugins/xdisplay.py
@@ -0,0 +1,45 @@
+# -*- python -*-
+'''
+xpybar – xmobar replacement written in python
+Copyright © 2014  Mattias Andrée (maandree@member.fsf.org)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+'''
+
+import os
+
+
+class XDisplay:
+    '''
+    Retrieve information about the used X display
+    
+    @variable  connection:str?  The full X display information, `None` if X is not running
+    @variable  host:str?        The host, often `None` one local conncetions and "localhost" on remote oonnection
+    @variable  display:int      The display number
+    @variable  screen:int?      The screen number , often `None`
+    '''
+    
+    
+    def __init__(self):
+        '''
+        Constructor
+        '''
+        self.connection = os.environ['DISPLAY'] if 'DISPLAY' in os.environ else None
+        self.host = self.connection.split(':')[0]
+        if self.host == '':
+            self.host = None
+        self.display, self.screen = (self.connection.split(':')[1] + '.').split('.')[:2]
+        self.display = int(self.display)
+        self.screen = None if self.screen == '' else int(self.screen)
+