Minor code restyling. Important: Renamed win->curses_win to win->curses.

[plomrogue] / windows.h

diff --git a/windows.h b/windows.h
index 059ce5f2e53e3e57b1f881702ca5b48bcfe755f5..779a672ec0f1348016b13ccab09c5d7c42307bc8 100644 (file)
--- a/windows.h
+++ b/windows.h
@@ -1,42 +1,40 @@
 struct WinMeta {
+  WINDOW * screen;
+  WINDOW * pad;
+  int pad_offset;
   struct Win * chain_start;
   struct Win * chain_end;
   struct Win * active;
-  int height;
-  int width; };
+  int width;
+  int height; };
 
 struct Win {
   struct Win * prev;
   struct Win * next;
   int width;
   int height;
-  int start_x;
-  int start_y;
-  WINDOW * curses_win;
-  char border_left;
-  char border_down;
+  WINDOW * curses;
   char * title;
   void (* draw) (struct Win *);
   void * data; };
 
+struct yx {
+  int y;
+  int x; };
+
 struct Corners {
-  int tl_y;
-  int tl_x;
-  int tr_y;
-  int tr_x;
-  int bl_y;
-  int bl_x;
-  int br_y;
-  int br_x; };
+  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 *);
-void place_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);