From 87b09d022914f3eaffa36235fd2e1bd186fee6d1 Mon Sep 17 00:00:00 2001
From: mfrasca <>
Date: Sat, 14 Oct 2006 08:17:14 +0000
Subject: [PATCH] 1577060: colour choice at command line is lost

palette is now built using the options passed at command line.
---
 examples/pywmdatetime.py | 11 ++++++++---
 examples/pywmsysmon.py   | 41 ++++++++++++++++++++--------------------
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/examples/pywmdatetime.py b/examples/pywmdatetime.py
index 15ecbf1..e571020 100755
--- a/examples/pywmdatetime.py
+++ b/examples/pywmdatetime.py
@@ -209,12 +209,17 @@ def main():
     except IndexError:  # Should only happen when using the interpreter.
         programName = ''
     sys.argv[0] = programName
+
+    palette = {}
+    palette[0] = clConfig.get('background', 'black')
+    palette[2] = clConfig.get('foreground', 'cyan3')
+    
+    global char_width, char_height
+    char_width, char_height = wmdocklib.initPixmap(font_name='6x8',
+                                                   bg=0, fg=2, palette=palette)
     wmdocklib.openXwindow(sys.argv, width, height)
     mainLoop(timeFmt, dateFmt, dayFmt, weekFmt)
 
-char_width, char_height = wmdocklib.initPixmap(font_name='6x8',
-                                               bg=0, fg=2)
-
 if __name__ == '__main__':
     main()
 
diff --git a/examples/pywmsysmon.py b/examples/pywmsysmon.py
index 71d720a..8a83531 100755
--- a/examples/pywmsysmon.py
+++ b/examples/pywmsysmon.py
@@ -280,25 +280,6 @@ def parseCommandLine(argv):
                 sys.exit(2)
     return d
 
-
-
-palette = {
-    ' ': '#208120812081',
-    '.': '#00000000FFFF',
-    'o': '#C71BC30BC71B',
-    'O': '#861782078E38',
-    '+': '#EFBEF3CEEFBE',
-    '@': '#618561856185',
-    '#': '#9E79A2899E79',
-    '$': '#410341034103',
-    'o': '#2020b2b2aaaa',
-    '/': '#2020b2b2aaaa',
-    '-': '#707070707070',
-    '|': '#2020b2b2aaaa',
-    'I': '#707070707070',
-    '_': '#000000000000',
-    '%': '#2081B2CAAEBA',
-    }
 background = \
 [' ...............................................................................................',
  ' .///..___..ooo..___..___......|.I..............................................................',
@@ -367,7 +348,6 @@ background = \
  ]
 
 def main():
-    wmdocklib.initPixmap(background, palette=palette)
     config = parseCommandLine(sys.argv)
     procStat = config.get('procstat', defaultProcStat)
     if not os.access(procStat, os.R_OK):
@@ -386,6 +366,27 @@ def main():
     except IndexError:
         programName = ''
     sys.argv[0] = programName
+
+    palette = {
+        ' ': '#208120812081',
+        '.': '#00000000FFFF',
+        'o': '#C71BC30BC71B',
+        'O': '#861782078E38',
+        '+': '#EFBEF3CEEFBE',
+        '@': '#618561856185',
+        '#': '#9E79A2899E79',
+        '$': '#410341034103',
+        'o': '#2020b2b2aaaa',
+        }
+    #palette['o'] = config.get('indicator', '#2020b2b2aaaa')
+    palette['/'] = config.get('barfgcolor', '#2020b2b2aaaa')
+    palette['-'] = config.get('barbgcolor', '#707070707070')
+    palette['|'] = config.get('graphforeground', '#2020b2b2aaaa')
+    palette['I'] = config.get('graphbackground', '#707070707070')
+    palette['_'] = config.get('background', '#000000000000')
+    palette['%'] = config.get('foreground', '#2081B2CAAEBA')
+
+    wmdocklib.initPixmap(background, palette=palette)
     wmdocklib.openXwindow(sys.argv, width, height)
     pywmsysmon = PywmSysMon(procMeminfo, procStat, ignoreNice, updateDelay)
     pywmsysmon.mainLoop()