Remove clear screen before displaying menu

[lightcards.git] / lightcards / display.py

diff --git a/lightcards/display.py b/lightcards/display.py
index 0e58870fb7c907e9a34d1fa033723fe6d25c9f8f..54277d36756064184933ae2ded8a924a11744947 100755 (executable)
--- a/lightcards/display.py
+++ b/lightcards/display.py
@@ -2,6 +2,9 @@
 # Armaan Bhojwani 2021
 
 import curses
+from random import shuffle
+import sys
+import textwrap
 
 
 def disp_bar(stdscr, stack, headers, obj):
@@ -11,6 +14,7 @@ def disp_bar(stdscr, stack, headers, obj):
     else:
         percent = str(round(obj.getIdx() / (len(stack) - 1) * 100)).zfill(3)
 
+    curses.init_pair(1, curses.COLOR_CYAN, 0)
     stdscr.insstr(mlines - 1, 0,
                   "[" +
                   stack[obj.getIdx()].printStar() +
@@ -23,17 +27,24 @@ def disp_bar(stdscr, stack, headers, obj):
                   ")]" +
                   " [" +
                   headers[obj.getSide()] +
-                  "]")
+                  "]", curses.color_pair(1))
 
 
 def disp_menu(stdscr, stack, headers, idx):
-    stdscr.addstr("Good job, you've completed a round!\n\n" +
-                  "Choose one of the following options:\n" +
-                  "[r]estart, [s]tarred only, [u]nstar all and restart, [q]uit")
+    curses.init_pair(1, curses.COLOR_CYAN, 0)
+    curses.init_pair(2, curses.COLOR_RED, 0)
+    stdscr.addstr("Good job, you've completed a round!\n\n",
+                  curses.color_pair(1))
+    stdscr.addstr("Choose one of the following options:\n" +
+                  "[r]: restart\n" +
+                  "[s]: restart with starred only\n" +
+                  "[u]: restart and unstar all\n" +
+                  "[z]: restart and shuffle cards\n" +
+                  "[q]: quit")
     while True:
         key = stdscr.getkey()
         if key == "q":
-            exit(0)
+            sys.exit(0)
         elif key == "r":
             idx.setIdx(0)
             get_key(stdscr, stack, headers, idx)
@@ -54,20 +65,47 @@ def disp_menu(stdscr, stack, headers, idx):
                 get_key(stdscr, stack, headers, idx)
             else:
                 stdscr.clear()
-                stdscr.addstr("ERR: Stack empty. Choose another option\n\n")
+                stdscr.addstr("ERR: Stack empty. Choose another option\n\n",
+                              curses.color_pair(2))
                 disp_menu(stdscr, stack, headers, idx)
+        elif key == "z":
+            idx.setIdx(0)
+            shuffle(stack)
+            get_key(stdscr, stack, headers, idx)
 
 
 def disp_card(stdscr, stack, headers, obj):
     stdscr.clear()
+    (mlines, mcols) = stdscr.getmaxyx()
     if obj.getIdx() == len(stack):
         disp_menu(stdscr, stack, headers, obj)
     else:
-        side_title = headers[obj.getSide()]
-        stdscr.addstr(side_title + "\n")
-        for i in range(len(side_title)):
-            stdscr.addch("=")
-        stdscr.addstr("\n" + str(stack[obj.getIdx()][obj.getSide()]))
+        if obj.getSide() == 0:
+            top = headers[obj.getSide()] + "; " + str(obj.getIdx() + 1)
+        else:
+            top = headers[obj.getSide()] + "; " + str(obj.getIdx() + 1) + \
+                "; " + str(stack[obj.getIdx()][0])
+
+        header_width = mcols
+        if mcols > 80:
+            header_width = 80
+
+        stdscr.addstr(textwrap.shorten(top, width=header_width,
+                                       placeholder="…"), curses.A_BOLD)
+
+        # Add horizontal line
+        lin_width = mcols
+        if len(top) < mcols:
+            lin_width = len(top)
+        stdscr.hline(1, 0, curses.ACS_HLINE, lin_width)
+
+        # Show current side
+        wrap_width = mcols
+        if mcols > 80:
+            wrap_width = 80
+        stdscr.hline(curses.ACS_HLINE, lin_width)
+        stdscr.addstr(2, 0, textwrap.fill(stack[obj.getIdx()][obj.getSide()],
+                                          width=wrap_width))
     disp_bar(stdscr, stack, headers, obj)
 
 
@@ -78,7 +116,7 @@ def get_key(stdscr, stack, headers, idx):
     while True:
         key = stdscr.getkey()
         if key == "q":
-            exit(0)
+            sys.exit(0)
         elif key in ["l", "KEY_LEFT"]:
             idx.forward(stack)
             idx.setSide(0)
@@ -93,3 +131,9 @@ def get_key(stdscr, stack, headers, idx):
         elif key in ["i", "/"]:
             stack[idx.getIdx()].toggleStar()
             disp_card(stdscr, stack, headers, idx)
+        elif key in ["0", "^", "KEY_HOME"]:
+            idx.setIdx(0)
+            disp_card(stdscr, stack, headers, idx)
+        elif key in ["$", "KEY_END"]:
+            idx.setIdx(len(stack) - 1)
+            disp_card(stdscr, stack, headers, idx)