_fill functions are no longer needed. Nuke them.

This commit is contained in:
Nicholas Marriott 2009-03-28 16:57:03 +00:00
parent abf170d6d0
commit 34dd72f008
3 changed files with 3 additions and 60 deletions

View File

@ -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> * 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); 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. */ /* Scroll region up. */
void void
grid_view_scroll_region_up(struct grid *gd, u_int rupper, u_int rlower) grid_view_scroll_region_up(struct grid *gd, u_int rupper, u_int rlower)

40
grid.c
View File

@ -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> * 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. */ /* Clear lines. This just frees and truncates the lines. */
void void
grid_clear_lines(struct grid *gd, u_int py, u_int ny) 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. */ /* Move a group of lines. */
void void
grid_move_lines(struct grid *gd, u_int dy, u_int py, u_int ny) grid_move_lines(struct grid *gd, u_int dy, u_int py, u_int ny)

8
tmux.h
View File

@ -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> * 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); 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_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_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_clear_lines(struct grid *, u_int, u_int);
void grid_move_lines(struct grid *, u_int, 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); 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); 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_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_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_up(struct grid *, u_int, u_int);
void grid_view_scroll_region_down(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); void grid_view_insert_lines(struct grid *, u_int, u_int);