Refactor the layout logic for the inline and mlist-col layouts into a

couple classes.  Hopefully it will be much easier to tune the layouts
now.

Fixed problem I introduced earlier today that didn't let message pane
use the bottom-most line.  Stole a couple cols from the HUD and one
from the HUD gutter to potentially give to the mlist or to the main
view.  Stole a row from the message area so even 80x24 players get
get one line of monster list

Made the mlist-col layout not so unfair to the main view, and not
truncate the mlist width so much.  It used to pop in if you had an
81-col display; now the display needs to be larger (~95) for it to be
used, but it is a lot more functional.



git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3972 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 2 insertions, 10 deletions

diff --git a/crawl-ref/source/direct.h b/crawl-ref/source/direct.h
index 896cb6d60c..2637a7aa5f 100644
--- a/crawl-ref/source/direct.h
+++ b/crawl-ref/source/direct.h
@@ -40,16 +40,16 @@ private:
 struct crawl_view_geometry
 {
 public:
+    coord_def termp;               // Left-top pos of terminal.
     coord_def termsz;              // Size of the terminal.
     coord_def viewp;               // Left-top pos of viewport.
     coord_def viewsz;              // Size of the viewport (play area).
     coord_def hudp;                // Left-top pos of status area.
-    coord_def hudsz;               // Size of the status area.
+    const coord_def hudsz;         // Size of the status area.
     coord_def msgp;                // Left-top pos of the message pane.
     coord_def msgsz;               // Size of the message pane.
     coord_def mlistp;              // Left-top pos of the monster list.
     coord_def mlistsz;             // Size of the monster list.
-    bool mlist_inline;             // Is the mlist inline or in its own column?
 
     crawl_view_buffer vbuf;        // Buffer for drawing the main game map.
 
@@ -63,14 +63,6 @@ public:
 
     coord_def mousep;              // Where the mouse is.
 
-    static const int message_min_lines = 7;
-    static const int hud_min_width  = 41;
-    static const int hud_min_gutter = 3;
-    static const int hud_max_gutter = 6;
-    static const int mlist_gutter = 1;
-    static const int mlist_min_width = 14;
-    static const int mlist_max_width = 26;
-
 private:
     coord_def last_player_pos;