Big internal reorganisation to move tty control into parent.

1 files changed, 8 insertions, 14 deletions

diff --git a/window.c b/window.c
index bb2611a2..a0dfdaf3 100644
--- a/window.c
+++ b/window.c
@@ -1,4 +1,4 @@
-/* $Id: window.c,v 1.31 2007-11-21 19:53:57 nicm Exp $ */
+/* $Id: window.c,v 1.32 2007-11-27 19:23:34 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -274,24 +274,18 @@ window_resize(struct window *w, u_int sx, u_int sy)
 }
 
 void
-window_parse(struct window *w, struct buffer *b)
+window_parse(struct window *w)
 {
-	input_parse(w, b);
+	input_parse(w);
 }
 
 void
-window_draw(struct window *w, struct buffer *b, u_int py, u_int ny)
+window_draw(struct window *w, struct screen_draw_ctx *ctx, u_int py, u_int ny)
 {
-	struct screen		*s = &w->screen;
-	struct screen_draw_ctx	 ctx;
-
 	if (w->mode != NULL)
-		w->mode->draw(w, b, py, ny);
-	else {
-		screen_draw_start(&ctx, s, b, 0, 0);
-		screen_draw_lines(&ctx, py, ny);
-		screen_draw_stop(&ctx);
-	}
+		w->mode->draw(w, ctx, py, ny);
+	else
+		screen_draw_lines(ctx, py, ny);
 }
 
 void
@@ -300,5 +294,5 @@ window_key(struct window *w, int key)
 	if (w->mode != NULL)
 		w->mode->key(w, key);
 	else
-		input_key(w->out, key);	
+		input_key(w, key);	
 }