Simplify PR_* redraw code and remove direct references to Term members

37 files changed, 350 insertions, 620 deletions

diff --git a/src/bldg.cc b/src/bldg.cc
index 2a87f035..17899fc9 100644
--- a/src/bldg.cc
+++ b/src/bldg.cc
@@ -2225,7 +2225,7 @@ void do_cmd_bldg(void)
 	p_ptr->update |= (PU_VIEW | PU_MON_LITE | PU_MONSTERS | PU_BONUS);
 
 	/* Redraw entire screen */
-	p_ptr->redraw |= (PR_BASIC | PR_EXTRA | PR_MAP);
+	p_ptr->redraw |= (PR_FRAME | PR_MAP);
 
 	/* Window stuff */
 	p_ptr->window |= (PW_OVERHEAD);
diff --git a/src/cave.cc b/src/cave.cc
index bb883d26..bf75affe 100644
--- a/src/cave.cc
+++ b/src/cave.cc
@@ -4790,7 +4790,7 @@ void health_track(int m_idx)
 	health_who = m_idx;
 
 	/* Redraw (later) */
-	p_ptr->redraw |= (PR_HEALTH);
+	p_ptr->redraw |= (PR_FRAME);
 }
 
 
@@ -4843,7 +4843,7 @@ void disturb(int stop_search)
 		command_rep = 0;
 
 		/* Redraw the state (later) */
-		p_ptr->redraw |= (PR_STATE);
+		p_ptr->redraw |= (PR_FRAME);
 	}
 
 	/* Cancel Resting */
@@ -4853,7 +4853,7 @@ void disturb(int stop_search)
 		resting = 0;
 
 		/* Redraw the state (later) */
-		p_ptr->redraw |= (PR_STATE);
+		p_ptr->redraw |= (PR_FRAME);
 	}
 
 	/* Cancel running */
@@ -4876,7 +4876,7 @@ void disturb(int stop_search)
 		p_ptr->update |= (PU_BONUS);
 
 		/* Redraw the state */
-		p_ptr->redraw |= (PR_STATE);
+		p_ptr->redraw |= (PR_FRAME);
 	}
 
 	/* Flush the input if requested */
diff --git a/src/cmd1.cc b/src/cmd1.cc
index ff493174..2aacbabd 100644
--- a/src/cmd1.cc
+++ b/src/cmd1.cc
@@ -3405,13 +3405,13 @@ void move_player_aux(int dir, int do_pickup, int run, bool_ disarm)
 		{
 			cmsg_print(TERM_VIOLET, "You leave a trap detected zone.");
 			if (running) msg_print(NULL);
-			p_ptr->redraw |= (PR_DTRAP);
+			p_ptr->redraw |= (PR_FRAME);
 		}
 		else if (!old_dtrap && new_dtrap)
 		{
 			cmsg_print(TERM_L_BLUE, "You enter a trap detected zone.");
 			if (running) msg_print(NULL);
-			p_ptr->redraw |= (PR_DTRAP);
+			p_ptr->redraw |= (PR_FRAME);
 		}
 
 		/* Update stuff */
diff --git a/src/cmd2.cc b/src/cmd2.cc
index 67f25098..f85f90fe 100644
--- a/src/cmd2.cc
+++ b/src/cmd2.cc
@@ -550,7 +550,7 @@ void do_cmd_search(void)
 		command_rep = command_arg - 1;
 
 		/* Redraw the state */
-		p_ptr->redraw |= (PR_STATE);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Cancel the arg */
 		command_arg = 0;
@@ -569,31 +569,9 @@ void do_cmd_search(void)
  */
 void do_cmd_toggle_search(void)
 {
-	/* Stop searching */
-	if (p_ptr->searching)
-	{
-		/* Clear the searching flag */
-		p_ptr->searching = FALSE;
-
-		/* Recalculate bonuses */
-		p_ptr->update |= (PU_BONUS);
-
-		/* Redraw the state */
-		p_ptr->redraw |= (PR_STATE);
-	}
-
-	/* Start searching */
-	else
-	{
-		/* Set the searching flag */
-		p_ptr->searching = TRUE;
-
-		/* Update stuff */
-		p_ptr->update |= (PU_BONUS);
-
-		/* Redraw stuff */
-		p_ptr->redraw |= (PR_STATE | PR_SPEED);
-	}
+	p_ptr->update |= (PU_BONUS);
+	p_ptr->redraw |= (PR_FRAME);
+	p_ptr->searching = !p_ptr->searching;
 }
 
 
@@ -1166,7 +1144,7 @@ void do_cmd_open(void)
 		command_rep = command_arg - 1;
 
 		/* Redraw the state */
-		p_ptr->redraw |= (PR_STATE);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Cancel the arg */
 		command_arg = 0;
@@ -1333,7 +1311,7 @@ void do_cmd_close(void)
 		command_rep = command_arg - 1;
 
 		/* Redraw the state */
-		p_ptr->redraw |= (PR_STATE);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Cancel the arg */
 		command_arg = 0;
@@ -1769,7 +1747,7 @@ void do_cmd_tunnel(void)
 		command_rep = command_arg - 1;
 
 		/* Redraw the state */
-		p_ptr->redraw |= (PR_STATE);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Cancel the arg */
 		command_arg = 0;
@@ -2176,7 +2154,7 @@ void do_cmd_disarm(void)
 		command_rep = command_arg - 1;
 
 		/* Redraw the state */
-		p_ptr->redraw |= (PR_STATE);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Cancel the arg */
 		command_arg = 0;
@@ -2387,7 +2365,7 @@ void do_cmd_bash(void)
 		command_rep = command_arg - 1;
 
 		/* Redraw the state */
-		p_ptr->redraw |= (PR_STATE);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Cancel the arg */
 		command_arg = 0;
@@ -2475,7 +2453,7 @@ void do_cmd_alter(void)
 		command_rep = command_arg - 1;
 
 		/* Redraw the state */
-		p_ptr->redraw |= (PR_STATE);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Cancel the arg */
 		command_arg = 0;
@@ -2657,7 +2635,7 @@ static void do_cmd_walk_jump(int pickup, bool_ disarm)
 		command_rep = command_arg - 1;
 
 		/* Redraw the state */
-		p_ptr->redraw |= (PR_STATE);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Cancel the arg */
 		command_arg = 0;
@@ -2779,7 +2757,7 @@ void do_cmd_stay(int pickup)
 		command_rep = command_arg - 1;
 
 		/* Redraw the state */
-		p_ptr->redraw |= (PR_STATE);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Cancel the arg */
 		command_arg = 0;
@@ -2901,7 +2879,7 @@ void do_cmd_rest(void)
 	p_ptr->update |= (PU_BONUS);
 
 	/* Redraw the state */
-	p_ptr->redraw |= (PR_STATE);
+	p_ptr->redraw |= (PR_FRAME);
 
 	/* Handle stuff */
 	handle_stuff();
@@ -4231,7 +4209,7 @@ void do_cmd_unwalk()
 		command_rep = command_arg - 1;
 
 		/* Redraw the state */
-		p_ptr->redraw |= (PR_STATE);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Cancel the arg */
 		command_arg = 0;
@@ -4573,13 +4551,13 @@ void do_cmd_immovable_special(void)
 		if (lose_sp)
 		{
 			p_ptr->csp -= lose_sp;
-			p_ptr->redraw |= (PR_MANA);
+			p_ptr->redraw |= (PR_FRAME);
 		}
 
 		if (lose_hp)
 		{
 			p_ptr->chp -= lose_hp;
-			p_ptr->redraw |= (PR_HP);
+			p_ptr->redraw |= (PR_FRAME);
 		}
 
 		energy_use = 100;
@@ -5071,7 +5049,7 @@ void do_cmd_steal()
 			p_ptr->au += o_list[item].pval;
 
 			/* Redraw gold */
-			p_ptr->redraw |= (PR_GOLD);
+			p_ptr->redraw |= (PR_FRAME);
 
 			/* Window stuff */
 			p_ptr->window |= (PW_PLAYER);
diff --git a/src/cmd3.cc b/src/cmd3.cc
index 6b618cb8..f5ab201e 100644
--- a/src/cmd3.cc
+++ b/src/cmd3.cc
@@ -446,7 +446,7 @@ void do_cmd_wield(void)
 	p_ptr->update |= (PU_MANA | PU_SPELLS);
 
 	/* Redraw monster hitpoint */
-	p_ptr->redraw |= (PR_MH);
+	p_ptr->redraw |= (PR_FRAME);
 
 	p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
 }
@@ -496,7 +496,7 @@ void do_cmd_takeoff(void)
 	/* Recalculate hitpoint */
 	p_ptr->update |= (PU_HP);
 
-	p_ptr->redraw |= (PR_MH);
+	p_ptr->redraw |= (PR_FRAME);
 }
 
 
diff --git a/src/cmd4.cc b/src/cmd4.cc
index e00f5835..9f1bab47 100644
--- a/src/cmd4.cc
+++ b/src/cmd4.cc
@@ -66,7 +66,7 @@ void do_cmd_redraw(void)
 	p_ptr->update |= (PU_MONSTERS);
 
 	/* Redraw everything */
-	p_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP);
+	p_ptr->redraw |= (PR_WIPE | PR_FRAME | PR_MAP);
 
 	/* Window stuff */
 	p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER | PW_M_LIST);
@@ -215,7 +215,7 @@ void do_cmd_change_name(void)
 
 
 	/* Redraw everything */
-	p_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP);
+	p_ptr->redraw |= (PR_WIPE | PR_FRAME | PR_MAP);
 
 	handle_stuff();
 }
diff --git a/src/cmd5.cc b/src/cmd5.cc
index 95ae0346..d2a537df 100644
--- a/src/cmd5.cc
+++ b/src/cmd5.cc
@@ -287,7 +287,7 @@ void do_poly_self(void)
 		check_experience();
 		p_ptr->max_plv = p_ptr->lev;
 
-		p_ptr->redraw |= (PR_BASIC);
+		p_ptr->redraw |= (PR_FRAME);
 
 		p_ptr->update |= (PU_BONUS);
 
@@ -2057,7 +2057,7 @@ int use_symbiotic_power(int r_idx, bool_ great, bool_ only_number, bool_ no_cost
 	}
 
 	/* Redraw mana */
-	p_ptr->redraw |= (PR_MANA);
+	p_ptr->redraw |= (PR_FRAME);
 
 	/* Window stuff */
 	p_ptr->window |= (PW_PLAYER);
diff --git a/src/cmd6.cc b/src/cmd6.cc
index b8a9f1df..025a5c8b 100644
--- a/src/cmd6.cc
+++ b/src/cmd6.cc
@@ -2127,7 +2127,7 @@ static bool_ quaff_potion(int tval, int sval, int pval, int pval2)
 					p_ptr->csp = p_ptr->msp;
 					p_ptr->csp_frac = 0;
 					msg_print("Your feel your head clear.");
-					p_ptr->redraw |= (PR_MANA);
+					p_ptr->redraw |= (PR_FRAME);
 					p_ptr->window |= (PW_PLAYER);
 					ident = TRUE;
 				}
@@ -2401,7 +2401,7 @@ static bool_ quaff_potion(int tval, int sval, int pval, int pval2)
 					set_mimic(time, pval2, (p_ptr->lev * 2) / 3);
 
 					/* Redraw title */
-					p_ptr->redraw |= (PR_TITLE);
+					p_ptr->redraw |= (PR_FRAME);
 
 					/* Recalculate bonuses */
 					p_ptr->update |= (PU_BONUS);
@@ -5392,7 +5392,7 @@ const char *activation_aux(object_type * o_ptr, bool_ doit, int item)
 					}
 
 					/* Redraw mana */
-					p_ptr->redraw |= (PR_MANA);
+					p_ptr->redraw |= (PR_FRAME);
 				}
 
 				take_hit(damroll(1, 12), "perilous secrets");
@@ -5654,7 +5654,7 @@ const char *activation_aux(object_type * o_ptr, bool_ doit, int item)
 					p_ptr->csp = p_ptr->msp;
 					p_ptr->csp_frac = 0;
 					msg_print("Your feel your head clear.");
-					p_ptr->redraw |= (PR_MANA);
+					p_ptr->redraw |= (PR_FRAME);
 					p_ptr->window |= (PW_PLAYER);
 				}
 
diff --git a/src/cmd7.cc b/src/cmd7.cc
index c9be0c66..25b8eb96 100644
--- a/src/cmd7.cc
+++ b/src/cmd7.cc
@@ -715,7 +715,7 @@ void do_cmd_mindcraft(void)
 	}
 
 	/* Redraw mana */
-	p_ptr->redraw |= (PR_MANA);
+	p_ptr->redraw |= (PR_FRAME);
 
 	/* Window stuff */
 	p_ptr->window |= (PW_PLAYER);
@@ -811,7 +811,7 @@ void do_cmd_mimic_lore()
 
 
 	/* Redraw title */
-	p_ptr->redraw |= (PR_TITLE);
+	p_ptr->redraw |= (PR_FRAME);
 
 	/* Recalculate bonuses */
 	p_ptr->update |= (PU_BONUS);
@@ -1124,7 +1124,7 @@ void do_cmd_mimic(void)
 	}
 
 	/* Redraw mana */
-	p_ptr->redraw |= (PR_MANA);
+	p_ptr->redraw |= (PR_FRAME);
 
 	/* Window stuff */
 	p_ptr->window |= (PW_PLAYER);
@@ -3901,7 +3901,7 @@ void do_cmd_alchemist(void)
 
 			/* Redraw gold */
 			p_ptr->au -= i;
-			p_ptr->redraw |= (PR_GOLD);
+			p_ptr->redraw |= (PR_FRAME);
 		}
 
 		/* Set fully identified
@@ -3937,7 +3937,7 @@ void do_cmd_alchemist(void)
 
 			msg_format("Your attempt backfires! Your %s explodes!", o_name);
 			take_hit(damroll(3, level - askill ) , "Alchemical Explosion");
-			p_ptr->redraw |= (PR_HP);
+			p_ptr->redraw |= (PR_FRAME);
 		}
 
 		/* Combine / Reorder the pack (later) */
@@ -4299,7 +4299,7 @@ void do_cmd_pray(void)
 		p_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS | PU_POWERS |
 		                  PU_SANITY | PU_BODY);
 
-		p_ptr->redraw |= PR_PIETY | PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP;
+		p_ptr->redraw |= PR_WIPE | PR_FRAME | PR_MAP;
 		energy_use = 100;
 	}
 }
@@ -4687,7 +4687,7 @@ void do_cmd_powermage(void)
 
 		/* Window stuff */
 		p_ptr->window |= (PW_PLAYER);
-		p_ptr->redraw |= (PR_MANA);
+		p_ptr->redraw |= (PR_FRAME);
 
 		return;
 	}
@@ -4757,7 +4757,7 @@ void do_cmd_powermage(void)
 
 	/* Window stuff */
 	p_ptr->window |= (PW_PLAYER);
-	p_ptr->redraw |= (PR_MANA);
+	p_ptr->redraw |= (PR_FRAME);
 }
 
 
@@ -4944,7 +4944,7 @@ void do_cmd_possessor()
 				p_ptr->chp = 1;
 
 				/* Display the hitpoints */
-				p_ptr->redraw |= (PR_HP);
+				p_ptr->redraw |= (PR_FRAME);
 			}
 		}
 	}
@@ -5338,7 +5338,7 @@ void do_cmd_necromancer(void)
 				p_ptr->chp_frac = 0;
 
 				/* Display the hitpoints */
-				p_ptr->redraw |= (PR_HP);
+				p_ptr->redraw |= (PR_FRAME);
 
 				/* Window stuff */
 				p_ptr->window |= (PW_PLAYER);
@@ -5472,7 +5472,7 @@ void do_cmd_necromancer(void)
 					p_ptr->chp_frac = 0;
 
 					/* Display the hitpoints */
-					p_ptr->redraw |= (PR_HP);
+					p_ptr->redraw |= (PR_FRAME);
 
 					/* Window stuff */
 					p_ptr->window |= (PW_PLAYER);
@@ -5530,7 +5530,7 @@ void do_cmd_necromancer(void)
 	}
 
 	/* Redraw mana */
-	p_ptr->redraw |= (PR_MANA);
+	p_ptr->redraw |= (PR_FRAME);
 
 	/* Window stuff */
 	p_ptr->window |= (PW_PLAYER);
@@ -5762,7 +5762,7 @@ int rune_exec(rune_spell *spell, int cost)
 
 		/* Window stuff */
 		p_ptr->window |= (PW_PLAYER);
-		p_ptr->redraw |= (PR_MANA);
+		p_ptr->redraw |= (PR_FRAME);
 		return (mana_used);
 	}
 
@@ -5854,7 +5854,7 @@ int rune_exec(rune_spell *spell, int cost)
 
 	/* Window stuff */
 	p_ptr->window |= (PW_PLAYER);
-	p_ptr->redraw |= (PR_MANA);
+	p_ptr->redraw |= (PR_FRAME);
 
 	return (mana_used);
 }
@@ -6004,7 +6004,7 @@ void do_cmd_rune(void)
 
 	/* Window stuff */
 	p_ptr->window |= (PW_PLAYER);
-	p_ptr->redraw |= (PR_MANA);
+	p_ptr->redraw |= (PR_FRAME);
 }
 
 
@@ -6264,7 +6264,7 @@ void do_cmd_rune_cast()
 
 	/* Window stuff */
 	p_ptr->window |= (PW_PLAYER);
-	p_ptr->redraw |= (PR_MANA);
+	p_ptr->redraw |= (PR_FRAME);
 }
 
 
@@ -6343,7 +6343,7 @@ void do_cmd_runestone()
 
 	/* Window stuff */
 	p_ptr->window |= (PW_PLAYER);
-	p_ptr->redraw |= (PR_MANA);
+	p_ptr->redraw |= (PR_FRAME);
 }
 
 
@@ -6387,7 +6387,7 @@ void do_cmd_rune_add_mem()
 
 	/* Window stuff */
 	p_ptr->window |= (PW_PLAYER);
-	p_ptr->redraw |= (PR_MANA);
+	p_ptr->redraw |= (PR_FRAME);
 }
 
 
@@ -6490,7 +6490,7 @@ void do_cmd_rune_carve()
 
 	/* Window stuff */
 	p_ptr->window |= (PW_PLAYER);
-	p_ptr->redraw |= (PR_MANA);
+	p_ptr->redraw |= (PR_FRAME);
 }
 
 
@@ -6532,7 +6532,7 @@ void do_cmd_rune_del()
 
 	/* Window stuff */
 	p_ptr->window |= (PW_PLAYER);
-	p_ptr->redraw |= (PR_MANA);
+	p_ptr->redraw |= (PR_FRAME);
 }
 
 
@@ -7415,14 +7415,11 @@ void do_cmd_symbiotic(void)
 				p_ptr->chp = (percent1 * p_ptr->mhp) / 100;
 				o_ptr->pval2 = (percent1 * o_ptr->pval3) / 100;
 
-				/* Redraw */
-				p_ptr->redraw |= (PR_HP);
-
 				/* Window stuff */
 				p_ptr->window |= (PW_PLAYER);
 
 				/* Display the monster hitpoints */
-				p_ptr->redraw |= (PR_MH);
+				p_ptr->redraw |= (PR_FRAME);
 
 				break;
 			}
@@ -7460,7 +7457,7 @@ void do_cmd_symbiotic(void)
 				msg_format("%s is healed.", symbiote_name(TRUE));
 
 				/* Display the monster hitpoints */
-				p_ptr->redraw |= (PR_MH);
+				p_ptr->redraw |= (PR_FRAME);
 
 				break;
 			}
@@ -7557,7 +7554,7 @@ void do_cmd_symbiotic(void)
 	}
 
 	/* Redraw mana */
-	p_ptr->redraw |= (PR_MANA);
+	p_ptr->redraw |= (PR_FRAME);
 
 	/* Window stuff */
 	p_ptr->window |= (PW_PLAYER);
diff --git a/src/corrupt.cc b/src/corrupt.cc
index a4c579d4..0b350f82 100644
--- a/src/corrupt.cc
+++ b/src/corrupt.cc
@@ -750,7 +750,7 @@ static bool_ player_allow_corruption(int corruption_idx)
 static void player_set_corruption(int c, bool_ set)
 {
 	p_ptr->corruptions[c] = set;
-	p_ptr->redraw = p_ptr->redraw | PR_BASIC;
+	p_ptr->redraw = p_ptr->redraw | PR_FRAME;
 	p_ptr->update = p_ptr->update | PU_BONUS | PU_TORCH | PU_BODY | PU_POWERS;
 
 }
diff --git a/src/defines.h b/src/defines.h
index b010c962..52f2ed2c 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -615,45 +615,6 @@
 #define ROW_MH                  19
 #define COL_MH                  0       /* "MH xxxxx/xxxxx" */
 
-#define ROW_INFO                (Term->hgt - 4)
-#define COL_INFO                0       /* "xxxxxxxxxxxx" */
-
-#define ROW_CUT                 (Term->hgt - 3)
-#define COL_CUT                 0       /* <cut> */
-
-#define ROW_STUN                (Term->hgt - 2)
-#define COL_STUN                0       /* <stun> */
-
-#define ROW_HUNGRY              (Term->hgt - 1)
-#define COL_HUNGRY              0       /* "Weak" / "Hungry" / "Full" / "Gorged" */
-
-#define ROW_BLIND               (Term->hgt - 1)
-#define COL_BLIND               7       /* "Blind" */
-
-#define ROW_CONFUSED            (Term->hgt - 1)
-#define COL_CONFUSED            13      /* "Conf" */
-
-#define ROW_AFRAID              (Term->hgt - 1)
-#define COL_AFRAID              18      /* "Afraid" */
-
-#define ROW_POISONED            (Term->hgt - 1)
-#define COL_POISONED            25      /* "Poison" */
-
-#define ROW_DTRAP               (Term->hgt - 1)
-#define COL_DTRAP               32      /* "DTrap" */
-
-#define ROW_STATE               (Term->hgt - 1)
-#define COL_STATE               38      /* <state> */
-
-#define ROW_SPEED               (Term->hgt - 1)
-#define COL_SPEED               49      /* "Slow (-NN)" or "Fast (+NN)" */
-
-#define ROW_STUDY               (Term->hgt - 1)
-#define COL_STUDY               60      /* "Study" */
-
-#define ROW_DEPTH               (Term->hgt - 1)
-#define COL_DEPTH               (Term->wid - 14) /* "Lev NNN" / "NNNN ft" */
-
 
 
 /*** Terrain Feature Indexes (see "lib/edit/f_info.txt") ***/
@@ -2233,38 +2194,9 @@
 /*
  * Bit flags for the "p_ptr->redraw" variable
  */
-#define PR_MISC         0x00000001L     /* Display Race/Class */
-#define PR_TITLE        0x00000002L     /* Display Title */
-#define PR_LEV          0x00000004L     /* Display Level */
-#define PR_EXP          0x00000008L     /* Display Experience */
-#define PR_STATS        0x00000010L     /* Display Stats */
-#define PR_ARMOR        0x00000020L     /* Display Armor */
-#define PR_HP           0x00000040L     /* Display Hitpoints */
-#define PR_MANA         0x00000080L     /* Display Mana */
-#define PR_GOLD         0x00000100L     /* Display Gold */
-#define PR_DEPTH        0x00000200L     /* Display Depth */
-/****/
-#define PR_HEALTH       0x00000800L     /* Display Health Bar */
-#define PR_CUT          0x00001000L     /* Display Extra (Cut) */
-#define PR_STUN         0x00002000L     /* Display Extra (Stun) */
-#define PR_HUNGER       0x00004000L     /* Display Extra (Hunger) */
-#define PR_PIETY        0x00008000L     /* Display Piety */
-#define PR_BLIND        0x00010000L     /* Display Extra (Blind) */
-#define PR_CONFUSED     0x00020000L     /* Display Extra (Confused) */
-#define PR_AFRAID       0x00040000L     /* Display Extra (Afraid) */
-#define PR_POISONED     0x00080000L     /* Display Extra (Poisoned) */
-#define PR_STATE        0x00100000L     /* Display Extra (State) */
-#define PR_SPEED        0x00200000L     /* Display Extra (Speed) */
-#define PR_STUDY        0x00400000L     /* Display Extra (Study) */
-#define PR_SANITY       0x00800000L     /* Display Sanity */
-#define PR_EXTRA        0x01000000L     /* Display Extra Info */
-#define PR_BASIC        0x02000000L     /* Display Basic Info */
+#define PR_FRAME        0x02000000L     /* Display Basic Info */
 #define PR_MAP          0x04000000L     /* Display Map */
 #define PR_WIPE         0x08000000L     /* Hack -- Total Redraw */
-#define PR_MH           0x10000000L     /* Display Monster hitpoints */
-#define PR_DTRAP        0x20000000L     /* Display Extra (DTrap) */
-/* xxx */
-/* xxx */
 
 /*
  * Bit flags for the "p_ptr->window" variable (etc)
diff --git a/src/dungeon.cc b/src/dungeon.cc
index b133f7f4..a79fd8b0 100644
--- a/src/dungeon.cc
+++ b/src/dungeon.cc
@@ -633,7 +633,7 @@ static void regenhp(int percent)
 		if (old_chp != p_ptr->chp)
 		{
 			/* Redraw */
-			p_ptr->redraw |= (PR_HP);
+			p_ptr->redraw |= (PR_FRAME);
 
 			/* Window stuff */
 			p_ptr->window |= (PW_PLAYER);
@@ -690,7 +690,7 @@ static void regenmana(int percent)
 	if (old_csp != p_ptr->csp)
 	{
 		/* Redraw */
-		p_ptr->redraw |= (PR_MANA);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Window stuff */
 		p_ptr->window |= (PW_PLAYER);
@@ -738,7 +738,7 @@ static void regen_monsters(void)
 			if (o_ptr->pval2 > o_ptr->pval3) o_ptr->pval2 = o_ptr->pval3;
 
 			/* Redraw (later) */
-			p_ptr->redraw |= (PR_MH);
+			p_ptr->redraw |= (PR_FRAME);
 		}
 	}
 
@@ -775,7 +775,7 @@ static void regen_monsters(void)
 			if (m_ptr->hp > m_ptr->maxhp) m_ptr->hp = m_ptr->maxhp;
 
 			/* Redraw (later) if needed */
-			if (health_who == i) p_ptr->redraw |= (PR_HEALTH);
+			if (health_who == i) p_ptr->redraw |= (PR_FRAME);
 		}
 	}
 }
@@ -937,7 +937,7 @@ static void check_music()
 		p_ptr->csp -= use_mana;
 
 		/* Redraw mana */
-		p_ptr->redraw |= (PR_MANA);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Window stuff */
 		p_ptr->window |= (PW_PLAYER);
@@ -1998,7 +1998,7 @@ static void process_world(void)
 		p_ptr->chp--;
 
 		/* Display the hitpoints */
-		p_ptr->redraw |= (PR_HP);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Window stuff */
 		p_ptr->window |= (PW_PLAYER);
@@ -2873,7 +2873,7 @@ static void process_world(void)
 		}
 
 		/* Redraw */
-		p_ptr->redraw |= (PR_MANA);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Window stuff */
 		p_ptr->window |= (PW_PLAYER);
@@ -2899,7 +2899,7 @@ static void process_world(void)
 		}
 
 		/* Redraw */
-		p_ptr->redraw |= (PR_MANA);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Window stuff */
 		p_ptr->window |= (PW_PLAYER);
@@ -2919,7 +2919,7 @@ static void process_world(void)
 		}
 
 		/* Redraw */
-		p_ptr->redraw |= (PR_HP);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Window stuff */
 		p_ptr->window |= (PW_PLAYER);
@@ -3489,7 +3489,7 @@ static void process_command(void)
 			p_ptr->update |= (PU_MONSTERS);
 
 			/* Redraw "title" */
-			p_ptr->redraw |= (PR_TITLE);
+			p_ptr->redraw |= (PR_FRAME);
 
 			break;
 		}
@@ -3521,7 +3521,7 @@ static void process_command(void)
 		{
 			if (p_ptr->control) break;
 			if (!p_ptr->wild_mode) do_cmd_takeoff();
-			p_ptr->redraw |= (PR_MH);
+			p_ptr->redraw |= (PR_FRAME);
 			break;
 		}
 
@@ -4565,7 +4565,7 @@ void process_player(void)
 			{
 				disturb(0);
 			}
-			p_ptr->redraw |= (PR_STATE);
+			p_ptr->redraw |= (PR_FRAME);
 		}
 	}
 
@@ -4687,7 +4687,7 @@ void process_player(void)
 				resting--;
 
 				/* Redraw the state */
-				p_ptr->redraw |= (PR_STATE);
+				p_ptr->redraw |= (PR_FRAME);
 			}
 
 			p_ptr->did_nothing = TRUE;
@@ -4718,7 +4718,7 @@ void process_player(void)
 			command_rep--;
 
 			/* Redraw the state */
-			p_ptr->redraw |= (PR_STATE);
+			p_ptr->redraw |= (PR_FRAME);
 
 			/* Redraw stuff */
 			redraw_stuff();
@@ -5072,7 +5072,7 @@ static void dungeon(void)
 	p_ptr->window |= (PW_MONSTER);
 
 	/* Redraw dungeon */
-	p_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA);
+	p_ptr->redraw |= (PR_WIPE | PR_FRAME);
 
 	/* Redraw map */
 	p_ptr->redraw |= (PR_MAP);
diff --git a/src/lua_bind.cc b/src/lua_bind.cc
index b56f8dd8..f5758415 100644
--- a/src/lua_bind.cc
+++ b/src/lua_bind.cc
@@ -324,7 +324,7 @@ char lua_msg_box(cptr title)
 void increase_mana(int delta)
 {
 	p_ptr->csp += delta;
-	p_ptr->redraw |= PR_MANA;
+	p_ptr->redraw |= PR_FRAME;
 
 	if (p_ptr->csp < 0)
 	{
diff --git a/src/melee1.cc b/src/melee1.cc
index cc0f8ee3..59c6a9a3 100644
--- a/src/melee1.cc
+++ b/src/melee1.cc
@@ -1955,7 +1955,7 @@ bool_ make_attack_normal(int m_idx, byte divis)
 							if (m_ptr->hp > m_ptr->maxhp) m_ptr->hp = m_ptr->maxhp;
 
 							/* Redraw (later) if needed */
-							if (health_who == m_idx) p_ptr->redraw |= (PR_HEALTH);
+							if (health_who == m_idx) p_ptr->redraw |= (PR_FRAME);
 
 							/* Uncharge */
 							o_ptr->pval = 0;
@@ -2036,7 +2036,7 @@ bool_ make_attack_normal(int m_idx, byte divis)
 						}
 
 						/* Redraw gold */
-						p_ptr->redraw |= (PR_GOLD);
+						p_ptr->redraw |= (PR_FRAME);
 
 						/* Window stuff */
 						p_ptr->window |= (PW_PLAYER);
diff --git a/src/melee2.cc b/src/melee2.cc
index 5b3251ef..a7975638 100644
--- a/src/melee2.cc
+++ b/src/melee2.cc
@@ -39,7 +39,7 @@ bool_ mon_take_hit_mon(int s_idx, int m_idx, int dam, bool_ *fear, cptr note)
 	s32b div, new_exp, new_exp_frac;
 
 	/* Redraw (later) if needed */
-	if (health_who == m_idx) p_ptr->redraw |= (PR_HEALTH);
+	if (health_who == m_idx) p_ptr->redraw |= (PR_FRAME);
 
 	/* Some mosnters are immune to death */
 	if (r_ptr->flags7 & RF7_NO_DEATH) return FALSE;
@@ -1702,7 +1702,7 @@ static bool_ monst_spell_monst(int m_idx)
 						if (m_ptr->hp > m_ptr->maxhp) m_ptr->hp = m_ptr->maxhp;
 
 						/* Redraw (later) if needed */
-						if (health_who == m_idx) p_ptr->redraw |= (PR_HEALTH);
+						if (health_who == m_idx) p_ptr->redraw |= (PR_FRAME);
 
 						/* Special message */
 						if (seen)
@@ -2241,7 +2241,7 @@ static bool_ monst_spell_monst(int m_idx)
 				}
 
 				/* Redraw (later) if needed */
-				if (health_who == m_idx) p_ptr->redraw |= (PR_HEALTH);
+				if (health_who == m_idx) p_ptr->redraw |= (PR_FRAME);
 
 				/* Cancel fear */
 				if (m_ptr->monfear)
@@ -3665,7 +3665,7 @@ bool_ make_attack_spell(int m_idx)
 					}
 
 					/* Redraw mana */
-					p_ptr->redraw |= (PR_MANA);
+					p_ptr->redraw |= (PR_FRAME);
 
 					/* Window stuff */
 					p_ptr->window |= (PW_PLAYER);
@@ -3678,7 +3678,7 @@ bool_ make_attack_spell(int m_idx)
 						if (m_ptr->hp > m_ptr->maxhp) m_ptr->hp = m_ptr->maxhp;
 
 						/* Redraw (later) if needed */
-						if (health_who == m_idx) p_ptr->redraw |= (PR_HEALTH);
+						if (health_who == m_idx) p_ptr->redraw |= (PR_FRAME);
 
 						/* Special message */
 						if (seen)
@@ -4193,7 +4193,7 @@ bool_ make_attack_spell(int m_idx)
 				}
 
 				/* Redraw (later) if needed */
-				if (health_who == m_idx) p_ptr->redraw |= (PR_HEALTH);
+				if (health_who == m_idx) p_ptr->redraw |= (PR_FRAME);
 
 				/* Cancel fear */
 				if (m_ptr->monfear)
@@ -6146,7 +6146,7 @@ static void process_monster(int m_idx, bool_ is_frien)
 				msg_format("%^s is no longer bleeding.", m_name);
 
 				/* Hack -- Update the health bar */
-				if (health_who == m_idx) p_ptr->redraw |= (PR_HEALTH);
+				if (health_who == m_idx) p_ptr->redraw |= (PR_FRAME);
 			}
 		}
 	}
@@ -6185,7 +6185,7 @@ static void process_monster(int m_idx, bool_ is_frien)
 				msg_format("%^s is no longer poisoned.", m_name);
 
 				/* Hack -- Update the health bar */
-				if (health_who == m_idx) p_ptr->redraw |= (PR_HEALTH);
+				if (health_who == m_idx) p_ptr->redraw |= (PR_FRAME);
 			}
 		}
 	}
diff --git a/src/monster1.cc b/src/monster1.cc
index 21d2ac15..8fb8b4a1 100644
--- a/src/monster1.cc
+++ b/src/monster1.cc
@@ -1616,9 +1616,11 @@ void monster_description_out(int r_idx, int ego)
 void display_roff(int r_idx, int ego)
 {
 	int y;
+	int hgt;
+	Term_get_size(nullptr, &hgt);
 
 	/* Erase the window */
-	for (y = 0; y < Term->hgt; y++)
+	for (y = 0; y < hgt; y++)
 	{
 		/* Erase the line */
 		Term_erase(0, y, 255);
diff --git a/src/monster2.cc b/src/monster2.cc
index c9892e49..2f78f8b7 100644
--- a/src/monster2.cc
+++ b/src/monster2.cc
@@ -1862,7 +1862,7 @@ void update_mon(int m_idx, bool_ full)
 			lite_spot(fy, fx);
 
 			/* Update health bar as needed */
-			if (health_who == m_idx) p_ptr->redraw |= (PR_HEALTH);
+			if (health_who == m_idx) p_ptr->redraw |= (PR_FRAME);
 
 			/* Update monster list window */
 			p_ptr->window |= (PW_M_LIST);
@@ -1905,7 +1905,7 @@ void update_mon(int m_idx, bool_ full)
 			lite_spot(fy, fx);
 
 			/* Update health bar as needed */
-			if (health_who == m_idx) p_ptr->redraw |= (PR_HEALTH);
+			if (health_who == m_idx) p_ptr->redraw |= (PR_FRAME);
 
 			/* Update monster list window */
 			p_ptr->window |= (PW_M_LIST);
diff --git a/src/object1.cc b/src/object1.cc
index 4fb3e553..5d819f5f 100644
--- a/src/object1.cc
+++ b/src/object1.cc
@@ -4613,8 +4613,10 @@ void show_inven_aux(bool_ mirror, bool_ everything)
 	/* Shadow windows */
 	if (mirror)
 	{
+		int hgt;
+		Term_get_size(nullptr, &hgt);
 		/* Erase the rest of the window */
-		for (j = row + k; j < Term->hgt; j++)
+		for (j = row + k; j < hgt; j++)
 		{
 			/* Erase the line */
 			Term_erase(0, j, 255);
@@ -4849,8 +4851,10 @@ void show_equip_aux(bool_ mirror, bool_ everything)
 	/* Shadow windows */
 	if (mirror)
 	{
+		int hgt;
+		Term_get_size(nullptr, &hgt);
 		/* Erase the rest of the window */
-		for (j = row + k; j < Term->hgt; j++)
+		for (j = row + k; j < hgt; j++)
 		{
 			/* Erase the line */
 			Term_erase(0, j, 255);
@@ -6029,7 +6033,7 @@ int wear_ammo(object_type *o_ptr)
 	p_ptr->update |= (PU_MANA);
 
 	/* Redraw monster hitpoint */
-	p_ptr->redraw |= (PR_MH);
+	p_ptr->redraw |= (PR_FRAME);
 
 	/* Window stuff */
 	p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
@@ -6263,7 +6267,7 @@ void py_pickup_floor(int pickup)
 			p_ptr->au += o_ptr->pval;
 
 			/* Redraw gold */
-			p_ptr->redraw |= (PR_GOLD);
+			p_ptr->redraw |= (PR_FRAME);
 
 			/* Window stuff */
 			p_ptr->window |= (PW_PLAYER);
diff --git a/src/object2.cc b/src/object2.cc
index 754a6b91..23d3d2b9 100644
--- a/src/object2.cc
+++ b/src/object2.cc
@@ -6381,7 +6381,9 @@ void display_koff(int k_idx)
 
 
 	/* Erase the window */
-	for (y = 0; y < Term->hgt; y++)
+	int hgt;
+	Term_get_size(nullptr, &hgt);
+	for (y = 0; y < hgt; y++)
 	{
 		/* Erase the line */
 		Term_erase(0, y, 255);
diff --git a/src/powers.cc b/src/powers.cc
index d6ecdecf..ba49716f 100644
--- a/src/powers.cc
+++ b/src/powers.cc
@@ -83,7 +83,7 @@ bool_ power_chance(power_type *x_ptr)
 	energy_use = 100;
 
 	/* Redraw mana and hp */
-	p_ptr->redraw |= (PR_HP | PR_MANA);
+	p_ptr->redraw |= (PR_FRAME);
 
 	/* Window stuff */
 	p_ptr->window |= (PW_PLAYER);
@@ -1258,7 +1258,7 @@ static void power_activate(int power)
 		break;
 	}
 
-	p_ptr->redraw |= (PR_HP | PR_MANA);
+	p_ptr->redraw |= (PR_FRAME);
 	p_ptr->window |= (PW_PLAYER);
 }
 
diff --git a/src/q_main.cc b/src/q_main.cc
index f0e6214e..3e4e569f 100644
--- a/src/q_main.cc
+++ b/src/q_main.cc
@@ -45,7 +45,7 @@ static bool_ quest_morgoth_hook(const char *fmt)
 		quest[QUEST_MORGOTH].status = QUEST_STATUS_FINISHED;
 
 		/* Redraw the "title" */
-		p_ptr->redraw |= (PR_TITLE);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Congratulations */
 		if (quest[QUEST_ONE].status == QUEST_STATUS_FINISHED)
diff --git a/src/q_nirna.cc b/src/q_nirna.cc
index d9e178c3..d19491db 100644
--- a/src/q_nirna.cc
+++ b/src/q_nirna.cc
@@ -60,7 +60,7 @@ static bool_ quest_nirnaeth_finish_hook(const char *fmt)
 		p_ptr->au += 200000;
 
 		/* Redraw gold */
-		p_ptr->redraw |= (PR_GOLD);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Window stuff */
 		p_ptr->window |= (PW_PLAYER);
diff --git a/src/q_ultrag.cc b/src/q_ultrag.cc
index 0eb50d15..504fb775 100644
--- a/src/q_ultrag.cc
+++ b/src/q_ultrag.cc
@@ -162,7 +162,7 @@ static bool_ quest_ultra_good_death_hook(const char *fmt)
 		quest[QUEST_ULTRA_GOOD].status = QUEST_STATUS_FINISHED;
 
 		/* Redraw the "title" */
-		p_ptr->redraw |= (PR_TITLE);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Congratulations */
 		cmsg_print(TERM_L_GREEN, "****** CONGRATULATIONS ******");
diff --git a/src/skills.cc b/src/skills.cc
index b5b90d77..6fefd84f 100644
--- a/src/skills.cc
+++ b/src/skills.cc
@@ -402,7 +402,7 @@ void recalc_skills(bool_ init)
 		                  PU_SANITY | PU_BODY);
 
 		/* Redraw various info */
-		p_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP);
+		p_ptr->redraw |= (PR_WIPE | PR_FRAME | PR_MAP);
 	}
 }
 
@@ -732,7 +732,7 @@ static void choose_melee()
 	p_ptr->update |= (PU_HP);
 
 	/* Redraw monster hitpoint */
-	p_ptr->redraw |= (PR_MH);
+	p_ptr->redraw |= (PR_FRAME);
 
 	Term_load();
 	character_icky = FALSE;
@@ -1755,7 +1755,7 @@ void do_cmd_ability()
 	                  PU_SANITY | PU_BODY);
 
 	/* Redraw various info */
-	p_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP);
+	p_ptr->redraw |= (PR_WIPE | PR_FRAME | PR_MAP);
 }
 
 /*
diff --git a/src/spells1.cc b/src/spells1.cc
index 45bea042..1c53fa8e 100644
--- a/src/spells1.cc
+++ b/src/spells1.cc
@@ -571,7 +571,7 @@ void teleport_player(int dis)
 	p_ptr->update |= (PU_DISTANCE);
 
 	/* Redraw trap detection status */
-	p_ptr->redraw |= (PR_DTRAP);
+	p_ptr->redraw |= (PR_FRAME);
 
 	/* Window stuff */
 	p_ptr->window |= (PW_OVERHEAD);
@@ -801,7 +801,7 @@ void teleport_player_to(int ny, int nx)
 	p_ptr->update |= (PU_DISTANCE);
 
 	/* Redraw trap detection status */
-	p_ptr->redraw |= (PR_DTRAP);
+	p_ptr->redraw |= (PR_FRAME);
 
 	/* Window stuff */
 	p_ptr->window |= (PW_OVERHEAD);
@@ -937,7 +937,7 @@ void recall_player(int d, int f)
 		p_ptr->word_recall = 0;
 		msg_print("A tension leaves the air around you...");
 	}
-	p_ptr->redraw |= (PR_DEPTH);
+	p_ptr->redraw |= (PR_FRAME);
 }
 
 
@@ -1325,7 +1325,7 @@ void take_hit(int damage, cptr hit_from)
 		}
 
 		/* Display the mana */
-		p_ptr->redraw |= (PR_MANA);
+		p_ptr->redraw |= (PR_FRAME);
 	}
 
 	/* Hurt the wielded monster if any */
@@ -1341,7 +1341,7 @@ void take_hit(int damage, cptr hit_from)
 			inc_stack_size_ex(INVEN_CARRY, -1, OPTIMIZE, NO_DESCRIBE);
 			damage -= o_ptr->pval2;
 			o_ptr->pval2 = 0;
-			p_ptr->redraw |= PR_MH;
+			p_ptr->redraw |= PR_FRAME;
 		}
 		else
 		{
@@ -1353,14 +1353,14 @@ void take_hit(int damage, cptr hit_from)
 		carried_monster_hit = FALSE;
 
 		/* Display the monster hitpoints */
-		p_ptr->redraw |= (PR_MH);
+		p_ptr->redraw |= (PR_FRAME);
 	}
 
 	/* Hurt the player */
 	if (!monster_take) p_ptr->chp -= damage;
 
 	/* Display the hitpoints */
-	p_ptr->redraw |= (PR_HP);
+	p_ptr->redraw |= (PR_FRAME);
 
 	/* Window stuff */
 	p_ptr->window |= (PW_PLAYER);
@@ -1430,7 +1430,7 @@ void take_hit(int damage, cptr hit_from)
 			do_cmd_wiz_cure_all();
 
 			/* Display the hitpoints */
-			p_ptr->redraw |= (PR_HP);
+			p_ptr->redraw |= (PR_FRAME);
 
 			/* Window stuff */
 			p_ptr->window |= (PW_PLAYER);
@@ -1534,7 +1534,7 @@ void take_sanity_hit(int damage, cptr hit_from)
 	p_ptr->csane -= damage;
 
 	/* Display the hitpoints */
-	p_ptr->redraw |= (PR_SANITY);
+	p_ptr->redraw |= (PR_FRAME);
 
 	/* Window stuff */
 	p_ptr->window |= (PW_PLAYER);
@@ -5419,7 +5419,7 @@ bool_ project_m(int who, int r, int y, int x, int dam, int typ)
 						monster_desc(killer, m_ptr, 0x88);
 						msg_print("Your psychic energy is drained!");
 						p_ptr->csp = MAX(0, p_ptr->csp - damroll(5, dam) / 2);
-						p_ptr->redraw |= PR_MANA;
+						p_ptr->redraw |= PR_FRAME;
 						take_hit(dam, killer);   /* has already been /3 */
 					}
 					dam = 0;
@@ -5432,7 +5432,7 @@ bool_ project_m(int who, int r, int y, int x, int dam, int typ)
 				           m_name, (seen ? "'s" : "s"));
 				b = MIN(p_ptr->msp, p_ptr->csp + b);
 				p_ptr->csp = b;
-				p_ptr->redraw |= PR_MANA;
+				p_ptr->redraw |= PR_FRAME;
 			}
 
 			note_dies = " collapses, a mindless husk.";
@@ -5711,7 +5711,7 @@ bool_ project_m(int who, int r, int y, int x, int dam, int typ)
 			if (m_ptr->hp > m_ptr->maxhp) m_ptr->hp = m_ptr->maxhp;
 
 			/* Redraw (later) if needed */
-			if (health_who == c_ptr->m_idx) p_ptr->redraw |= (PR_HEALTH);
+			if (health_who == c_ptr->m_idx) p_ptr->redraw |= (PR_FRAME);
 
 			/* Message */
 			note = " looks healthier.";
@@ -6725,7 +6725,7 @@ bool_ project_m(int who, int r, int y, int x, int dam, int typ)
 			if (m_ptr->hp > m_ptr->maxhp) m_ptr->hp = m_ptr->maxhp;
 
 			/* Redraw (later) if needed */
-			if (health_who == c_ptr->m_idx) p_ptr->redraw |= (PR_HEALTH);
+			if (health_who == c_ptr->m_idx) p_ptr->redraw |= (PR_FRAME);
 
 			/* Message */
 			note = " looks healthier.";
diff --git a/src/spells2.cc b/src/spells2.cc
index 6b8688b8..4e502d8e 100644
--- a/src/spells2.cc
+++ b/src/spells2.cc
@@ -114,7 +114,7 @@ bool_ hp_player(int num)
 		}
 
 		/* Redraw */
-		p_ptr->redraw |= (PR_HP);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Window stuff */
 		p_ptr->window |= (PW_PLAYER);
@@ -686,7 +686,7 @@ bool_ alchemy(void) /* Turns an object into gold, gain some of its value in a sh
 		p_ptr->au += price;
 
 		/* Redraw gold */
-		p_ptr->redraw |= (PR_GOLD);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Window stuff */
 		p_ptr->window |= (PW_PLAYER);
@@ -2016,7 +2016,7 @@ bool_ detect_traps(int rad)
 	 * item is used and return FALSE there are none,
 	 * followed by current implementation --pelpel
 	 */
-	p_ptr->redraw |= (PR_DTRAP);
+	p_ptr->redraw |= (PR_FRAME);
 
 	/* Result -- see my comment above -- pelpel */
 	/* return (detect); */
@@ -5171,7 +5171,7 @@ bool_ genocide_aux(bool_ player_cast, char typ)
 		move_cursor_relative(p_ptr->py, p_ptr->px);
 
 		/* Redraw */
-		p_ptr->redraw |= (PR_HP);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Window stuff */
 		p_ptr->window |= (PW_PLAYER);
@@ -5296,7 +5296,7 @@ bool_ mass_genocide(bool_ player_cast)
 		move_cursor_relative(p_ptr->py, p_ptr->px);
 
 		/* Redraw */
-		p_ptr->redraw |= (PR_HP);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Window stuff */
 		p_ptr->window |= (PW_PLAYER);
@@ -6014,7 +6014,7 @@ void earthquake(int cy, int cx, int r)
 	p_ptr->update |= (PU_DISTANCE);
 
 	/* Update the health bar */
-	p_ptr->redraw |= (PR_HEALTH);
+	p_ptr->redraw |= (PR_FRAME);
 
 	/* Redraw map */
 	p_ptr->redraw |= (PR_MAP);
@@ -6573,7 +6573,7 @@ void teleport_swap(int dir)
 			p_ptr->update |= (PU_DISTANCE);
 
 			/* Redraw trap detection status */
-			p_ptr->redraw |= (PR_DTRAP);
+			p_ptr->redraw |= (PR_FRAME);
 
 			/* Window stuff */
 			p_ptr->window |= (PW_OVERHEAD);
@@ -6626,7 +6626,7 @@ void swap_position(int lty, int ltx)
 		p_ptr->update |= (PU_DISTANCE);
 
 		/* Redraw trap detection status */
-		p_ptr->redraw |= (PR_DTRAP);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Window stuff */
 		p_ptr->window |= (PW_OVERHEAD);
@@ -6675,7 +6675,7 @@ void swap_position(int lty, int ltx)
 		p_ptr->update |= (PU_DISTANCE);
 
 		/* Redraw trap detection status */
-		p_ptr->redraw |= (PR_DTRAP);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Window stuff */
 		p_ptr->window |= (PW_OVERHEAD);
@@ -7719,7 +7719,7 @@ bool_ heal_insanity(int val)
 			p_ptr->csane_frac = 0;
 		}
 
-		p_ptr->redraw |= PR_SANITY;
+		p_ptr->redraw |= (PR_FRAME);
 		p_ptr->window |= (PW_PLAYER);
 
 		if (val < 5)
@@ -7829,7 +7829,7 @@ bool_ passwall(int dir, bool_ safe)
 	p_ptr->update |= (PU_DISTANCE);
 
 	/* Redraw trap detection status */
-	p_ptr->redraw |= (PR_DTRAP);
+	p_ptr->redraw |= (PR_FRAME);
 
 	/* Window stuff */
 	p_ptr->window |= (PW_OVERHEAD);
diff --git a/src/spells3.cc b/src/spells3.cc
index 96f103c0..69b05aad 100644
--- a/src/spells3.cc
+++ b/src/spells3.cc
@@ -2142,7 +2142,7 @@ void do_melkor_curse(int m_idx)
 			m_ptr->hp = m_ptr->maxhp;
 		}
 
-		p_ptr->redraw |= PR_HEALTH;
+		p_ptr->redraw |= PR_FRAME;
 	}
 
 	if (get_level_s(MELKOR_CURSE, 50) >= 25)
diff --git a/src/spells4.cc b/src/spells4.cc
index 9f5193ef..ccf9e858 100644
--- a/src/spells4.cc
+++ b/src/spells4.cc
@@ -626,6 +626,6 @@ void lua_cast_school_spell(s32b s, bool_ no_cost)
 	}
 
 	/* Refresh player */
-	p_ptr->redraw |= PR_MANA;
+	p_ptr->redraw |= PR_FRAME;
 	p_ptr->window |= PW_PLAYER;
 }
diff --git a/src/status.cc b/src/status.cc
index 650a4ace..dc0a1cac 100644
--- a/src/status.cc
+++ b/src/status.cc
@@ -429,7 +429,7 @@ void status_main()
 	}
 	Term_load();
 	character_icky = FALSE;
-	p_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP);
+	p_ptr->redraw |= (PR_WIPE | PR_FRAME | PR_MAP);
 	handle_stuff();
 }
 
diff --git a/src/store.cc b/src/store.cc
index 5f97c5be..b65ffdfe 100644
--- a/src/store.cc
+++ b/src/store.cc
@@ -3410,7 +3410,7 @@ void do_cmd_store(void)
 	p_ptr->update |= (PU_MONSTERS);
 
 	/* Redraw entire screen */
-	p_ptr->redraw |= (PR_BASIC | PR_EXTRA);
+	p_ptr->redraw |= (PR_FRAME);
 
 	/* Redraw map */
 	p_ptr->redraw |= (PR_MAP);
@@ -3863,7 +3863,7 @@ void do_cmd_home_trump(void)
 	p_ptr->update |= (PU_MONSTERS);
 
 	/* Redraw entire screen */
-	p_ptr->redraw |= (PR_BASIC | PR_EXTRA);
+	p_ptr->redraw |= (PR_FRAME);
 
 	/* Redraw map */
 	p_ptr->redraw |= (PR_MAP);
@@ -3887,7 +3887,7 @@ static void pay_for_requested_item(int value, object_type *q_ptr)
 				msg_print("The item has arrived in the Black Market.");
 				p_ptr->au -= value;
 
-				p_ptr->redraw |= PR_GOLD;
+				p_ptr->redraw |= PR_FRAME;
 			}
 			else
 				msg_print("There isn't enough room for it.");
diff --git a/src/traps.cc b/src/traps.cc
index bb56bb20..716e8bd6 100644
--- a/src/traps.cc
+++ b/src/traps.cc
@@ -346,7 +346,7 @@ static bool_ player_handle_trap_of_walls(void)
 	p_ptr->update |= (PU_DISTANCE);
 
 	/* Update the health bar */
-	p_ptr->redraw |= (PR_HEALTH);
+	p_ptr->redraw |= (PR_FRAME);
 
 	/* Redraw map */
 	p_ptr->redraw |= (PR_MAP);
@@ -868,7 +868,7 @@ bool_ player_activate_trap_type(s16b y, s16b x, object_type *i_ptr, s16b item)
 			{
 				p_ptr->csp = 0;
 				p_ptr->csp_frac = 0;
-				p_ptr->redraw |= (PR_MANA);
+				p_ptr->redraw |= (PR_FRAME);
 				msg_print("You sense a great loss.");
 				ident = TRUE;
 			}
@@ -910,7 +910,7 @@ bool_ player_activate_trap_type(s16b y, s16b x, object_type *i_ptr, s16b item)
 				msg_print("All of your coins were stolen!");
 				ident = TRUE;
 			}
-			p_ptr->redraw |= (PR_GOLD);
+			p_ptr->redraw |= (PR_FRAME);
 			break;
 		}
 
diff --git a/src/util.cc b/src/util.cc
index e5f43ab6..bc539b5c 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -1495,7 +1495,10 @@ void bell(void)
 	Term_fresh();
 
 	/* Make a bell noise (if allowed) */
-	if (ring_bell) Term_xtra(TERM_XTRA_NOISE, 0);
+	if (ring_bell)
+	{
+		Term_bell();
+	}
 
 	/* Flush the input (later!) */
 	flush();
@@ -2037,13 +2040,14 @@ void cmsg_print(byte color, cptr msg)
 	static int p = 0;
 
 	int n;
+	int wid;
 
 	char *t;
 
 	char buf[1024];
 
-	int lim = Term->wid - 8;
-
+	Term_get_size(&wid, nullptr);
+	int lim = wid - 8;
 
 	/* Hack -- Reset */
 	if (!msg_flag) p = 0;
@@ -2559,9 +2563,11 @@ void text_out_c(byte a, cptr str)
 void clear_from(int row)
 {
 	int y;
+	int hgt;
+	Term_get_size(nullptr, &hgt);
 
 	/* Erase requested rows */
-	for (y = row; y < Term->hgt; y++)
+	for (y = row; y < hgt; y++)
 	{
 		/* Erase part of the screen */
 		Term_erase(0, y, 255);
diff --git a/src/wizard2.cc b/src/wizard2.cc
index e336f068..b6d6ca2d 100644
--- a/src/wizard2.cc
+++ b/src/wizard2.cc
@@ -111,7 +111,7 @@ void do_cmd_rerate(void)
 
 	/* Update and redraw hitpoints */
 	p_ptr->update |= (PU_HP);
-	p_ptr->redraw |= (PR_HP);
+	p_ptr->redraw |= (PR_FRAME);
 
 	/* Window stuff */
 	p_ptr->window |= (PW_PLAYER);
@@ -1781,7 +1781,7 @@ void do_cmd_debug()
 
 			/* Display the hitpoints */
 			p_ptr->update |= (PU_HP);
-			p_ptr->redraw |= (PR_HP);
+			p_ptr->redraw |= (PR_FRAME);
 
 			/* Window stuff */
 			p_ptr->window |= (PW_PLAYER);
@@ -1850,7 +1850,7 @@ void do_cmd_debug()
 		p_ptr->tim_mimic = 100;
 		p_ptr->mimic_form = command_arg;
 		/* Redraw title */
-		p_ptr->redraw |= (PR_TITLE);
+		p_ptr->redraw |= (PR_FRAME);
 		/* Recalculate bonuses */
 		p_ptr->update |= (PU_BONUS);
 		break;
diff --git a/src/xtra1.cc b/src/xtra1.cc
index 3477dc20..1f538e90 100644
--- a/src/xtra1.cc
+++ b/src/xtra1.cc
@@ -497,7 +497,7 @@ static void prt_sp(void)
 /*
  * Prints depth in stat area
  */
-static void prt_depth(void)
+static void prt_depth(int row, int col)
 {
 	char depths[32];
 	dungeon_info_type *d_ptr = &d_info[dungeon_type];
@@ -570,132 +570,9 @@ static void prt_depth(void)
 
 	/* Right-Adjust the "depth", and clear old values */
 	if (p_ptr->word_recall)
-		c_prt(TERM_ORANGE, format("%13s", depths), ROW_DEPTH, COL_DEPTH);
+		c_prt(TERM_ORANGE, format("%13s", depths), row, col);
 	else
-		prt(format("%13s", depths), ROW_DEPTH, COL_DEPTH);
-}
-
-
-/*
- * Prints status of hunger
- */
-static void prt_hunger(void)
-{
-	/* Fainting / Starving */
-	if (p_ptr->food < PY_FOOD_FAINT)
-	{
-		c_put_str(TERM_RED, "Weak  ", ROW_HUNGRY, COL_HUNGRY);
-	}
-
-	/* Weak */
-	else if (p_ptr->food < PY_FOOD_WEAK)
-	{
-		c_put_str(TERM_ORANGE, "Weak  ", ROW_HUNGRY, COL_HUNGRY);
-	}
-
-	/* Hungry */
-	else if (p_ptr->food < PY_FOOD_ALERT)
-	{
-		c_put_str(TERM_YELLOW, "Hungry", ROW_HUNGRY, COL_HUNGRY);
-	}
-
-	/* Normal */
-	else if (p_ptr->food < PY_FOOD_FULL)
-	{
-		c_put_str(TERM_L_GREEN, "      ", ROW_HUNGRY, COL_HUNGRY);
-	}
-
-	/* Full */
-	else if (p_ptr->food < PY_FOOD_MAX)
-	{
-		c_put_str(TERM_L_GREEN, "Full  ", ROW_HUNGRY, COL_HUNGRY);
-	}
-
-	/* Gorged */
-	else
-	{
-		c_put_str(TERM_GREEN, "Gorged", ROW_HUNGRY, COL_HUNGRY);
-	}
-}
-
-
-/*
- * Prints Blind status
- */
-static void prt_blind(void)
-{
-	if (p_ptr->blind)
-	{
-		c_put_str(TERM_ORANGE, "Blind", ROW_BLIND, COL_BLIND);
-	}
-	else
-	{
-		put_str("     ", ROW_BLIND, COL_BLIND);
-	}
-}
-
-
-/*
- * Prints Confusion status
- */
-static void prt_confused(void)
-{
-	if (p_ptr->confused)
-	{
-		c_put_str(TERM_ORANGE, "Conf", ROW_CONFUSED, COL_CONFUSED);
-	}
-	else
-	{
-		put_str("    ", ROW_CONFUSED, COL_CONFUSED);
-	}
-}
-
-
-/*
- * Prints Fear status
- */
-static void prt_afraid(void)
-{
-	if (p_ptr->afraid)
-	{
-		c_put_str(TERM_ORANGE, "Afraid", ROW_AFRAID, COL_AFRAID);
-	}
-	else
-	{
-		put_str("      ", ROW_AFRAID, COL_AFRAID);
-	}
-}
-
-
-/*
- * Prints Poisoned status
- */
-static void prt_poisoned(void)
-{
-	if (p_ptr->poisoned)
-	{
-		c_put_str(TERM_ORANGE, "Poison", ROW_POISONED, COL_POISONED);
-	}
-	else
-	{
-		put_str("      ", ROW_POISONED, COL_POISONED);
-	}
-}
-
-
-/*
- * Prints trap detection status
- */
-static void prt_dtrap(void)
-{
-	if (cave[p_ptr->py][p_ptr->px].info & CAVE_DETECT)
-	{
-		c_put_str(TERM_L_GREEN, "DTrap", ROW_DTRAP, COL_DTRAP);
-	}
-	else
-	{
-		put_str("     ", ROW_DTRAP, COL_DTRAP);
-	}
+		prt(format("%13s", depths), row, col);
 }
 
 
@@ -706,7 +583,7 @@ static void prt_dtrap(void)
  * This function was a major bottleneck when resting, so a lot of
  * the text formatting code was optimized in place below.
  */
-static void prt_state(void)
+static void prt_state(int row, int col)
 {
 	byte attr = TERM_WHITE;
 
@@ -811,14 +688,14 @@ static void prt_state(void)
 	}
 
 	/* Display the info (or blanks) */
-	c_put_str(attr, text, ROW_STATE, COL_STATE);
+	c_put_str(attr, text, row, col);
 }
 
 
 /*
  * Prints the speed of a character.			-CJS-
  */
-static void prt_speed(void)
+static void prt_speed(int row, int col)
 {
 	int i = p_ptr->pspeed;
 
@@ -843,58 +720,167 @@ static void prt_speed(void)
 	}
 
 	/* Display the speed */
-	c_put_str(attr, format("%-10s", buf), ROW_SPEED, COL_SPEED);
+	c_put_str(attr, format("%-10s", buf), row, col);
 }
 
 
-static void prt_study(void)
+
+/*
+ * Prints status line
+ */
+static void prt_status_line(void)
 {
+	int wid, hgt;
+	Term_get_size(&wid, &hgt);
+	int row = hgt - 1;
+
+	/* Fainting / Starving */
+	int col = 0;
+	if (p_ptr->food < PY_FOOD_FAINT)
+	{
+		c_put_str(TERM_RED, "Weak  ", row, col);
+	}
+	else if (p_ptr->food < PY_FOOD_WEAK)
+	{
+		c_put_str(TERM_ORANGE, "Weak  ", row, col);
+	}
+	else if (p_ptr->food < PY_FOOD_ALERT)
+	{
+		c_put_str(TERM_YELLOW, "Hungry", row, col);
+	}
+	else if (p_ptr->food < PY_FOOD_FULL)
+	{
+		c_put_str(TERM_L_GREEN, "      ", row, col);
+	}
+	else if (p_ptr->food < PY_FOOD_MAX)
+	{
+		c_put_str(TERM_L_GREEN, "Full  ", row, col);
+	}
+	else
+	{
+		c_put_str(TERM_GREEN, "Gorged", row, col);
+	}
+
+	/* Blind */
+	col = 7;
+	if (p_ptr->blind)
+	{
+		c_put_str(TERM_ORANGE, "Blind", row, col);
+	}
+	else
+	{
+		put_str("     ", row, col);
+	}
+
+	/* Confusion */
+	col = 13;
+	if (p_ptr->confused)
+	{
+		c_put_str(TERM_ORANGE, "Conf", row, col);
+	}
+	else
+	{
+		put_str("    ", row, col);
+	}
+
+	/* Fear */
+        col = 18;
+	if (p_ptr->afraid)
+	{
+		c_put_str(TERM_ORANGE, "Afraid", row, col);
+	}
+	else
+	{
+		put_str("      ", row, col);
+	}
+
+	/* Poison */
+	col = 25;
+	if (p_ptr->poisoned)
+	{
+		c_put_str(TERM_ORANGE, "Poison", row, col);
+	}
+	else
+	{
+		put_str("      ", row, col);
+	}
+
+	/* Dtrap */
+	col = 32;
+	if (cave[p_ptr->py][p_ptr->px].info & CAVE_DETECT)
+	{
+		c_put_str(TERM_L_GREEN, "DTrap", row, col);
+	}
+	else
+	{
+		put_str("     ", row, col);
+	}
+
+	/* State */
+	col = 38;
+	prt_state(row, col);
+
+	/* Speed */
+	col = 49;
+	prt_speed(row, col);
+
+	/* "Study" */
+	col = 60;
 	if (p_ptr->skill_points)
 	{
-		put_str("Skill", ROW_STUDY, COL_STUDY);
+		put_str("Skill", row, col);
 	}
 	else
 	{
-		put_str("     ", ROW_STUDY, COL_STUDY);
+		put_str("     ", row, col);
 	}
+
+	/* Depth */
+	col = wid - 14;
+	prt_depth(row, col);
 }
 
 
+
 static void prt_cut(void)
 {
 	int c = p_ptr->cut;
+	int hgt;
+	Term_get_size(nullptr, &hgt);
+	int row = hgt - 3;
+	int col = 0;
 
 	if (c > 1000)
 	{
-		c_put_str(TERM_L_RED, "Mortal wound", ROW_CUT, COL_CUT);
+		c_put_str(TERM_L_RED, "Mortal wound", row, col);
 	}
 	else if (c > 200)
 	{
-		c_put_str(TERM_RED, "Deep gash   ", ROW_CUT, COL_CUT);
+		c_put_str(TERM_RED, "Deep gash   ", row, col);
 	}
 	else if (c > 100)
 	{
-		c_put_str(TERM_RED, "Severe cut  ", ROW_CUT, COL_CUT);
+		c_put_str(TERM_RED, "Severe cut  ", row, col);
 	}
 	else if (c > 50)
 	{
-		c_put_str(TERM_ORANGE, "Nasty cut   ", ROW_CUT, COL_CUT);
+		c_put_str(TERM_ORANGE, "Nasty cut   ", row, col);
 	}
 	else if (c > 25)
 	{
-		c_put_str(TERM_ORANGE, "Bad cut     ", ROW_CUT, COL_CUT);
+		c_put_str(TERM_ORANGE, "Bad cut     ", row, col);
 	}
 	else if (c > 10)
 	{
-		c_put_str(TERM_YELLOW, "Light cut   ", ROW_CUT, COL_CUT);
+		c_put_str(TERM_YELLOW, "Light cut   ", row, col);
 	}
 	else if (c)
 	{
-		c_put_str(TERM_YELLOW, "Graze       ", ROW_CUT, COL_CUT);
+		c_put_str(TERM_YELLOW, "Graze       ", row, col);
 	}
 	else
 	{
-		put_str("            ", ROW_CUT, COL_CUT);
+		put_str("            ", row, col);
 	}
 }
 
@@ -903,22 +889,26 @@ static void prt_cut(void)
 static void prt_stun(void)
 {
 	int s = p_ptr->stun;
+	int hgt;
+	Term_get_size(nullptr, &hgt);
+	int row = hgt - 2;
+	int col = 0;
 
 	if (s > 100)
 	{
-		c_put_str(TERM_RED, "Knocked out ", ROW_STUN, COL_STUN);
+		c_put_str(TERM_RED, "Knocked out ", row, col);
 	}
 	else if (s > 50)
 	{
-		c_put_str(TERM_ORANGE, "Heavy stun  ", ROW_STUN, COL_STUN);
+		c_put_str(TERM_ORANGE, "Heavy stun  ", row, col);
 	}
 	else if (s)
 	{
-		c_put_str(TERM_ORANGE, "Stun        ", ROW_STUN, COL_STUN);
+		c_put_str(TERM_ORANGE, "Stun        ", row, col);
 	}
 	else
 	{
-		put_str("            ", ROW_STUN, COL_STUN);
+		put_str("            ", row, col);
 	}
 }
 
@@ -940,32 +930,37 @@ static void prt_stun(void)
  */
 static void health_redraw(void)
 {
+	int hgt;
+	Term_get_size(nullptr, &hgt);
+	int col = 0;
+	int row = hgt - 4;
+
 	/* Not tracking */
 	if (!health_who)
 	{
 		/* Erase the health bar */
-		Term_erase(COL_INFO, ROW_INFO, 12);
+		Term_erase(col, row, 12);
 	}
 
 	/* Tracking an unseen monster */
 	else if (!m_list[health_who].ml)
 	{
 		/* Indicate that the monster health is "unknown" */
-		Term_putstr(COL_INFO, ROW_INFO, 12, TERM_WHITE, "[----------]");
+		Term_putstr(col, row, 12, TERM_WHITE, "[----------]");
 	}
 
 	/* Tracking a hallucinatory monster */
 	else if (p_ptr->image)
 	{
 		/* Indicate that the monster health is "unknown" */
-		Term_putstr(COL_INFO, ROW_INFO, 12, TERM_WHITE, "[----------]");
+		Term_putstr(col, row, 12, TERM_WHITE, "[----------]");
 	}
 
 	/* Tracking a dead monster (???) */
 	else if (!m_list[health_who].hp < 0)
 	{
 		/* Indicate that the monster health is "unknown" */
-		Term_putstr(COL_INFO, ROW_INFO, 12, TERM_WHITE, "[----------]");
+		Term_putstr(col, row, 12, TERM_WHITE, "[----------]");
 	}
 
 	/* Tracking a visible monster */
@@ -1009,15 +1004,15 @@ static void health_redraw(void)
 		len = (pct < 10) ? 1 : (pct < 90) ? (pct / 10 + 1) : 10;
 
 		/* Default to "unknown" */
-		Term_putstr(COL_INFO, ROW_INFO, 12, TERM_WHITE, "[----------]");
+		Term_putstr(col, row, 12, TERM_WHITE, "[----------]");
 
 		/* Dump the current "health" (use '*' symbols) */
 		if (m_ptr->stunned) {
-			Term_putstr(COL_INFO + 1, ROW_INFO, len, attr, "ssssssssss");
+			Term_putstr(col + 1, row, len, attr, "ssssssssss");
 		} else if (m_ptr->confused) {
-			Term_putstr(COL_INFO + 1, ROW_INFO, len, attr, "cccccccccc");
+			Term_putstr(col + 1, row, len, attr, "cccccccccc");
 		} else {
-			Term_putstr(COL_INFO + 1, ROW_INFO, len, attr, "**********");
+			Term_putstr(col + 1, row, len, attr, "**********");
 		}
 	}
 }
@@ -1027,7 +1022,7 @@ static void health_redraw(void)
 /*
  * Display basic info (mostly left of map)
  */
-static void prt_frame_basic(void)
+static void prt_frame(void)
 {
 	int i;
 
@@ -1066,41 +1061,15 @@ static void prt_frame_basic(void)
 	/* Gold */
 	prt_gold();
 
-	/* Current depth */
-	prt_depth();
-
-	/* Special */
-	health_redraw();
-}
-
-
-/*
- * Display extra info (mostly below map)
- */
-static void prt_frame_extra(void)
-{
 	/* Cut/Stun */
 	prt_cut();
 	prt_stun();
 
-	/* Food */
-	prt_hunger();
-
-	/* Various */
-	prt_blind();
-	prt_confused();
-	prt_afraid();
-	prt_poisoned();
-	prt_dtrap();
-
-	/* State */
-	prt_state();
-
-	/* Speed */
-	prt_speed();
+	/* Current depth */
+	prt_status_line();
 
-	/* Study spells */
-	prt_study();
+	/* Special */
+	health_redraw();
 }
 
 
@@ -1666,7 +1635,7 @@ void calc_sanity(void)
 			p_ptr->csane_frac = 0;
 		}
 
-		p_ptr->redraw |= (PR_SANITY);
+		p_ptr->redraw |= (PR_FRAME);
 		p_ptr->window |= (PW_PLAYER);
 	}
 }
@@ -1818,7 +1787,7 @@ static void calc_mana(void)
 		}
 
 		/* Display mana later */
-		p_ptr->redraw |= (PR_MANA);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Window stuff */
 		p_ptr->window |= (PW_PLAYER);
@@ -1964,7 +1933,7 @@ void calc_hitpoints(void)
 		p_ptr->mhp = mhp;
 
 		/* Display hitpoints (later) */
-		p_ptr->redraw |= (PR_HP);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Window stuff */
 		p_ptr->window |= (PW_PLAYER);
@@ -3226,7 +3195,7 @@ void calc_bonuses(bool_ silent)
 			p_ptr->stat_top[i] = top;
 
 			/* Redisplay the stats later */
-			p_ptr->redraw |= (PR_STATS);
+			p_ptr->redraw |= (PR_FRAME);
 
 			/* Window stuff */
 			p_ptr->window |= (PW_PLAYER);
@@ -3242,7 +3211,7 @@ void calc_bonuses(bool_ silent)
 			p_ptr->stat_use[i] = use;
 
 			/* Redisplay the stats later */
-			p_ptr->redraw |= (PR_STATS);
+			p_ptr->redraw |= (PR_FRAME);
 
 			/* Window stuff */
 			p_ptr->window |= (PW_PLAYER);
@@ -3598,7 +3567,7 @@ void calc_bonuses(bool_ silent)
 		p_ptr->pspeed = 110;
 
 	/* Display the speed (if needed) */
-	if (p_ptr->pspeed != old_speed) p_ptr->redraw |= (PR_SPEED);
+	if (p_ptr->pspeed != old_speed) p_ptr->redraw |= (PR_FRAME);
 
 
 	/* Actual Modifier Bonuses (Un-inflate stat bonuses) */
@@ -3617,7 +3586,7 @@ void calc_bonuses(bool_ silent)
 	if ((p_ptr->dis_ac != old_dis_ac) || (p_ptr->dis_to_a != old_dis_to_a))
 	{
 		/* Redraw */
-		p_ptr->redraw |= (PR_ARMOR);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Window stuff */
 		p_ptr->window |= (PW_PLAYER);
@@ -4323,182 +4292,10 @@ void redraw_stuff(void)
 	}
 
 
-	if (p_ptr->redraw & (PR_BASIC))
-	{
-		p_ptr->redraw &= ~(PR_BASIC);
-		p_ptr->redraw &= ~(PR_MISC | PR_TITLE | PR_STATS);
-		p_ptr->redraw &= ~(PR_LEV | PR_EXP | PR_GOLD);
-		p_ptr->redraw &= ~(PR_ARMOR | PR_HP | PR_MANA | PR_PIETY | PR_MH);
-		p_ptr->redraw &= ~(PR_DEPTH | PR_HEALTH);
-		prt_frame_basic();
-	}
-
-	if (p_ptr->redraw & (PR_MISC))
-	{
-		p_ptr->redraw &= ~(PR_MISC);
-		prt_field(rp_ptr->title + rp_name, ROW_RACE, COL_RACE);
-		prt_field(spp_ptr->title + c_name, ROW_CLASS, COL_CLASS);
-	}
-
-	if (p_ptr->redraw & (PR_TITLE))
-	{
-		p_ptr->redraw &= ~(PR_TITLE);
-		prt_title();
-	}
-
-	if (p_ptr->redraw & (PR_LEV))
-	{
-		p_ptr->redraw &= ~(PR_LEV);
-		prt_level();
-	}
-
-	if (p_ptr->redraw & (PR_EXP))
-	{
-		p_ptr->redraw &= ~(PR_EXP);
-		prt_exp();
-	}
-
-	if (p_ptr->redraw & (PR_STATS))
-	{
-		p_ptr->redraw &= ~(PR_STATS);
-		prt_stat(A_STR);
-		prt_stat(A_INT);
-		prt_stat(A_WIS);
-		prt_stat(A_DEX);
-		prt_stat(A_CON);
-		prt_stat(A_CHR);
-	}
-
-	if (p_ptr->redraw & (PR_ARMOR))
-	{
-		p_ptr->redraw &= ~(PR_ARMOR);
-		prt_ac();
-	}
-
-	if (p_ptr->redraw & (PR_HP))
-	{
-		p_ptr->redraw &= ~(PR_HP);
-		prt_hp();
-	}
-
-	if (p_ptr->redraw & (PR_MANA))
-	{
-		p_ptr->redraw &= ~(PR_MANA);
-		prt_sp();
-	}
-
-	if (p_ptr->redraw & (PR_PIETY))
-	{
-		p_ptr->redraw &= ~(PR_PIETY);
-		prt_piety();
-	}
-
-	if (p_ptr->redraw & (PR_MH))
-	{
-		p_ptr->redraw &= ~(PR_MH);
-		prt_mh();
-	}
-
-	if (p_ptr->redraw & (PR_GOLD))
-	{
-		p_ptr->redraw &= ~(PR_GOLD);
-		prt_gold();
-	}
-
-	if (p_ptr->redraw & (PR_DEPTH))
-	{
-		p_ptr->redraw &= ~(PR_DEPTH);
-		prt_depth();
-	}
-
-	if (p_ptr->redraw & (PR_HEALTH))
-	{
-		p_ptr->redraw &= ~(PR_HEALTH);
-		health_redraw();
-	}
-
-
-	if (p_ptr->redraw & (PR_EXTRA))
-	{
-		p_ptr->redraw &= ~(PR_EXTRA);
-		p_ptr->redraw &= ~(PR_CUT | PR_STUN);
-		p_ptr->redraw &= ~(PR_HUNGER);
-		p_ptr->redraw &= ~(PR_BLIND | PR_CONFUSED);
-		p_ptr->redraw &= ~(PR_AFRAID | PR_POISONED);
-		p_ptr->redraw &= ~(PR_STATE | PR_SPEED | PR_STUDY | PR_SANITY);
-		prt_frame_extra();
-	}
-
-	if (p_ptr->redraw & (PR_CUT))
-	{
-		p_ptr->redraw &= ~(PR_CUT);
-		prt_cut();
-	}
-
-	if (p_ptr->redraw & (PR_STUN))
-	{
-		p_ptr->redraw &= ~(PR_STUN);
-		prt_stun();
-	}
-
-	if (p_ptr->redraw & (PR_HUNGER))
-	{
-		p_ptr->redraw &= ~(PR_HUNGER);
-		prt_hunger();
-	}
-
-	if (p_ptr->redraw & (PR_BLIND))
-	{
-		p_ptr->redraw &= ~(PR_BLIND);
-		prt_blind();
-	}
-
-	if (p_ptr->redraw & (PR_CONFUSED))
-	{
-		p_ptr->redraw &= ~(PR_CONFUSED);
-		prt_confused();
-	}
-
-	if (p_ptr->redraw & (PR_AFRAID))
-	{
-		p_ptr->redraw &= ~(PR_AFRAID);
-		prt_afraid();
-	}
-
-	if (p_ptr->redraw & (PR_POISONED))
-	{
-		p_ptr->redraw &= ~(PR_POISONED);
-		prt_poisoned();
-	}
-
-	if (p_ptr->redraw & (PR_DTRAP))
-	{
-		p_ptr->redraw &= ~(PR_DTRAP);
-		prt_dtrap();
-	}
-
-	if (p_ptr->redraw & (PR_STATE))
-	{
-		p_ptr->redraw &= ~(PR_STATE);
-		prt_state();
-	}
-
-	if (p_ptr->redraw & (PR_SPEED))
-	{
-		p_ptr->redraw &= ~(PR_SPEED);
-		prt_speed();
-	}
-
-	if (p_ptr->redraw & (PR_STUDY))
-	{
-		p_ptr->redraw &= ~(PR_STUDY);
-		prt_study();
-	}
-
-	if (p_ptr->redraw & (PR_SANITY))
+	if (p_ptr->redraw & (PR_FRAME))
 	{
-		p_ptr->redraw &= ~(PR_SANITY);
-		prt_sane();
+		p_ptr->redraw &= ~(PR_FRAME);
+		prt_frame();
 	}
 }
 
diff --git a/src/xtra2.cc b/src/xtra2.cc
index 53abc149..4a2991bd 100644
--- a/src/xtra2.cc
+++ b/src/xtra2.cc
@@ -523,7 +523,7 @@ bool_ set_mimic(int v, int p, int level)
 	if (disturb_state) disturb(0);
 
 	/* Redraw title */
-	p_ptr->redraw |= (PR_TITLE);
+	p_ptr->redraw |= (PR_FRAME);
 
 	/* Recalculate bonuses */
 	p_ptr->update |= (PU_BODY | PU_BONUS | PU_SANITY);
@@ -556,7 +556,7 @@ bool_ set_blind(int v)
 		p_ptr->redraw |= (PR_MAP);
 
 		/* Redraw the "blind" */
-		p_ptr->redraw |= (PR_BLIND);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Window stuff */
 		p_ptr->window |= (PW_OVERHEAD);
@@ -617,7 +617,7 @@ bool_ set_confused(int v)
 	if (notice)
 	{
 		/* Redraw the "confused" */
-		p_ptr->redraw |= (PR_CONFUSED);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Handle stuff */
 		handle_stuff();
@@ -641,7 +641,7 @@ bool_ set_poisoned(int v)
 	if (notice)
 	{
 		/* Redraw the "poisoned" */
-		p_ptr->redraw |= (PR_POISONED);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Handle stuff */
 		handle_stuff();
@@ -665,7 +665,7 @@ bool_ set_afraid(int v)
 	if (notice)
 	{
 		/* Redraw the "afraid" */
-		p_ptr->redraw |= (PR_AFRAID);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Handle stuff */
 		handle_stuff();
@@ -692,7 +692,7 @@ static bool_ set_paralyzed_aux(int v)
 	if (notice)
 	{
 		/* Redraw the state */
-		p_ptr->redraw |= (PR_STATE);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Handle stuff */
 		handle_stuff();
@@ -1567,7 +1567,7 @@ bool_ set_stun(int v)
 	p_ptr->update |= (PU_BONUS);
 
 	/* Redraw the "stun" */
-	p_ptr->redraw |= (PR_STUN);
+	p_ptr->redraw |= (PR_FRAME);
 
 	/* Handle stuff */
 	handle_stuff();
@@ -1775,7 +1775,7 @@ bool_ set_cut(int v)
 	p_ptr->update |= (PU_BONUS);
 
 	/* Redraw the "cut" */
-	p_ptr->redraw |= (PR_CUT);
+	p_ptr->redraw |= (PR_FRAME);
 
 	/* Handle stuff */
 	handle_stuff();
@@ -1989,7 +1989,7 @@ bool_ set_food(int v)
 	p_ptr->update |= (PU_BONUS);
 
 	/* Redraw hunger */
-	p_ptr->redraw |= (PR_HUNGER);
+	p_ptr->redraw |= (PR_FRAME);
 
 	/* Handle stuff */
 	handle_stuff();
@@ -2024,7 +2024,7 @@ void check_experience(void)
 	if (p_ptr->exp > p_ptr->max_exp) p_ptr->max_exp = p_ptr->exp;
 
 	/* Redraw experience */
-	p_ptr->redraw |= (PR_EXP);
+	p_ptr->redraw |= (PR_FRAME);
 
 	/* Handle stuff */
 	handle_stuff();
@@ -2043,7 +2043,7 @@ void check_experience(void)
 		p_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS | PU_SANITY);
 
 		/* Redraw some stuff */
-		p_ptr->redraw |= (PR_LEV | PR_TITLE | PR_EXP);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Window stuff */
 		p_ptr->window |= (PW_PLAYER);
@@ -2084,7 +2084,7 @@ void check_experience(void)
 			p_ptr->skill_last_level = p_ptr->lev;
 			p_ptr->skill_points += modules[game_module_idx].skills.skill_per_level;
 			cmsg_format(TERM_L_GREEN, "You can increase %d more skills.", p_ptr->skill_points);
-			p_ptr->redraw |= PR_STUDY;
+			p_ptr->redraw |= PR_FRAME;
 		}
 
 		/* Gain this level's abilities */
@@ -2103,7 +2103,7 @@ void check_experience(void)
 		p_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS | PU_SANITY);
 
 		/* Redraw some stuff */
-		p_ptr->redraw |= (PR_LEV | PR_TITLE | PR_EXP);
+		p_ptr->redraw |= (PR_FRAME);
 
 		/* Window stuff */
 		p_ptr->window |= (PW_PLAYER);
@@ -2629,7 +2629,7 @@ void monster_death(int m_idx)
 
 			/* Display the hitpoints */
 			p_ptr->update |= (PU_HP);
-			p_ptr->redraw |= (PR_HP);
+			p_ptr->redraw |= (PR_FRAME);
 
 			/* Window stuff */
 			p_ptr->window |= (PW_PLAYER);
@@ -3206,7 +3206,7 @@ bool_ mon_take_hit(int m_idx, int dam, bool_ *fear, cptr note)
 
 
 	/* Redraw (later) if needed */
-	if (health_who == m_idx) p_ptr->redraw |= (PR_HEALTH);
+	if (health_who == m_idx) p_ptr->redraw |= (PR_FRAME);
 
 	/* Some mosnters are immune to death */
 	if (r_ptr->flags7 & RF7_NO_DEATH) return FALSE;
@@ -3742,7 +3742,7 @@ void resize_map(void)
 	p_ptr->update |= (PU_UN_VIEW | PU_VIEW | PU_MONSTERS | PU_MON_LITE);
 
 	/* Redraw everything */
-	p_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP);
+	p_ptr->redraw |= (PR_WIPE | PR_FRAME | PR_MAP);
 
 	/* Hack -- update */
 	handle_stuff();
@@ -5468,7 +5468,7 @@ void set_grace(s32b v)
 	if (v > 300000) v = 300000;
 	p_ptr->grace = v;
 	p_ptr->update |= PU_BONUS;
-	p_ptr->redraw |= (PR_PIETY);
+	p_ptr->redraw |= (PR_FRAME);
 	handle_stuff();
 }
 
@@ -5817,7 +5817,7 @@ void do_rebirth()
 	p_ptr->max_plv = p_ptr->lev;
 
 	/* Redraw/calc stuff */
-	p_ptr->redraw |= (PR_BASIC);
+	p_ptr->redraw |= (PR_FRAME);
 	p_ptr->update |= (PU_BONUS);
 	handle_stuff();
 
diff --git a/src/z-term.c b/src/z-term.c
index dfd80051..e9941117 100644
--- a/src/z-term.c
+++ b/src/z-term.c
@@ -1951,6 +1951,10 @@ errr Term_redraw_section(int x1, int y1, int x2, int y2)
 }
 
 
+void Term_bell()
+{
+	Term_xtra(TERM_XTRA_NOISE, 0);
+}
 
 /*** Access routines ***/
 
@@ -1974,8 +1978,15 @@ errr Term_get_cursor(int *v)
 errr Term_get_size(int *w, int *h)
 {
 	/* Access the cursor */
-	(*w) = Term->wid;
-	(*h) = Term->hgt;
+	if (w)
+	{
+		(*w) = Term->wid;
+	}
+
+	if (h)
+	{
+		(*h) = Term->hgt;
+	}
 
 	/* Success */
 	return (0);
diff --git a/src/z-term.h b/src/z-term.h
index fd1955fa..51e5760b 100644
--- a/src/z-term.h
+++ b/src/z-term.h
@@ -300,6 +300,7 @@ extern errr Term_erase(int x, int y, int n);
 extern errr Term_clear(void);
 extern errr Term_redraw(void);
 extern errr Term_redraw_section(int x1, int y1, int x2, int y2);
+extern void Term_bell();
 
 extern errr Term_get_cursor(int *v);
 extern errr Term_get_size(int *w, int *h);