From 34dd72f0089537032429c88226ae66d4a5980575 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Sat, 28 Mar 2009 16:57:03 +0000
Subject: [PATCH] _fill functions are no longer needed. Nuke them.

---
 grid-view.c | 15 +--------------
 grid.c      | 40 +---------------------------------------
 tmux.h      |  8 +-------
 3 files changed, 3 insertions(+), 60 deletions(-)

diff --git a/grid-view.c b/grid-view.c
index 7869d22e..407fdb9c 100644
--- a/grid-view.c
+++ b/grid-view.c
@@ -1,4 +1,4 @@
-/* $Id: grid-view.c,v 1.9 2009-03-28 16:55:46 nicm Exp $ */
+/* $Id: grid-view.c,v 1.10 2009-03-28 16:57:03 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -78,19 +78,6 @@ grid_view_clear(struct grid *gd, u_int px, u_int py, u_int nx, u_int ny)
 	grid_clear(gd, px, py, nx, ny);
 }
 
-/* Fill area. */
-void
-grid_view_fill(struct grid *gd, const struct grid_cell *gc,
-    uint64_t text, u_int px, u_int py, u_int nx, u_int ny)
-{
-	GRID_DEBUG(gd, "px=%u, py=%u, nx=%u, ny=%u", px, py, nx, ny);
-
-	px = grid_view_x(gd, px);
-	py = grid_view_y(gd, py);
-
-	grid_fill(gd, gc, text, px, py, nx, ny);
-}
-
 /* Scroll region up. */
 void
 grid_view_scroll_region_up(struct grid *gd, u_int rupper, u_int rlower)
diff --git a/grid.c b/grid.c
index ee42ea56..3f4db49b 100644
--- a/grid.c
+++ b/grid.c
@@ -1,4 +1,4 @@
-/* $Id: grid.c,v 1.12 2009-03-28 16:55:46 nicm Exp $ */
+/* $Id: grid.c,v 1.13 2009-03-28 16:57:03 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -317,36 +317,6 @@ grid_clear(struct grid *gd, u_int px, u_int py, u_int nx, u_int ny)
 	}
 }
 
-/* Fill area. */
-void
-grid_fill(struct grid *gd, const struct grid_cell *gc,
-    uint64_t text, u_int px, u_int py, u_int nx, u_int ny)
-{
-	u_int	xx, yy;
-
- 	GRID_DEBUG(gd, "px=%u, py=%u, nx=%u, ny=%u", px, py, nx, ny);
-
-	if (nx == 0 || ny == 0)
-		return;
-
-	if (grid_check_x(gd, px) != 0)
-		return;
-	if (grid_check_x(gd, px + nx - 1) != 0)
-		return;
-	if (grid_check_y(gd, py) != 0)
-		return;
-	if (grid_check_y(gd, py + ny - 1) != 0)
-		return;
-
-	for (yy = py; yy < py + ny; yy++) {
-		for (xx = px; xx < px + nx; xx++) {
-			grid_expand_line(gd, yy, xx + 1);
-			grid_put_cell(gd, xx, py, gc);
-			grid_put_text(gd, xx, py, text);
-		}
-	}
-}
-
 /* Clear lines. This just frees and truncates the lines. */
 void
 grid_clear_lines(struct grid *gd, u_int py, u_int ny)
@@ -374,14 +344,6 @@ grid_clear_lines(struct grid *gd, u_int py, u_int ny)
 	}
 }
 
-/* Fill a group of lines. */
-void
-grid_fill_lines(struct grid *gd,
-    const struct grid_cell *gc, uint64_t text, u_int py, u_int ny)
-{
-	grid_fill(gd, gc, text, 0, py, gd->sx, ny);
-}
-
 /* Move a group of lines. */
 void
 grid_move_lines(struct grid *gd, u_int dy, u_int py, u_int ny)
diff --git a/tmux.h b/tmux.h
index c0563922..9d061862 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1,4 +1,4 @@
-/* $Id: tmux.h,v 1.289 2009-03-28 16:55:46 nicm Exp $ */
+/* $Id: tmux.h,v 1.290 2009-03-28 16:57:03 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1379,10 +1379,6 @@ void	 grid_set_cell(struct grid *, u_int, u_int, const struct grid_cell *);
 uint64_t grid_peek_text(struct grid *, u_int, u_int);
 void	 grid_set_text(struct grid *, u_int, u_int, uint64_t);
 void	 grid_clear(struct grid *, u_int, u_int, u_int, u_int);
-void	 grid_fill(struct grid *, const struct grid_cell *,
-    	     uint64_t, u_int, u_int, u_int, u_int);
-void	 grid_fill_lines(
-	     struct grid *, const struct grid_cell *, uint64_t, u_int, u_int);
 void	 grid_clear_lines(struct grid *, u_int, u_int);
 void	 grid_move_lines(struct grid *, u_int, u_int, u_int);
 void	 grid_clear_cells(struct grid *, u_int, u_int, u_int);
@@ -1397,8 +1393,6 @@ void	 grid_view_set_cell(
 uint64_t grid_view_peek_text(struct grid *, u_int, u_int);
 void	 grid_view_set_text(struct grid *, u_int, u_int, uint64_t);
 void	 grid_view_clear(struct grid *, u_int, u_int, u_int, u_int);
-void	 grid_view_fill(struct grid *, const struct grid_cell *,
-    	     uint64_t, u_int, u_int, u_int, u_int);
 void	 grid_view_scroll_region_up(struct grid *, u_int, u_int);
 void	 grid_view_scroll_region_down(struct grid *, u_int, u_int);
 void	 grid_view_insert_lines(struct grid *, u_int, u_int);