--- sbbs/src/sbbs3/ansiterm.cpp	2018/04/24 16:41:24	1.1.1.1
+++ sbbs/src/sbbs3/ansiterm.cpp	2018/04/24 16:43:57	1.1.1.2
@@ -2,13 +2,13 @@
 
 /* Synchronet ANSI terminal functions */
 
-/* $Id: ansiterm.cpp,v 1.1.1.1 2018/04/24 16:41:24 root Exp $ */
+/* $Id: ansiterm.cpp,v 1.1.1.2 2018/04/24 16:43:57 root Exp $ */
 
 /****************************************************************************
  * @format.tab-size 4		(Plain Text/Source Code File Header)			*
  * @format.use-tabs true	(see http://www.synchro.net/ptsc_hdr.html)		*
  *																			*
- * Copyright 2006 Rob Swindell - http://www.synchro.net/copyright.html		*
+ * Copyright 2009 Rob Swindell - http://www.synchro.net/copyright.html		*
  *																			*
  * This program is free software; you can redistribute it and/or			*
  * modify it under the terms of the GNU General Public License				*
@@ -44,7 +44,7 @@
 /* high intensity colors, or background/forground cobinations don't work.   */
 /* A call to attr is more appropriate, being it is intelligent				*/
 /****************************************************************************/
-char *sbbs_t::ansi(int atr)
+const char *sbbs_t::ansi(int atr)
 {
 
 	switch(atr) {
@@ -97,13 +97,109 @@ char *sbbs_t::ansi(int atr)
 	return("-Invalid use of ansi()-");
 }
 
+/* insure str is at least 14 bytes in size! */
+char* sbbs_t::ansi(int atr, int curatr, char* str)
+{
+	if(!term_supports(COLOR)) {  /* eliminate colors if user doesn't have them */
+		if(atr&LIGHTGRAY)       /* if any foreground bits set, set all */
+			atr|=LIGHTGRAY;
+		if(atr&BG_LIGHTGRAY)  /* if any background bits set, set all */
+			atr|=BG_LIGHTGRAY;
+		if(atr&LIGHTGRAY && atr&BG_LIGHTGRAY)
+			atr&=~LIGHTGRAY;    /* if background is solid, foreground is black */
+		if(!atr)
+			atr|=LIGHTGRAY;		/* don't allow black on black */
+	}
+	if(curatr==atr) { /* text hasn't changed. no sequence needed */
+		*str=0;
+		return str;
+	}
+
+	strcpy(str,"\033[");
+	if((!(atr&HIGH) && curatr&HIGH) || (!(atr&BLINK) && curatr&BLINK)
+		|| atr==LIGHTGRAY) {
+		strcat(str,"0;");
+		curatr=LIGHTGRAY;
+	}
+	if(atr&BLINK) {                     /* special attributes */
+		if(!(curatr&BLINK))
+			strcat(str,"5;");
+	}
+	if(atr&HIGH) {
+		if(!(curatr&HIGH))
+			strcat(str,"1;"); 
+	}
+	if((atr&0x07) != (curatr&0x07)) {
+		switch(atr&0x07) {
+			case BLACK:
+				strcat(str,"30;");
+				break;
+			case RED:
+				strcat(str,"31;");
+				break;
+			case GREEN:
+				strcat(str,"32;");
+				break;
+			case BROWN:
+				strcat(str,"33;");
+				break;
+			case BLUE:
+				strcat(str,"34;");
+				break;
+			case MAGENTA:
+				strcat(str,"35;");
+				break;
+			case CYAN:
+				strcat(str,"36;");
+				break;
+			case LIGHTGRAY:
+				strcat(str,"37;");
+				break;
+		}
+	}
+	if((atr&0x70) != (curatr&0x70)) {
+		switch(atr&0x70) {
+			/* The BG_BLACK macro is 0x200, so isn't in the mask */
+			case 0 /* BG_BLACK */:	
+				strcat(str,"40;");
+				break;
+			case BG_RED:
+				strcat(str,"41;");
+				break;
+			case BG_GREEN:
+				strcat(str,"42;");
+				break;
+			case BG_BROWN:
+				strcat(str,"43;");
+				break;
+			case BG_BLUE:
+				strcat(str,"44;");
+				break;
+			case BG_MAGENTA:
+				strcat(str,"45;");
+				break;
+			case BG_CYAN:
+				strcat(str,"46;");
+				break;
+			case BG_LIGHTGRAY:
+				strcat(str,"47;");
+				break;
+		}
+	}
+	if(strlen(str)==2)	/* Convert <ESC>[ to blank */
+		*str=0;
+	else
+		str[strlen(str)-1]='m';
+	return str;
+}
+
 void sbbs_t::ansi_getlines()
 {
 	if(sys_status&SS_USERON && useron.misc&ANSI && !useron.rows /* Auto-detect rows */
 		&& online==ON_REMOTE) {									/* Remote */
 		SYNC;
-		putcom("\x1b[s\x1b[99B\x1b[6n\x1b[u");
-		inkey(K_NONE,TIMEOUT_ANSI_GETXY*1000); 
+		putcom("\x1b[s\x1b[255B\x1b[255C\x1b[6n\x1b[u");
+		inkey(K_ANSI_CPR,TIMEOUT_ANSI_GETXY*1000); 
 	}
 }
 
@@ -159,3 +255,33 @@ bool sbbs_t::ansi_getxy(int* x, int* y)
 
 	return(true);
 }
+
+bool sbbs_t::ansi_gotoxy(int x, int y)
+{
+	if(term_supports(ANSI)) {
+		rprintf("\x1b[%d;%dH",y,x);
+		if(x>0)
+			column=x-1;
+		lncntr=0;
+		return true;
+	}
+	return false;
+}
+
+bool sbbs_t::ansi_save(void)
+{
+	if(term_supports(ANSI)) {
+		rputs("\x1b[s");
+		return true;
+	}
+	return false;
+}
+
+bool sbbs_t::ansi_restore(void)
+{
+	if(term_supports(ANSI)) {
+		rputs("\x1b[u");
+		return true;
+	}
+	return false;
+}