New style to specify ANSI escape commands.

First introduced by pmore, but this hard work
(to transform all files to new style) is made by
Rong-en Fan (rafan). Thanks!


git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@2796 63ad8ddf-47c3-0310-b6dd-a9e9d9715204

1 files changed, 18 insertions, 18 deletions

diff --git a/mbbsd/xyz.c b/mbbsd/xyz.c
index 1837c508..490febd8 100644
--- a/mbbsd/xyz.c
+++ b/mbbsd/xyz.c
@@ -180,7 +180,7 @@ note(void)
     notedata_t      myitem;
 
     if (cuser.money < 5) {
-	vmsg("\033[1;41m «u§r! ­n§ë¤­»È¤~¯à¯d¨¥...¨S¿ú­C..\033[m");
+	vmsg(ANSI_COLOR(1;41) " «u§r! ­n§ë¤­»È¤~¯à¯d¨¥...¨S¿ú­C.." ANSI_RESET);
 	return 0;
     }
     setutmpmode(EDNOTE);
@@ -226,37 +226,37 @@ note(void)
 	if (total > MAX_NOTE)
 	    total = MAX_NOTE;
     }
-    fputs("\033[1;31;44m¡ó¢s¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢t"
-	  "\033[37m»Ä²¢­W»¶ªO\033[31m¢u¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢s¡ó"
-	  "\033[m\n", fp);
+    fputs(ANSI_COLOR(1;31;44) "¡ó¢s¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢t"
+	  ANSI_COLOR(37) "»Ä²¢­W»¶ªO" ANSI_COLOR(31) "¢u¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢s¡ó"
+	  ANSI_RESET "\n", fp);
     collect = 1;
 
     while (total) {
-	snprintf(buf, sizeof(buf), "\033[1;31mùÝ¢t\033[32m %s \033[37m(%s)",
+	snprintf(buf, sizeof(buf), ANSI_COLOR(1;31) "ùÝ¢t" ANSI_COLOR(32) " %s " ANSI_COLOR(37) "(%s)",
 		myitem.userid, myitem.username);
 	len = strlen(buf);
 
 	for (i = len; i < 71; i++)
 	    strcat(buf, " ");
-	snprintf(buf2, sizeof(buf2), " \033[1;36m%.16s\033[31m   ¢uùß\033[m\n",
+	snprintf(buf2, sizeof(buf2), " " ANSI_COLOR(1;36) "%.16s" ANSI_COLOR(31) "   ¢uùß" ANSI_RESET "\n",
 		Cdate(&(myitem.date)));
 	strcat(buf, buf2);
 	fputs(buf, fp);
 	if (collect)
 	    fputs(buf, foo);
 	for (i = 0; i < 3 && *myitem.buf[i]; i++) {
-	    fprintf(fp, "\033[1;31m¢x\033[m%-74.74s\033[1;31m¢x\033[m\n",
+	    fprintf(fp, ANSI_COLOR(1;31) "¢x" ANSI_RESET "%-74.74s" ANSI_COLOR(1;31) "¢x" ANSI_RESET "\n",
 		    myitem.buf[i]);
 	    if (collect)
-		fprintf(foo, "\033[1;31m¢x\033[m%-74.74s\033[1;31m¢x\033[m\n",
+		fprintf(foo, ANSI_COLOR(1;31) "¢x" ANSI_RESET "%-74.74s" ANSI_COLOR(1;31) "¢x" ANSI_RESET "\n",
 			myitem.buf[i]);
 	}
-	fputs("\033[1;31mùã¢s¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w"
-	      "¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢sùå\033[m\n", fp);
+	fputs(ANSI_COLOR(1;31) "ùã¢s¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w"
+	      "¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢sùå" ANSI_RESET "\n", fp);
 
 	if (collect) {
-	    fputs("\033[1;31mùã¢s¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w"
-		  "¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢sùå\033[m\n", foo);
+	    fputs(ANSI_COLOR(1;31) "ùã¢s¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w"
+		  "¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢sùå" ANSI_RESET "\n", foo);
 	    fclose(foo);
 	    collect = 0;
 	}
@@ -265,8 +265,8 @@ note(void)
 	if (--total)
 	    read(fd, (char *)&myitem, sizeof(myitem));
     }
-    fputs("\033[1;31;44m¡ó¢r¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w"
-	  "¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢r¡ó\033[m\n", fp);
+    fputs(ANSI_COLOR(1;31;44) "¡ó¢r¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w"
+	  "¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢r¡ó" ANSI_RESET "\n", fp);
     fclose(fp);
     close(fd);
     close(fx);
@@ -314,9 +314,9 @@ mail_sysop(void)
 	outs("            ½s¸¹   ¯¸ªø ID           Åv³d¹º¤À\n\n");
 
 	for (i = 0; i < j; i++)
-	    prints("%15d.   \033[1;%dm%-16s%s\033[0m\n",
+	    prints("%15d.   " ANSI_COLOR(1;%d) "%-16s%s" ANSI_COLOR(0) "\n",
 		 i + 1, 31 + i % 7, sysoplist[i].userid, sysoplist[i].duty);
-	prints("%-14s0.   \033[1;%dmÂ÷¶}\033[0m", "", 31 + j % 7);
+	prints("%-14s0.   " ANSI_COLOR(1;%d) "Â÷¶}" ANSI_COLOR(0) "", "", 31 + j % 7);
 	getdata(b_lines - 1, 0, "                   ½Ð¿é¤J¥N½X[0]¡G",
 		genbuf, 4, DOECHO);
 	i = genbuf[0] - '0' - 1;
@@ -357,8 +357,8 @@ Goodbye(void)
 	    note();
     }
     clear();
-    prints("\033[1;36m¿Ë·Rªº \033[33m%s(%s)\033[36m¡A§O§Ñ¤F¦A«×¥úÁ{\033[45;33m"
-	   " %s \033[40;36m¡I\n¥H¤U¬O±z¦b¯¸¤ºªºµù¥U¸ê®Æ:\033[0m\n",
+    prints(ANSI_COLOR(1;36) "¿Ë·Rªº " ANSI_COLOR(33) "%s(%s)" ANSI_COLOR(36) "¡A§O§Ñ¤F¦A«×¥úÁ{" ANSI_COLOR(45;33) ""
+	   " %s " ANSI_COLOR(40;36) "¡I\n¥H¤U¬O±z¦b¯¸¤ºªºµù¥U¸ê®Æ:" ANSI_COLOR(0) "\n",
 	   cuser.userid, cuser.username, BBSName);
     user_display(&cuser, 0);
     pressanykey();