No more "ciowrap".

src/conio/Common.gmake

 # Available Options:
 # NEED_CURSES       = Set flags suitable for building with the curses lib
 # XCURSES			= Use XCurses
-# NEED_CIOLIB		= Set flage suitable for using with ciowrap lib
-# NO_X				= Don't use X version of ciowrap
+# NEED_CIOLIB		= Set flage suitable for using with ciolib
+# NO_X				= Don't use X version of ciolib
 
 # You really should set this first.
 CONIO_SRC	?=	$(XPDEV)../conio/
 UIFC_SRC	?=	$(XPDEV)../uifc/
 
 CIOLIB_CFLAGS	+=	-I$(CONIO_SRC)
-# ciowrap stuff
+# ciolib stuff
 ifndef NO_X
  X_DIR	?=	/usr/X11R6/
  CIOLIB_CFLAGS	+=	-I${X_DIR}/include

src/conio/curs_cio.c

@@ -135,7 +135,7 @@ int curs_gettext(int sx, int sy, int ex, int ey, unsigned char *fill)
 				thischar=attr&255-'A'+1;
 			}
 			else if(attr&A_ALTCHARSET) {
-				if(!(mode==CIOWRAP_CURSES_IBM_MODE)){
+				if(!(mode==CIOLIB_CURSES_IBM_MODE)){
 					ext_char=A_ALTCHARSET|(attr&255);
 					/* likely ones */
 					if (ext_char == ACS_CKBOARD)
@@ -428,7 +428,7 @@ int _putch(unsigned char ch, BOOL refresh_now)
 	int		ret;
 	chtype	cha;
 
-	if(!(mode==CIOWRAP_CURSES_IBM_MODE))
+	if(!(mode==CIOLIB_CURSES_IBM_MODE))
 	{
 		switch(ch)
 		{
@@ -601,12 +601,12 @@ void curs_gotoxy(int x, int y)
 	refresh();
 }
 
-int curs_initciowrap(long inmode)
+int curs_initciolib(long inmode)
 {
 	short	fg, bg, pair=0;
 
 #ifdef XCURSES
-	char	*argv[2]={"Syhcnronet",NULL};
+	char	*argv[2]={"ciolib",NULL};
 
 	Xinitscr(1,argv);
 #else

src/conio/curs_cio.h

@@ -20,7 +20,7 @@ int curs_wherex(void);
 int _putch(unsigned char ch, BOOL refresh_now);
 int curs_putch(unsigned char ch);
 void curs_gotoxy(int x, int y);
-int curs_initciowrap(long inmode);
+int curs_initciolib(long inmode);
 void curs_gettextinfo(struct text_info *info);
 void curs_setcursortype(int type);
 int curs_getch(void);

src/conio/x_cio.h

@@ -15,7 +15,7 @@ int x_wherey(void);
 int x_wherex(void);
 int x_putch(unsigned char ch);
 void x_gotoxy(int x, int y);
-void x_initciowrap(long inmode);
+void x_initciolib(long inmode);
 void x_gettextinfo(struct text_info *info);
 void x_setcursortype(int type);
 int x_getch(void);