mirror of
https://github.com/gryf/wmdocklib.git
synced 2025-12-19 20:38:03 +01:00
1580293: initialization of pixmask - drawing areas
this again is a radical modification... more or less as requested in pr.
This commit is contained in:
@@ -78,11 +78,10 @@ def addString(s, x, y):
|
||||
def addTimeString(s, x, y):
|
||||
for c in s:
|
||||
charW = 7
|
||||
charX = 64 + (ord(c) - ord('0')) % 5 * 7
|
||||
if c <='4': charY = 44
|
||||
else: charY = 54
|
||||
charX = (ord(c) - ord('0')) * 7
|
||||
charY = 64
|
||||
if not c.isdigit():
|
||||
charX = 64 + 35
|
||||
charX = 70
|
||||
charW = 3
|
||||
wmdocklib.copyXPMArea(charX, charY, charW, 10, x+xOffset, y+yOffset)
|
||||
x += charW
|
||||
@@ -173,7 +172,7 @@ def mainLoop(timeFmt, dateFmt, dayFmt, weekFmt):
|
||||
spacing = getVertSpacing(4, margin)
|
||||
if lastStrs[0] != timeStr:
|
||||
addTimeString(timeStr, timeX, margin-4)
|
||||
margin += 1
|
||||
margin += 2
|
||||
else:
|
||||
margin = 4
|
||||
spacing = getVertSpacing(4, margin)
|
||||
@@ -211,72 +210,30 @@ def mainLoop(timeFmt, dateFmt, dayFmt, weekFmt):
|
||||
wmdocklib.redraw()
|
||||
time.sleep(0.1)
|
||||
|
||||
background = [
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" 7",
|
||||
" 7",
|
||||
" 7",
|
||||
" 7",
|
||||
" 7",
|
||||
" 7",
|
||||
" 7",
|
||||
" 7",
|
||||
" 7",
|
||||
" 7",
|
||||
" 7",
|
||||
" 7",
|
||||
" 7",
|
||||
" 7",
|
||||
"7777777777777777777777777777777777777777777777777777777777777777",
|
||||
" ",
|
||||
" ",
|
||||
".+@@+.....#@...#@@#...#@@#....$@%.. ",
|
||||
"$@==@$...+@@..&@--@&.*@--@&...#@%.. ",
|
||||
"&@**@&..#@@@..&@$.@%.&-..@%..*@@%.. ",
|
||||
"%@..@%..#+%@.....$@%....+@#..--@%.. ",
|
||||
"%@..@%....%@.....%@*...%@-..*@$@%.. ",
|
||||
"%@..@%....%@....+@%....&-@+.=#.@%.. ",
|
||||
"%@..@%....%@...+@=$......-@.@-%@=&. ",
|
||||
"&@**@&....%@..$@=$...&-..-@.@@@@@%. ",
|
||||
"$@==@$....%@..#@-%%&.+@--@#....@%.. ",
|
||||
".+@@+.....%@..@@@@@%..#@@#.....@%.. ",
|
||||
".@@@@+..+=@%..+@@@@@..%@@+...&@@#...... ",
|
||||
"*@-%%*.$==-@&.*%%%@=.#@-=@*.*@=-@&..... ",
|
||||
"+@+....+@*.%*....+@*.%@.+@+.%@$.-%.*+.. ",
|
||||
"&@=@#..%@$+$.....--..&@&%@$.%@..%@.%@.. ",
|
||||
"%@%=@*.%@=@@*...*@&...=@@#..&@%&@@.*+.. ",
|
||||
".*.$@%.%@%&@-...#@...#@&%@*..=@@@@..... ",
|
||||
"....@%.%@..%@...=-...@%..@%...+*%@.&%.. ",
|
||||
"--.*@#.+@$.-@...@%...@-.$@%.$#*.=%.%@.. ",
|
||||
"%@-=@$.$@=-@#..+@+...#@-=@*.$@=-@+..... ",
|
||||
"$-@=+...+=@%$..+@+...$#@@&...+@@#...... ",
|
||||
patterns = [
|
||||
".+@@+.....#@...#@@#...#@@#....$@%...@@@@+..+=@%..+@@@@@..%@@+...&@@#.....",
|
||||
"$@==@$...+@@..&@--@&.*@--@&...#@%..*@-%%*.$==-@&.*%%%@=.#@-=@*.*@=-@&....",
|
||||
"&@**@&..#@@@..&@$.@%.&-..@%..*@@%..+@+....+@*.%*....+@*.%@.+@+.%@$.-%.*+.",
|
||||
"%@..@%..#+%@.....$@%....+@#..--@%..&@=@#..%@$+$.....--..&@&%@$.%@..%@.%@.",
|
||||
"%@..@%....%@.....%@*...%@-..*@$@%..%@%=@*.%@=@@*...*@&...=@@#..&@%&@@.*+.",
|
||||
"%@..@%....%@....+@%....&-@+.=#.@%...*.$@%.%@%&@-...#@...#@&%@*..=@@@@....",
|
||||
"%@..@%....%@...+@=$......-@.@-%@=&.....@%.%@..%@...=-...@%..@%...+*%@.&%.",
|
||||
"&@**@&....%@..$@=$...&-..-@.@@@@@%.--.*@#.+@$.-@...@%...@-.$@%.$#*.=%.%@.",
|
||||
"$@==@$....%@..#@-%%&.+@--@#....@%..%@-=@$.$@=-@#..+@+...#@-=@*.$@=-@+....",
|
||||
".+@@+.....%@..@@@@@%..#@@#.....@%..$-@=+...+=@%$..+@+...$#@@&...+@@#.....",
|
||||
]
|
||||
palette = {
|
||||
".":"#181818",
|
||||
"+":"#6E6E0F",
|
||||
"@":"#FFFF00",
|
||||
"#":"#A0A009",
|
||||
"$":"#3B3B14",
|
||||
"%":"#B9B907",
|
||||
"&":"#87870C",
|
||||
"*":"#545411",
|
||||
"=":"#E6E602",
|
||||
"-":"#CFCF04",
|
||||
}
|
||||
|
||||
def main():
|
||||
clConfig = parseCommandLine(sys.argv)
|
||||
@@ -302,27 +259,22 @@ def main():
|
||||
programName = ''
|
||||
sys.argv[0] = programName
|
||||
|
||||
palette = {
|
||||
".":"#181818",
|
||||
"+":"#6E6E0F",
|
||||
"@":"#FFFF00",
|
||||
"#":"#A0A009",
|
||||
"$":"#3B3B14",
|
||||
"%":"#B9B907",
|
||||
"&":"#87870C",
|
||||
"*":"#545411",
|
||||
"=":"#E6E602",
|
||||
"-":"#CFCF04",
|
||||
}
|
||||
palette[0] = clConfig.get('background', 'black')
|
||||
palette[2] = clConfig.get('foreground', 'cyan3')
|
||||
|
||||
font = clConfig.get('font', '6x8orig')
|
||||
|
||||
if clConfig.get('antialiased'):
|
||||
background = [((3,3),(60,18)),
|
||||
((3,21),(60,60))]
|
||||
else:
|
||||
background = [((3,3),(60,60))]
|
||||
|
||||
global char_width, char_height, maxCharsPerLine, antialiased
|
||||
char_width, char_height = wmdocklib.initPixmap(background,
|
||||
char_width, char_height = wmdocklib.initPixmap(patterns=patterns,
|
||||
font_name=font,
|
||||
bg=0, fg=2, palette=palette)
|
||||
bg=0, fg=2, palette=palette,
|
||||
background=background)
|
||||
maxCharsPerLine = (width-2*xOffset) / char_width
|
||||
antialiased = clConfig.get('antialiased', False)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user