From cf651f617d22bdcf2c0393360e10afefc429bd33 Mon Sep 17 00:00:00 2001 From: mfrasca <> Date: Mon, 16 Oct 2006 14:01:30 +0000 Subject: [PATCH] 1578113: trailing black in text line a few simple corrections in the defaults and options reading code. --- examples/pywmgeneric.py | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/examples/pywmgeneric.py b/examples/pywmgeneric.py index c78f8d5..c610607 100644 --- a/examples/pywmgeneric.py +++ b/examples/pywmgeneric.py @@ -159,8 +159,9 @@ def addString(s, x, y): def clearLine(y): """Clear a line of text at position y.""" - wmdocklib.copyXPMArea(72, yOffset, width - 2 * xOffset, char_height, - xOffset, y + yOffset) + wmdocklib.copyXPMArea(72, yOffset, + width - 2 * xOffset, char_height, + xOffset, y + yOffset) def getXY(line): """Return the x and y positions to be used at line line.""" @@ -525,7 +526,7 @@ def parseCommandLine(argv): sys.stdout.write(usage) sys.exit(0) if o in ('-t', '--text'): - d['textcolor'] = a + d['text'] = a if o in ('-b', '--background'): d['background'] = a if o in ('-F', '--font'): @@ -567,14 +568,14 @@ background = \ ' .///..___..ooo..___..___.......................................................................', ' .///..___..ooo..___..___.......................................................................', ' .///..___..ooo..___..___.......................................................................', - ' .///.._________________________________________________________................................', - ' .///.._________________________________________________________................................', - ' .///.._________________________________________________________................................', - ' .///.._________________________________________________________................................', - ' .///.._________________________________________________________................................', - ' .///.._________________________________________________________................................', - ' .///.._________________________________________________________................................', - ' .///.._________________________________________________________................................', + ' .///.._________________________________________________________________________________________', + ' .///.._________________________________________________________________________________________', + ' .///.._________________________________________________________________________________________', + ' .///.._________________________________________________________________________________________', + ' .///.._________________________________________________________________________________________', + ' .///.._________________________________________________________________________________________', + ' .///.._________________________________________________________________________________________', + ' .///.._________________________________________________________________________________________', ' .///..___..___..___..___.......................................................................', ' .///..___..___..___..ooo.......................................................................', ' .///..___..___..___..ooo.......................................................................', @@ -664,7 +665,7 @@ def main(): global char_width, char_height char_width, char_height = wmdocklib.initPixmap(background, font_name=font, - bg='f', fg='9', + bg='_', fg='%', palette=palette) wmdocklib.openXwindow(sys.argv, width, height)