X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;ds=sidebyside;f=client_prototype.py;h=2340bfed6dbaf8e1b3614ee02b6cbe56026ef3a8;hb=2746c58eafa13e770bbd3447b63bca28ea9f36bc;hp=455688a69fa5b4620361d2a6028f2aa54522f778;hpb=4deb3e9e7afeb98a273e4ed85534ef54a3b94412;p=plomrogue diff --git a/client_prototype.py b/client_prototype.py index 455688a..2340bfe 100644 --- a/client_prototype.py +++ b/client_prototype.py @@ -87,7 +87,7 @@ def draw_screen(): j = win["start"][int(k == 0)] - sep_size if (j >= 0 and j < screen_size[int(k == 0)]): start = win["start"][k] - start = start if start >= 0 else 0 + # start = start if start >= 0 else 0 end = win["start"][k] + win["size"][k] end = end if end < screen_size[k] else screen_size[k] if k: @@ -136,24 +136,21 @@ def draw_screen(): pos_2 = win["start"][ni] + hint_offset + j x, y = (pos_2, pos_1) if ni else (pos_1, pos_2) stdscr.addch(y, x, hint[j], curses.A_REVERSE) + def draw_scroll_arrows(ar1, ar2): + for j in range(win["size"][ni]): + pos_2 = win["start"][ni] + j + x, y = (pos_2, pos_1) if ni else (pos_1, pos_2) + stdscr.addch(y, x, ar1 if ni else ar2, curses.A_REVERSE) for i in range(2): ni = int(i == 0) unit = 'rows' if ni else 'columns' if (offset[i] > 0): pos_1 = win["start"][i] - for j in range(win["size"][ni]): - pos_2 = win["start"][ni] + j - x, y = (pos_2, pos_1) if ni else (pos_1, pos_2) - stdscr.addch(y, x, '^' if ni else '<', - curses.A_REVERSE) + draw_scroll_arrows('^', '<') draw_scroll_string(offset[i]) if (size[i] > offset[i] + win["size"][i]): pos_1 = win["start"][i] + win["size"][i] - 1 - for j in range(win["size"][ni]): - pos_2 = win["start"][ni] + j - x, y = (pos_2, pos_1) if ni else (pos_1, pos_2) - stdscr.addch(y, x, 'v' if ni else '>', - curses.A_REVERSE) + draw_scroll_arrows('v', '>') draw_scroll_string(size[i] - offset[i] - win["size"][i]) for win in windows: offset, size, winmap = win["func"]()