X-Git-Url: http://git.shiar.nl/netris.git/blobdiff_plain/8e07b715e7538693509e8bd06247dd84ea75b7da..b3738f1f2b079c7eb910051bdca26e54b5f3e592:/curses.c

diff --git a/curses.c b/curses.c
index b4b0248..5a90d21 100644
--- a/curses.c
+++ b/curses.c
@@ -29,7 +29,7 @@
 #include "curses.h"
 #include "util.h"
 #include "board.h"
-#include "msg.en.h"
+#include "msg.h"
 
 #ifdef NCURSES_VERSION
 # define HAVE_NCURSES
@@ -67,7 +67,7 @@ void InitScreens(void)
 	 * Ctrl-C during initialization might leave the terminal in a bad state.
 	 */
 	BlockSignals(&oldMask, SIGINT, 0);
-	initscr();		//start curses
+	initscr();  //start curses
 
 #ifdef CURSES_HACK
 	{
@@ -84,14 +84,14 @@ void InitScreens(void)
 			char type;
 			short color;
 		} myColorTable[] = {
-			{ BT_white,   COLOR_WHITE },
-			{ BT_blue,    COLOR_BLUE },
-			{ BT_magenta, COLOR_MAGENTA },
-			{ BT_cyan,    COLOR_CYAN },
-			{ BT_yellow,  COLOR_YELLOW },
-			{ BT_green,   COLOR_GREEN },
-			{ BT_red,     COLOR_RED },
-			{ BT_none,    0 }
+			{ BT_T, COLOR_WHITE },
+			{ BT_I, COLOR_BLUE },
+			{ BT_O, COLOR_MAGENTA },
+			{ BT_L, COLOR_CYAN },
+			{ BT_J, COLOR_YELLOW },
+			{ BT_S, COLOR_GREEN },
+			{ BT_Z, COLOR_RED },
+			{ BT_none, 0 }
 		}; //myColorTable
 		int i = 0;
 
@@ -202,7 +202,7 @@ void OutputTermStr(char *str, int flush)
 void DrawTitle(void)
 {
 	int rows, cols;
-	char s[255];
+	char *s;
 
 #ifdef HAVE_NCURSES
 	attrset(A_REVERSE);
@@ -210,13 +210,15 @@ void DrawTitle(void)
 	standout();
 #endif
 	getmaxyx(stdscr, rows, cols);
-	sprintf(s, " NETRIS %s", version_string);
-	memset(&s[strlen(s)], ' ', 254 - strlen(s));
-	if (cols > 56 + strlen(version_string))
-		memcpy(&s[cols - 48],
-			"(C)1994-1996,1999 Mark H. Weaver, (C)2002 Shiar \0", 49);
-	else memcpy(&s[cols], "\0", 1);
+	s = malloc(cols + 1);
+	sprintf(s, " " MSG_TITLE " %s", version_string);
+	const int titlelen = strlen(s);
+	memset(&s[titlelen], ' ', cols - titlelen); // pad
+	if (cols > titlelen + 1 + strlen(MSG_TITLESUB))
+		memcpy(&s[cols - 1 - strlen(MSG_TITLESUB)], MSG_TITLESUB, sizeof(MSG_TITLESUB) - 1);
+	memcpy(&s[cols], "\0", 1);
 	mvaddstr(0, 0, s);
+	free(s);
 	standend();	//normal text
 }
 
@@ -288,10 +290,10 @@ void InitFields(void)
 
 	messageXPos = 2;
 	messageYPos = 24;
-	if ((messageWidth = x - messageXPos - 2) > MSG_WIDTH) messageWidth = MSG_WIDTH;
-	if ((messageHeight = y - messageYPos - 1) > MSG_HEIGHT) messageHeight = MSG_HEIGHT;
-	if (messageHeight <= 0) {
-		messageWidth = 27;
+	messageWidth  = MIN(x - messageXPos - 2, MSG_WIDTH);
+	messageHeight = MIN(y - messageYPos - 1, MSG_HEIGHT);
+	if (messageHeight < 3) {
+		messageWidth = MIN(x - statusXPos - 18, 27);
 		messageHeight = y - 3;
 		messageXPos = statusXPos + 16;
 		messageYPos = 2;
@@ -299,7 +301,7 @@ void InitFields(void)
 	DrawBox(messageXPos - 2, messageYPos - 1,
 		messageXPos + messageWidth + 1, messageYPos+messageHeight);
 	if (msgwin = subwin(stdscr, messageHeight, messageWidth,
-				messageYPos, messageXPos))
+	                    messageYPos, messageXPos))
 		scrollok(msgwin, 1);  //allow scrolling
 	wmove(msgwin, messageHeight - 2, 0);
 	for (scr = messageHeight - 2; scr >= 0; scr--) //display message history
@@ -335,10 +337,6 @@ void InitFields(void)
 		DrawField(scr);
 }
 
-void CleanupScreen(int scr)
-{
-}
-
 void DisplayMessage(char *p)
 {
 	char s[MSG_WIDTH];
@@ -351,7 +349,7 @@ void DisplayMessage(char *p)
 	while (psearch = strchr(p, '\\')) {
 		*psearch = '\0';
 		waddstr(msgwin, p);
-		c = atoi(++psearch)+1;
+		c = atoi(++psearch) + 1;
 		if (haveColor) wattrset(msgwin, A_REVERSE | COLOR_PAIR(c));
 		p = ++psearch;
 	} //search for color escapes (\)
@@ -513,8 +511,8 @@ void ShowScore(int scr, struct _Score score)
 
 	mvaddstr(13, statusXPos, MSG_NEXT " ");
 	mvaddstr(14, statusXPos + 5,  "        ");
-	ShapeIterate(Players[scr].nextShape, scr,
-		8, statusXPos/2 + (Players[scr].nextShape/4 == 5 ? 3 : 4),
+	ShapeIterate(Players[scr].nextShape, scr, 8,
+		statusXPos/2 + (Players[scr].nextShape/4 == 5 ? 3 : 4),
 		GlanceFunc); //draw; stick one more to the left
 	mvprintw(3, statusXPos, MSG_LEVEL, score.level);
 	mvprintw(5, statusXPos, MSG_SCORE, score.score);