mirror of
https://github.com/gryf/wmdocklib.git
synced 2026-02-14 14:15:46 +01:00
1293224: char font
just preparing for a bigger change... extended the global font (just one), it has lower and upper case.
This commit is contained in:
@@ -49,8 +49,7 @@ import os
|
||||
|
||||
import wmdocklib
|
||||
|
||||
from wmdocklib import letters, lettersStartX, lettersStartY, letterWidth, letterHeight
|
||||
from wmdocklib import digits, digitsStartX, digitsStartY, digitWidth, digitHeight
|
||||
from wmdocklib import char_width, char_height
|
||||
|
||||
width = 64
|
||||
height = 64
|
||||
@@ -61,7 +60,7 @@ yOffset = 4
|
||||
timeDefaultFormat = '%H:%M:%S'
|
||||
dateDefaultFormat = '%d-%m-%y'
|
||||
dayDefaultFormat = '%A'
|
||||
weekDefaultFormat = 'wk %q' # %q added by me for different week calculation.
|
||||
weekDefaultFormat = 'wk %q' # %q added by Kristoffer for different week calculation.
|
||||
|
||||
defaultConfigFile = '~/.pywmdatetimerc'
|
||||
defaultRGBFiles = ['/usr/lib/X11/rgb.txt', '/usr/X11R6/lib/X11/rgb.txt']
|
||||
@@ -69,9 +68,7 @@ maxCharsPerLine = 9
|
||||
|
||||
def addString(s, x, y):
|
||||
try:
|
||||
wmdocklib.addString(s, x, y, letterWidth, letterHeight, lettersStartX,
|
||||
lettersStartY, letters, digitWidth, digitHeight,
|
||||
digitsStartX, digitsStartY, digits, xOffset, yOffset,
|
||||
wmdocklib.addString(s, x, y, xOffset, yOffset,
|
||||
width, height)
|
||||
except ValueError, e:
|
||||
sys.stderr.write('Error when painting string:\n' + str(e) + '\n')
|
||||
@@ -79,15 +76,14 @@ def addString(s, x, y):
|
||||
|
||||
def clearLine(y):
|
||||
'''Clear a line of text at position y.'''
|
||||
wmdocklib.copyXPMArea(73, yOffset, width - 2 * xOffset, letterHeight,
|
||||
wmdocklib.copyXPMArea(73, yOffset, width - 2 * xOffset, char_height,
|
||||
xOffset, y + yOffset)
|
||||
|
||||
def getCenterStartPos(s):
|
||||
return wmdocklib.getCenterStartPos(s, letterWidth, width, xOffset)
|
||||
return wmdocklib.getCenterStartPos(s, width, xOffset)
|
||||
|
||||
def getVertSpacing(numLines, margin):
|
||||
return wmdocklib.getVertSpacing(numLines, margin, height, letterHeight,
|
||||
yOffset)
|
||||
return wmdocklib.getVertSpacing(numLines, margin, height, yOffset)
|
||||
|
||||
def calculateWeek(localTime):
|
||||
"""Calculate the week number as we do, for example in Sweden.
|
||||
@@ -174,16 +170,16 @@ def mainLoop(timeFmt, dateFmt, dayFmt, weekFmt):
|
||||
weekX = getCenterStartPos(weekStr)
|
||||
dayX = getCenterStartPos(dayStr)
|
||||
if lastStrs[1] != dateStr:
|
||||
clearLine(margin + spacing + letterWidth)
|
||||
addString(dateStr, dateX, margin + spacing + letterWidth)
|
||||
clearLine(margin + spacing + char_width)
|
||||
addString(dateStr, dateX, margin + spacing + char_width)
|
||||
lastStrs[1] = dateStr
|
||||
if lastStrs[2] != dayStr:
|
||||
clearLine(margin + 2 * (spacing + letterWidth))
|
||||
addString(dayStr, dayX, margin + 2 * (spacing + letterWidth))
|
||||
clearLine(margin + 2 * (spacing + char_width))
|
||||
addString(dayStr, dayX, margin + 2 * (spacing + char_width))
|
||||
lastStrs[2] = dayStr
|
||||
if lastStrs[3] != weekStr:
|
||||
clearLine(margin + 3 * (spacing + letterWidth))
|
||||
addString(weekStr, weekX, margin + 3 * (spacing + letterWidth))
|
||||
clearLine(margin + 3 * (spacing + char_width))
|
||||
addString(weekStr, weekX, margin + 3 * (spacing + char_width))
|
||||
lastStrs[3] = weekStr
|
||||
if counter == 999999:
|
||||
counter = -1
|
||||
@@ -258,71 +254,71 @@ xpm = \
|
||||
'/\tc #2020b2b2aaaa s graph',
|
||||
'_\tc #000000000000 s background',
|
||||
'%\tc #2081B2CAAEBA s text',
|
||||
' ................................................................................................',
|
||||
' ..///...........................................................................................',
|
||||
' ..///...........................................................................................',
|
||||
' ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///....________________________________________________________...............................',
|
||||
' ________________________________________________________ ..///....________________________________________________________...............................',
|
||||
' ________________________________________________________ ..///....________________________________________________________...............................',
|
||||
' ________________________________________________________ ..///....________________________________________________________...............................',
|
||||
' ________________________________________________________ ..///....________________________________________________________...............................',
|
||||
' ________________________________________________________ ..///....________________________________________________________...............................',
|
||||
' ________________________________________________________ ..///....________________________________________________________...............................',
|
||||
' ________________________________________________________ ..///....________________________________________________________...............................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///...........................................................................................',
|
||||
' ________________________________________________________ ..///////////////////////////////////////////////////////////////////////////////////////////...',
|
||||
' ________________________________________________________ ..///////////////////////////////////////////////////////////////////////////////////////////...',
|
||||
' ..///////////////////////////////////////////////////////////////////////////////////////////...',
|
||||
' ................................................................................................',
|
||||
' ................................................................................................',
|
||||
' ................................................................................................',
|
||||
] + wmdocklib.alfabet
|
||||
' ________________________________________________________________________________________________',
|
||||
' __///___________________________________________________________________________________________',
|
||||
' __///___________________________________________________________________________________________',
|
||||
' __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///___________________________________________________________________________________________',
|
||||
' ________________________________________________________ __///////////////////////////////////////////////////////////////////////////////////////////___',
|
||||
' ________________________________________________________ __///////////////////////////////////////////////////////////////////////////////////////////___',
|
||||
' __///////////////////////////////////////////////////////////////////////////////////////////___',
|
||||
' ________________________________________________________________________________________________',
|
||||
' ________________________________________________________________________________________________',
|
||||
' ________________________________________________________________________________________________',
|
||||
] + wmdocklib.char_map
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
||||
Reference in New Issue
Block a user