diff --git a/pwnagotchi/ui/fonts.py b/pwnagotchi/ui/fonts.py index 226856d..52263b2 100644 --- a/pwnagotchi/ui/fonts.py +++ b/pwnagotchi/ui/fonts.py @@ -1,42 +1,38 @@ from PIL import ImageFont -FONT_NAME = None -FONT_NAME_FACES = 'DejaVuSansMono' +# should not be changed +FONT_NAME = 'DejaVuSansMono' +# can be changed +STATUS_FONT_NAME = None SIZE_OFFSET = 0 + Bold = None BoldSmall = None BoldBig = None Medium = None Small = None Huge = None -FaceHuge = None -FaceBold = None def init(config): - global FONT_NAME, SIZE_OFFSET - FONT_NAME = config['ui']['font']['name'] + global STATUS_FONT_NAME, SIZE_OFFSET + STATUS_FONT_NAME = config['ui']['font']['name'] SIZE_OFFSET = config['ui']['font']['size_offset'] setup(10, 8, 10, 25, 25, 9) +def status_font(old_font): + global STATUS_FONT_NAME, SIZE_OFFSET + return old_font.font_variant(font=STATUS_FONT_NAME, size=old_font.size + SIZE_OFFSET) + + def setup(bold, bold_small, medium, huge, bold_big, small): - global Bold, BoldSmall, Medium, Huge, BoldBig, Small, FaceHuge, FaceBold, FONT_NAME, FONT_NAME_FACES, SIZE_OFFSET - - Small = ImageFont.truetype("%s.ttf" % FONT_NAME, small + SIZE_OFFSET) - Medium = ImageFont.truetype("%s.ttf" % FONT_NAME, medium + SIZE_OFFSET) - FaceHuge = ImageFont.truetype("%s-Bold.ttf" % FONT_NAME_FACES, huge) - FaceBold = ImageFont.truetype("%s-Bold.ttf" % FONT_NAME_FACES, bold) - - try: - BoldSmall = ImageFont.truetype("%s-Bold.ttf" % FONT_NAME, bold_small + SIZE_OFFSET) - Bold = ImageFont.truetype("%s-Bold.ttf" % FONT_NAME, bold + SIZE_OFFSET) - BoldBig = ImageFont.truetype("%s-Bold.ttf" % FONT_NAME, bold_big + SIZE_OFFSET) - Huge = ImageFont.truetype("%s-Bold.ttf" % FONT_NAME, huge + SIZE_OFFSET) - except OSError: - BoldSmall = ImageFont.truetype("%s.ttf" % FONT_NAME, bold_small + SIZE_OFFSET) - Bold = ImageFont.truetype("%s.ttf" % FONT_NAME, bold + SIZE_OFFSET) - BoldBig = ImageFont.truetype("%s.ttf" % FONT_NAME, bold_big + SIZE_OFFSET) - Huge = ImageFont.truetype("%s.ttf" % FONT_NAME, huge + SIZE_OFFSET) + global Bold, BoldSmall, Medium, Huge, BoldBig, Small, FONT_NAME + Small = ImageFont.truetype("%s.ttf" % FONT_NAME, small) + Medium = ImageFont.truetype("%s.ttf" % FONT_NAME, medium) + BoldSmall = ImageFont.truetype("%s-Bold.ttf" % FONT_NAME, bold_small) + Bold = ImageFont.truetype("%s-Bold.ttf" % FONT_NAME, bold) + BoldBig = ImageFont.truetype("%s-Bold.ttf" % FONT_NAME, bold_big) + Huge = ImageFont.truetype("%s-Bold.ttf" % FONT_NAME, huge) diff --git a/pwnagotchi/ui/hw/base.py b/pwnagotchi/ui/hw/base.py index e3e0db0..72793b0 100644 --- a/pwnagotchi/ui/hw/base.py +++ b/pwnagotchi/ui/hw/base.py @@ -22,7 +22,7 @@ class DisplayImpl(object): # status is special :D 'status': { 'pos': (0, 0), - 'font': fonts.Medium, + 'font': fonts.status_font(fonts.Medium), 'max': 20 } } diff --git a/pwnagotchi/ui/hw/dfrobot.py b/pwnagotchi/ui/hw/dfrobot.py index 756e727..1d9c8ee 100644 --- a/pwnagotchi/ui/hw/dfrobot.py +++ b/pwnagotchi/ui/hw/dfrobot.py @@ -25,7 +25,7 @@ class DFRobot(DisplayImpl): self._layout['mode'] = (225, 109) self._layout['status'] = { 'pos': (125, 20), - 'font': fonts.Medium, + 'font': fonts.status_font(fonts.Medium), 'max': 20 } return self._layout @@ -40,4 +40,4 @@ class DFRobot(DisplayImpl): self._display.display(buf) def clear(self): - self._display.Clear(0xFF) \ No newline at end of file + self._display.Clear(0xFF) diff --git a/pwnagotchi/ui/hw/inky.py b/pwnagotchi/ui/hw/inky.py index afa6de5..bb02fd7 100644 --- a/pwnagotchi/ui/hw/inky.py +++ b/pwnagotchi/ui/hw/inky.py @@ -26,7 +26,7 @@ class Inky(DisplayImpl): self._layout['mode'] = (187, 93) self._layout['status'] = { 'pos': (102, 18), - 'font': fonts.Small, + 'font': fonts.status_font(fonts.Small), 'max': 20 } return self._layout diff --git a/pwnagotchi/ui/hw/lcdhat.py b/pwnagotchi/ui/hw/lcdhat.py index 9170a2a..1e76799 100644 --- a/pwnagotchi/ui/hw/lcdhat.py +++ b/pwnagotchi/ui/hw/lcdhat.py @@ -26,7 +26,7 @@ class LcdHat(DisplayImpl): self._layout['mode'] = (215, 109) self._layout['status'] = { 'pos': (125, 20), - 'font': fonts.Medium, + 'font': fonts.status_font(fonts.Medium), 'max': 20 } diff --git a/pwnagotchi/ui/hw/oledhat.py b/pwnagotchi/ui/hw/oledhat.py index 6386d58..1e66a2a 100644 --- a/pwnagotchi/ui/hw/oledhat.py +++ b/pwnagotchi/ui/hw/oledhat.py @@ -26,7 +26,7 @@ class OledHat(DisplayImpl): self._layout['mode'] = (103, 10) self._layout['status'] = { 'pos': (30, 18), - 'font': fonts.Small, + 'font': fonts.status_font(fonts.Small), 'max': 18 } return self._layout diff --git a/pwnagotchi/ui/hw/papirus.py b/pwnagotchi/ui/hw/papirus.py index aa3a297..02004fe 100644 --- a/pwnagotchi/ui/hw/papirus.py +++ b/pwnagotchi/ui/hw/papirus.py @@ -27,7 +27,7 @@ class Papirus(DisplayImpl): self._layout['mode'] = (175, 86) self._layout['status'] = { 'pos': (85, 14), - 'font': fonts.Medium, + 'font': fonts.status_font(fonts.Medium) 'max': 16 } return self._layout diff --git a/pwnagotchi/ui/hw/spotpear24inch.py b/pwnagotchi/ui/hw/spotpear24inch.py index b276d76..73f4b9b 100644 --- a/pwnagotchi/ui/hw/spotpear24inch.py +++ b/pwnagotchi/ui/hw/spotpear24inch.py @@ -27,7 +27,7 @@ class Spotpear24inch(DisplayImpl): self._layout['mode'] = (280, 220) self._layout['status'] = { 'pos': (80, 160), - 'font': fonts.Medium, + 'font': fonts.status_font(fonts.Medium), 'max': 20 } diff --git a/pwnagotchi/ui/hw/waveshare1.py b/pwnagotchi/ui/hw/waveshare1.py index ceff5cf..e1f64b9 100644 --- a/pwnagotchi/ui/hw/waveshare1.py +++ b/pwnagotchi/ui/hw/waveshare1.py @@ -27,7 +27,7 @@ class WaveshareV1(DisplayImpl): self._layout['mode'] = (225, 109) self._layout['status'] = { 'pos': (125, 20), - 'font': fonts.Medium, + 'font': fonts.status_font(fonts.Medium) 'max': 20 } else: @@ -47,7 +47,7 @@ class WaveshareV1(DisplayImpl): self._layout['mode'] = (187, 93) self._layout['status'] = { 'pos': (91, 15), - 'font': fonts.Medium, + 'font': fonts.status_font(fonts.Medium) 'max': 20 } return self._layout diff --git a/pwnagotchi/ui/hw/waveshare144lcd.py b/pwnagotchi/ui/hw/waveshare144lcd.py index 79fc888..0cef5f2 100644 --- a/pwnagotchi/ui/hw/waveshare144lcd.py +++ b/pwnagotchi/ui/hw/waveshare144lcd.py @@ -26,7 +26,7 @@ class Waveshare144lcd(DisplayImpl): self._layout['mode'] = (0, 117) self._layout['status'] = { 'pos': (65, 26), - 'font': fonts.Small, + 'font': fonts.status_font(fonts.Small), 'max': 12 } return self._layout diff --git a/pwnagotchi/ui/hw/waveshare154inch.py b/pwnagotchi/ui/hw/waveshare154inch.py index 52c48f9..0ff5610 100644 --- a/pwnagotchi/ui/hw/waveshare154inch.py +++ b/pwnagotchi/ui/hw/waveshare154inch.py @@ -26,7 +26,7 @@ class Waveshare154inch(DisplayImpl): self._layout['mode'] = (170, 187) self._layout['status'] = { 'pos': (5, 90), - 'font': fonts.Medium, + 'font': fonts.status_font(fonts.Medium) 'max': 20 } return self._layout diff --git a/pwnagotchi/ui/hw/waveshare2.py b/pwnagotchi/ui/hw/waveshare2.py index 1b90c87..3c2ad27 100644 --- a/pwnagotchi/ui/hw/waveshare2.py +++ b/pwnagotchi/ui/hw/waveshare2.py @@ -27,7 +27,7 @@ class WaveshareV2(DisplayImpl): self._layout['mode'] = (225, 109) self._layout['status'] = { 'pos': (125, 20), - 'font': fonts.Medium, + 'font': fonts.status_font(fonts.Medium) 'max': 20 } else: @@ -48,7 +48,7 @@ class WaveshareV2(DisplayImpl): self._layout['mode'] = (187, 93) self._layout['status'] = { 'pos': (125, 20), - 'font': fonts.Medium, + 'font': fonts.status_font(fonts.Medium) 'max': 14 } return self._layout diff --git a/pwnagotchi/ui/hw/waveshare213bc.py b/pwnagotchi/ui/hw/waveshare213bc.py index cf5a912..d44cac4 100644 --- a/pwnagotchi/ui/hw/waveshare213bc.py +++ b/pwnagotchi/ui/hw/waveshare213bc.py @@ -26,7 +26,7 @@ class Waveshare213bc(DisplayImpl): self._layout['mode'] = (187, 93) self._layout['status'] = { 'pos': (91, 15), - 'font': fonts.Medium, + 'font': fonts.status_font(fonts.Medium) 'max': 20 } return self._layout diff --git a/pwnagotchi/ui/hw/waveshare213d.py b/pwnagotchi/ui/hw/waveshare213d.py index 7171c28..a8e5d0f 100644 --- a/pwnagotchi/ui/hw/waveshare213d.py +++ b/pwnagotchi/ui/hw/waveshare213d.py @@ -26,7 +26,7 @@ class Waveshare213d(DisplayImpl): self._layout['mode'] = (187, 93) self._layout['status'] = { 'pos': (91, 15), - 'font': fonts.Medium, + 'font': fonts.status_font(fonts.Medium) 'max': 20 } return self._layout diff --git a/pwnagotchi/ui/hw/waveshare27inch.py b/pwnagotchi/ui/hw/waveshare27inch.py index 30f76f3..c3b04c5 100644 --- a/pwnagotchi/ui/hw/waveshare27inch.py +++ b/pwnagotchi/ui/hw/waveshare27inch.py @@ -26,7 +26,7 @@ class Waveshare27inch(DisplayImpl): self._layout['mode'] = (239, 163) self._layout['status'] = { 'pos': (38, 93), - 'font': fonts.Medium, + 'font': fonts.status_font(fonts.Medium) 'max': 40 } return self._layout diff --git a/pwnagotchi/ui/hw/waveshare29inch.py b/pwnagotchi/ui/hw/waveshare29inch.py index 31aac43..c52e047 100644 --- a/pwnagotchi/ui/hw/waveshare29inch.py +++ b/pwnagotchi/ui/hw/waveshare29inch.py @@ -26,7 +26,7 @@ class Waveshare29inch(DisplayImpl): self._layout['mode'] = (268, 114) self._layout['status'] = { 'pos': (130, 25), - 'font': fonts.Medium, + 'font': fonts.status_font(fonts.Medium) 'max': 28 } return self._layout diff --git a/pwnagotchi/ui/view.py b/pwnagotchi/ui/view.py index bc7f191..974a968 100644 --- a/pwnagotchi/ui/view.py +++ b/pwnagotchi/ui/view.py @@ -54,9 +54,9 @@ class View(object): 'line1': Line(self._layout['line1'], color=BLACK), 'line2': Line(self._layout['line2'], color=BLACK), - 'face': Text(value=faces.SLEEP, position=self._layout['face'], color=BLACK, font=fonts.FaceHuge), + 'face': Text(value=faces.SLEEP, position=self._layout['face'], color=BLACK, font=fonts.Huge), - 'friend_face': Text(value=None, position=self._layout['friend_face'], font=fonts.FaceBold, color=BLACK), + 'friend_face': Text(value=None, position=self._layout['friend_face'], font=fonts.Bold, color=BLACK), 'friend_name': Text(value=None, position=self._layout['friend_name'], font=fonts.BoldSmall, color=BLACK),