menu.py

@@ -19,14 +19,12 @@ from screensavers import ClockScreensaver
 class ButtonDef(TypedDict):
     text: str
     cbk: Callable[[], None]
-    is_empty: bool
 
 
 class ActionType(Enum):
     MSG = auto()   # Shows a message for about 5 seconds
     GET = auto()   # Performs a HTTP GET
     QUIT = auto()  # Quits an application
-    EMPTY = auto()  # Shows nothing instead of a button
 
 
 class Action(TypedDict):
@@ -58,7 +56,7 @@ class MultilineText:
             current_top += rect.top + self.VMARGIN
 
 
-class Button(IBoard):
+class Button:
     PRESS_OFFSET = 2
     HOVER_ANIMATION_STEPS = 5
 
@@ -110,7 +108,7 @@ class Button(IBoard):
                                self.text_pos.width, self.text_pos.height)
         return self.text_pos
 
-    def draw(self, screen: pygame.Surface, _):
+    def draw(self, screen: pygame.Surface):
         pygame.draw.rect(screen, self.get_bg_color(), self.get_position(), 0)
         self.label.render_to(screen, self.get_text_pos(), self.theme["btn_text_color"])
 
@@ -149,22 +147,13 @@ class MenuBoard(IBoard):
     BUTTON_MARGINS = 10
 
     def __init__(self, screen_rect: pygame.Rect, buttons: List[ButtonDef], theme: Dict):
-        def generate_buttons(button_positions_generator):
-            def impl(data: ButtonDef) -> Optional[IBoard]:
-                if data['is_empty']:
-                    next(button_positions)
-                    return None
-                else:
-                    return Button(next(button_positions), data['text'], theme, data['cbk'])
-            return impl
-
         self.rows = math.floor(math.sqrt(len(buttons)))
         self.cols = math.ceil(math.sqrt(len(buttons)))
         if (self.rows * self.cols) < len(buttons):
             # extra row if buttons don't fit
             self.rows += 1
         button_positions = self.generate_button_positions(screen_rect)
-        self.buttons = list(filter(lambda x: x is not None, map(generate_buttons(button_positions), buttons)))
+        self.buttons = list(map(lambda d: Button(next(button_positions), d['text'], theme, d['cbk']), buttons))
         self.theme = theme
 
     def generate_button_positions(self, screen_rect: pygame.Rect):
@@ -189,7 +178,7 @@ class MenuBoard(IBoard):
         if force_redraw or any(map(Button.needs_redrawing, self.buttons)):
             screen.fill(self.theme["menu_bg_color"])
             for b in self.buttons:
-                b.draw(screen, force_redraw)
+                b.draw(screen)
 
 
 class App:
@@ -197,8 +186,7 @@ class App:
     SHOW_REQUEST_MESSAGE_FOR_AT_LEAST_S = 5
     IGNORE_EVENTS_FOR_TICKS_AFTER_SCREENSAVER = 5
 
-    def __init__(self, actions: List[Action], theme: Dict, fullscreen: bool, screensaver_delay: int,
+    def __init__(self, actions: List[Action], theme: Dict, fullscreen: bool, screensaver_delay: int):
-                 hide_cursor: bool):
         pygame.init()
         info = pygame.display.Info()
         flags = 0
@@ -208,16 +196,11 @@ class App:
         self.clock = pygame.time.Clock()
         self.running = False
         self.theme = theme
-        buttons = list(map(lambda u: ButtonDef(text=u['label'],
+        buttons = list(map(lambda u: ButtonDef(text=u['label'], cbk=self.button_press_handler(u)), actions))
-                                               cbk=self.button_press_handler(u),
-                                               is_empty=(u['action_type'] == ActionType.EMPTY)),
-                           actions))
         self.board: IBoard = MenuBoard(self.get_screen_rect(), buttons, theme)
         self.task_q = Queue()
         self.screensaver = ClockScreensaver()
         self.TICKS_UNTIL_SCREENSAVER = screensaver_delay * self.FPS
-        if hide_cursor:
-            pygame.mouse.set_visible(False)
 
     def get_screen_rect(self) -> pygame.Rect:
         return pygame.Rect(0, 0, self.screen.get_width(), self.screen.get_height())
@@ -275,8 +258,6 @@ class App:
             return self.get_handler(action)
         elif action['action_type'] == ActionType.QUIT:
             return self.quit
-        elif action['action_type'] == ActionType.EMPTY:
-            return lambda: print("Tried to do an action on EMPTY - shouldn't happen")
         raise NotImplementedError(action['action_type'])
 
     def loop(self):
@@ -323,7 +304,7 @@ class App:
 def get_url_defs(config_data: dict) -> List[Action]:
     url_defs = []
     for d in data['actions']:
-        url_defs.append(Action(label=d.get('label'),
+        url_defs.append(Action(label=d['label'],
                                action_type=ActionType[d['action_type']],
                                action_param=d.get('action_param'),
                                action_message=str(d.get('action_message'))))
@@ -336,7 +317,6 @@ if __name__ == '__main__':
     parser.add_argument("--no-fullscreen", help="Fullscreen", action='store_true')
     parser.add_argument("--screensaver-delay", help="Screensaver delay, in seconds. Default=30",
                         type=int, default=30)
-    parser.add_argument("--no-cursor", help="Hide the mouse cursor", action='store_true')
     args = parser.parse_args()
 
     url_defs: List[Action] = []
@@ -345,5 +325,5 @@ if __name__ == '__main__':
         url_defs = get_url_defs(data)
 
     app = App(url_defs, theme=data["theme"], fullscreen=not args.no_fullscreen,
-              screensaver_delay=args.screensaver_delay, hide_cursor=args.no_cursor)
+              screensaver_delay=args.screensaver_delay)
     app.loop()