Unite all scroll hint drawing functions into one.

[plomrogue] / windows.h

diff --git a/windows.h b/windows.h
index e3f4eb684fb21f4d5659fe816bfd7dc441df10ac..2080ef3c5257b95fac71bd7ef5900f56245d9e00 100644 (file)
--- a/windows.h
+++ b/windows.h
@@ -1,41 +1,35 @@
+struct yx_uint16 {
+  uint16_t y;
+  uint16_t x; };
+
+struct Frame {
+  WINDOW * curses_win;
+  struct yx_uint16 size; };
+
 struct WinMeta {
+  WINDOW * screen;
+  uint16_t pad_offset;
+  struct Frame pad;
   struct Win * chain_start;
   struct Win * chain_end;
-  struct Win * active;
-  int height; };
+  struct Win * active; };
 
 struct Win {
   struct Win * prev;
   struct Win * next;
-  int width;
-  int height;
-  WINDOW * curses_win;
+  struct yx_uint16 start;
+  struct Frame frame;
   char * title;
   void (* draw) (struct Win *);
   void * data; };
 
-struct yx {
-  int y;
-  int x; };
-
-struct Corners {
-  struct yx tl;
-  struct yx tr;
-  struct yx bl;
-  struct yx br; };
-
-struct  WinMeta init_win_meta (WINDOW *);
-struct Win init_window (struct WinMeta *, char *);
-void append_window (struct WinMeta *, struct Win *);
-void suspend_window (struct WinMeta *, struct Win *);
-struct yx place_window (struct WinMeta *, struct Win *);
-void update_windows (struct WinMeta *, struct Win *);
-void destroy_window (struct Win *);
-void draw_window(struct Win *);
-void draw_windows (struct Win *);
-void draw_windows_borders (struct Win *, struct Win *, struct Corners *, int);
-void draw_window_borders (struct Win *, char);
-void draw_all_windows (struct WinMeta *);
-void resize_window (struct WinMeta *, char);
-void cycle_active_window (struct WinMeta *, char);
-void shift_window (struct WinMeta *, char);
+extern struct WinMeta init_win_meta (WINDOW *);
+extern struct Win init_window (struct WinMeta *, char *, void *, void *);
+extern void append_window (struct WinMeta *, struct Win *);
+extern void suspend_window (struct WinMeta *, struct Win *);
+extern void draw_scroll_hint (struct Frame *, uint16_t, uint32_t, char);
+extern void draw_all_windows (struct WinMeta *);
+extern void resize_active_window (struct WinMeta *, uint16_t, uint16_t);
+extern void cycle_active_window (struct WinMeta *, char);
+extern void shift_active_window (struct WinMeta *, char);
+extern void reset_pad_offset (struct WinMeta *, uint16_t);