1
0
mirror of https://github.com/gryf/wmdocklib.git synced 2025-12-22 05:48:08 +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:
mfrasca
2006-10-06 14:33:39 +00:00
parent 0bf5b49746
commit 1d33c72f47
6 changed files with 135 additions and 169 deletions

View File

@@ -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()

View File

@@ -42,8 +42,7 @@ import popen2
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
prevStat = {'user':0,
'nice':0,
@@ -150,22 +149,20 @@ err = sys.stderr.write
def addString(s, x, y):
"""Convenience function around pwymhelpers.addString."""
try:
wmdocklib.addString(s, x, y, letterWidth, letterHeight, lettersStartX,
lettersStartY, letters, digitWidth, digitHeight,
digitsStartX, digitsStartY, digits, xOffset, yOffset,
width, height)
wmdocklib.addString(s, x, y, xOffset, yOffset,
width, height)
except ValueError, e:
sys.stderr.write('Error when painting string:\n' + str(e) + '\n')
sys.exit(3)
def clearLine(y):
"""Clear a line of text at position y."""
wmdocklib.copyXPMArea(72, yOffset, width - 2 * xOffset, letterHeight,
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."""
return 0, line * (letterHeight + 3) + 1
return 0, line * (char_height + 3) + 1
def isTrue(s):
"""Return true if the string s can be interpreted as a true value.
@@ -473,7 +470,7 @@ class PywmGeneric:
x, y = getXY(i)
if not self._entrys[i] is None:
wmdocklib.addMouseRegion(i, x + xOffset, y + yOffset,
width - 2 * xOffset, y + yOffset + letterHeight)
width - 2 * xOffset, y + yOffset + char_height)
def parseTimeStr(self, timeStr):
"""Take a string on a form like 10h and return the number of seconds.
@@ -696,7 +693,7 @@ xpm = \
' .///////////////////////////////////////////////////////////////////////////////////////////...',
' ...............................................................................................',
' ...............................................................................................',
] + wmdocklib.alfabet
] + wmdocklib.char_map
if __name__ == '__main__':
main()

View File

@@ -57,8 +57,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
@@ -99,10 +98,7 @@ class PywmHDMon:
def addString(self, s, x, y):
try:
wmdocklib.addString(s, x, y, letterWidth, letterHeight,
lettersStartX, lettersStartY, letters, digitWidth,
digitHeight, digitsStartX, digitsStartY, digits,
xOffset, yOffset, width, height)
wmdocklib.addString(s, x, y, xOffset, yOffset, width, height)
except ValueError, e:
sys.stderr.write('Error when painting string:\n' + str(e) + '\n')
sys.exit(3)
@@ -151,14 +147,14 @@ class PywmHDMon:
x + paintWidth + xOffset, y + yOffset)
def getY(self, line):
return 2 + (line - 1) * (letterHeight + 3)
return 2 + (line - 1) * (char_height + 3)
def paintLabel(self, line, label):
self.addString(label, 1, self.getY(line))
def paintHdData(self, line, data, mode):
total, free = data
xStart = width - xOffset - 6 * letterWidth - 1
xStart = width - xOffset - 6 * char_width - 1
if total==0:
self.addString(' ', xStart, self.getY(line))
self.paintGraph(0, xStart, self.getY(line) + 4,
@@ -450,8 +446,8 @@ def main():
displayMode = defaultMode
pathsToMonitor.append((label[:3], path, displayMode, action))
wmdocklib.addMouseRegion(i,
8, 8 + (i - 1) * (letterHeight + 3),
58, 4 + i * (letterHeight + 3))
8, 8 + (i - 1) * (char_height + 3),
58, 4 + i * (char_height + 3))
procStat = config.get('procstat', defaultProcStat)
skipping = int(config.get('skipconf', 0))
actMonEnabled = int(config.get('monitoring'))
@@ -555,7 +551,7 @@ xpm = \
' .///////////////////////////////////////////////////////////////////////////////////////////...',
' ...............................................................................................',
' ...............................................................................................',
] + wmdocklib.alfabet
] + wmdocklib.char_map
if __name__ == '__main__':
main()

View File

@@ -39,8 +39,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
@@ -86,20 +85,17 @@ class PywmSeti:
def addString(self, s, x, y):
try:
wmdocklib.addString(s, x, y, letterWidth, letterHeight,
lettersStartX, lettersStartY, letters, digitWidth,
digitHeight, digitsStartX, digitsStartY, digits,
wmdocklib.addString(s, x, y, digits,
xOffset, yOffset, width, height)
except ValueError, e:
sys.stderr.write('Error when painting string:\n' + str(e) + '\n')
sys.exit(3)
def getCenterStartPos(self, s):
return wmdocklib.getCenterStartPos(s, letterWidth, width, xOffset)
return wmdocklib.getCenterStartPos(s, width, xOffset)
def getVertSpacing(self, numLines, margin):
return wmdocklib.getVertSpacing(numLines, margin, height,
letterHeight, yOffset)
return wmdocklib.getVertSpacing(numLines, margin, height, yOffset)
def getProgress(self, lines):
"""Return the progess of the current workunit.
@@ -499,7 +495,7 @@ xpm = \
' .///////////////////////////////////////////////////////////////////////////////////////////...',
' ...............................................................................................',
' ...............................................................................................',
] + wmdocklib.alfabet
] + wmdocklib.char_map
if __name__ == '__main__':

View File

@@ -38,8 +38,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
@@ -163,10 +162,7 @@ class PywmSysMon:
def addString(self, s, x, y):
try:
wmdocklib.addString(s, x, y, letterWidth, letterHeight,
lettersStartX, lettersStartY, letters, digitWidth,
digitHeight, digitsStartX, digitsStartY, digits,
xOffset, yOffset, width, height)
wmdocklib.addString(s, x, y, digits, xOffset, yOffset, width, height)
except ValueError, e:
sys.stderr.write('Error when painting string:\n' + str(e) + '\n')
sys.exit(3)
@@ -425,7 +421,7 @@ xpm = \
' .///////////////////////////////////////////////////////////////////////////////////////////...',
' ...............................................................................................',
' ...............................................................................................',
] + wmdocklib.alfabet
] + wmdocklib.char_map
if __name__ == '__main__':