Reorganized Win and WinMeta structs to use a common struct to organize curses window...

[plomrogue] / windows.h

diff --git a/windows.h b/windows.h
index b5be37f28c4a7742ca6d455706f5b2b4d482df63..757386ade0746fee8c700a7b7d001e85f5c4d44e 100644 (file)
--- a/windows.h
+++ b/windows.h
@@ -2,28 +2,28 @@ struct yx_uint16 {
   uint16_t y;
   uint16_t x; };
 
+struct Frame {
+  WINDOW * curses_win;
+  struct yx_uint16 size; };
+
 struct WinMeta {
   WINDOW * screen;
-  WINDOW * pad;
-  uint16_t  pad_offset;
+  uint16_t pad_offset;
+  struct Frame pad;
   struct Win * chain_start;
   struct Win * chain_end;
-  struct Win * active;
-  uint16_t width;
-  uint16_t height; };
+  struct Win * active; };
 
 struct Win {
   struct Win * prev;
   struct Win * next;
   struct yx_uint16 start;
-  uint16_t width;
-  uint16_t height;
-  WINDOW * curses;
+  struct Frame frame;
   char * title;
   void (* draw) (struct Win *);
   void * data; };
 
-extern struct  WinMeta init_win_meta (WINDOW *);
+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 *);