X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=client_prototype.py;h=6813207d9d737c69d060edddfa87291c2dba903e;hb=69d3c23f7a68cb653ee27ca9f35144b807b2fc31;hp=31d66f085c70cfd7d6a434d7a65bbffaa8969968;hpb=4efbaf6e0a5936d2bdeaf495db1b49ca9a3724c9;p=plomrogue diff --git a/client_prototype.py b/client_prototype.py index 31d66f0..6813207 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: @@ -113,8 +113,7 @@ def draw_screen(): stdscr.addch(down, right, '+') def draw_window_contents(): - for win in windows: - offset, size, winmap = win["func"]() + def draw_winmap(): stop = [0, 0] for i in range(2): stop[i] = win["size"][i] + offset[i] @@ -127,6 +126,39 @@ def draw_screen(): if (y_in_screen < screen_size[0] and x_in_screen < screen_size[1]): stdscr.addch(y_in_screen, x_in_screen, cell) + def draw_scroll_hints(): + def draw_scroll_string(hint_number): + hint = ' ' + str(hint_number + 1) + ' more ' + unit + ' ' + if len(hint) <= win["size"][ni]: + non_hint_space = win["size"][ni] - len(hint) + hint_offset = int(non_hint_space / 2) + for j in range(win["size"][ni] - non_hint_space): + 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) + 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_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_string(size[i] - offset[i] - win["size"][i]) + for win in windows: + offset, size, winmap = win["func"]() + draw_winmap() + draw_scroll_hints() stdscr.clear() draw_window_border_lines()