From b161602300f01882dca7317be86ffcdf2bdd889f Mon Sep 17 00:00:00 2001
From: William McBrine <wmcbrine@gmail.com>
Date: Sun, 16 Jul 2006 16:12:45 +0000
Subject: [PATCH] tahead is already initialized in OS/2's PDC_scr_open(), and
 the call to v_init() should be moved there.

---
 os2/pdcscrn.c      |  5 ++++-
 pdcurses/initscr.c | 10 +---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/os2/pdcscrn.c b/os2/pdcscrn.c
index c2de1d26..6c3f397c 100644
--- a/os2/pdcscrn.c
+++ b/os2/pdcscrn.c
@@ -20,7 +20,7 @@
 #include <curses.h>
 #include <stdlib.h>
 
-RCSID("$Id: pdcscrn.c,v 1.25 2006/07/15 15:38:24 wmcbrine Exp $");
+RCSID("$Id: pdcscrn.c,v 1.26 2006/07/16 16:12:44 wmcbrine Exp $");
 
 #ifdef EMXVIDEO
 static unsigned char *saved_screen = NULL;
@@ -146,6 +146,9 @@ int PDC_scr_open(SCREEN *internal, bool echo)
 	PDC_LOG(("PDC_scr_open() - called. internal: %x, echo: %d\n",
 		internal, echo));
 
+#ifdef EMXVIDEO
+        v_init();
+#endif
 	internal->orig_attr = FALSE;
 	internal->orig_emulation = 0;
 
diff --git a/pdcurses/initscr.c b/pdcurses/initscr.c
index 8828b478..39e45517 100644
--- a/pdcurses/initscr.c
+++ b/pdcurses/initscr.c
@@ -38,7 +38,7 @@
 # undef wnoutrefresh
 #endif
 
-RCSID("$Id: initscr.c,v 1.51 2006/07/15 15:38:24 wmcbrine Exp $");
+RCSID("$Id: initscr.c,v 1.52 2006/07/16 16:12:45 wmcbrine Exp $");
 
 const char *_curses_notice = "PDCurses 3.0 - Public Domain 2006";
 
@@ -172,10 +172,6 @@ WINDOW *Xinitscr(int argc, char *argv[])
 	if (SP != (SCREEN *)NULL && SP->alive)
 		return NULL;
 
-#ifdef EMXVIDEO
-	v_init();
-#endif
-
 #ifdef XCURSES
 	if (XCursesInitscr(NULL, argc, argv) == ERR)
 		exit(7);
@@ -255,10 +251,6 @@ WINDOW *Xinitscr(int argc, char *argv[])
 
 	PDC_init_atrtab();	/* set up default colors */
 
-#ifdef EMXVIDEO
-	SP->tahead = -1;
-#endif
-
 	MOUSE_X_POS = MOUSE_Y_POS = (-1);
 	BUTTON_STATUS(1) = BUTTON_RELEASED;
 	BUTTON_STATUS(2) = BUTTON_RELEASED;