X-Git-Url: http://git.shiar.net/netris.git/blobdiff_plain/5902d7f327fcf57d2b1a47f1b4a3aa98f4ab08a8..e7c197505ec760eb3754f3b6d1fbbc33c66a9316:/curses.c

diff --git a/curses.c b/curses.c
index e7f18c4..f9f23db 100644
--- a/curses.c
+++ b/curses.c
@@ -15,8 +15,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * $Id: curses.c,v 1.33 1999/05/16 06:56:25 mhw Exp $
  */
 
 #include "netris.h"
@@ -38,9 +36,10 @@
 #endif
 
 static MyEventType KeyGenFunc(EventGenRec *gen, MyEvent *event);
-static EventGenRec keyGen =
-//		{ NULL, 0, FT_read, STDIN_FILENO, KeyGenFunc, EM_key };
-		{ NULL, 0, FT_read, STDIN_FILENO, KeyGenFunc, EM_key };
+static EventGenRec keyGen = {
+//	NULL, 0, FT_read, STDIN_FILENO, KeyGenFunc, EM_key
+	NULL, 0, FT_read, STDIN_FILENO, KeyGenFunc, EM_key
+};
 
 static int boardYPos[MAX_SCREENS], boardXPos[MAX_SCREENS];
 static int boardSize[MAX_SCREENS];
@@ -51,12 +50,12 @@ WINDOW *msgwin;
 static int haveColor;
 int PlayerDisp[MAX_SCREENS];
 
-#define MSG_HEIGHT 64 //max history
+#define MSG_HEIGHT 64  //max history
 char *message[MSG_HEIGHT];
 char messages[MSG_HEIGHT][MSG_WIDTH];
 
-static char *term_vi;	/* String to make cursor invisible */
-static char *term_ve;	/* String to make cursor visible */
+static char *term_vi;  /* String to make cursor invisible */
+static char *term_ve;  /* String to make cursor visible */
 
 void InitScreens(void)
 {
@@ -127,14 +126,14 @@ void InitScreens(void)
 		for (i = 0; i<MSG_HEIGHT; i++)
 			message[i] = messages[i];  //set pointers
 	}
-} //InitScreens
+}
 
 void CleanupScreens(void)
 {
 	RemoveEventGen(&keyGen);
 	endwin();                      //end curses
 	OutputTermStr(term_ve, 1);
-} //CleanupScreens
+}
 
 void GetTermcapInfo(void)
 {
@@ -178,12 +177,12 @@ void GetTermcapInfo(void)
 			"vt100", "vt101", "vt102",
 			"vt200", "vt220", "vt300",
 			"vt320", "vt400", "vt420",
-			"screen", "xterm", NULL };
+			"screen", "xterm", NULL
+		};
 		int i;
 
 		for (i = 0; vts[i]; i++)
-			if (!strcmp(term, vts[i]))
-			{
+			if (!strcmp(term, vts[i])) {
 				term_vi = "\033[?25l";
 				term_ve = "\033[?25h";
 				break;
@@ -191,7 +190,7 @@ void GetTermcapInfo(void)
 	}
 	if (!term_vi || !term_ve)
 		term_vi = term_ve = NULL;
-} //GetTermcapInfo
+}
 
 void OutputTermStr(char *str, int flush)
 {
@@ -199,7 +198,7 @@ void OutputTermStr(char *str, int flush)
 		fputs(str, stdout);
 		if (flush) fflush(stdout);
 	}
-} //OutputTermStr
+}
 
 void DrawTitle(void)
 {
@@ -220,7 +219,7 @@ void DrawTitle(void)
 	else memcpy(&s[cols], "\0", 1);
 	mvaddstr(0, 0, s);
 	standend();	//normal text
-} //DrawTitle
+}
 
 void DrawBox(int x1, int y1, int x2, int y2)
 { //draw grid
@@ -240,7 +239,7 @@ void DrawBox(int x1, int y1, int x2, int y2)
 	for (x = x1 + 1; x < x2; x++)
 		addch(Sets.ascii ? '-' : ACS_HLINE);
 	addch(Sets.ascii ? '+' : ACS_LRCORNER);
-} //DrawBox
+}
 
 void DrawField(int scr)
 { //draw field for player scr
@@ -269,7 +268,7 @@ void DrawField(int scr)
 	} //draw field
 
 	ShowPause(scr);
-} //DrawField
+}
 
 void InitFields(void)
 { //calculate positions of all fields
@@ -335,7 +334,7 @@ void InitFields(void)
 	}
 	for (scr = 1; scr <= maxPlayer; scr++)
 		DrawField(scr);
-} //InitFields
+}
 
 void CleanupScreen(int scr)
 {
@@ -360,7 +359,7 @@ void DisplayMessage(char *p)
 	waddstr(msgwin, p);
 	if (haveColor) wstandend(msgwin);
 	waddch(msgwin, '\n');
-} //DisplayMessage
+}
 
 void Message(char *fmt, ...)
 { //print game/bot message
@@ -383,7 +382,7 @@ void Message(char *fmt, ...)
 	DisplayMessage(s);
 	wclrtoeol(msgwin);
 	wrefresh(msgwin);
-} //Message
+}
 
 void Messagetype(char c, int x, char *s)
 { //show single typed character
@@ -391,15 +390,15 @@ void Messagetype(char c, int x, char *s)
 		mvwaddch(msgwin, messageHeight-1, (x+1) % (messageWidth-1), ' ');
 	} //escape
 	else {
-		if (c == 13 || c==127) //enter/backspace
+		if (c == 13 || c == 127) //enter/backspace
 			mvwaddch(msgwin, messageHeight - 1, (x+2) % (messageWidth-1),
-				x>=messageWidth-3 ? s[x - messageWidth + 3] : ' ');
+				x >= messageWidth-3 ? s[x - messageWidth + 3] : ' ');
 		else //any character
 			mvwaddch(msgwin, messageHeight - 1, x % (messageWidth-1), c);
 		mvwaddch(msgwin, messageHeight - 1, (x+1) % (messageWidth-1), '_');
 	} //typing mode
 	wrefresh(msgwin);
-} //Messagetype
+}
 
 void PlotBlock1(int y, int x, unsigned char type)
 { //display block on screen
@@ -472,7 +471,7 @@ void PlotBlock1(int y, int x, unsigned char type)
 		if (Sets.standout) standend();
 #endif
 	} //display one brick
-} //PlotBlock1
+}
 void PlotBlock1S(int y, int x, unsigned char type)
 { //display block small
 	move(y, x);
@@ -496,21 +495,21 @@ void PlotBlock1S(int y, int x, unsigned char type)
 		if (Sets.standout) standend();
 #endif
 	} //display one brick
-} //PlotBlock1S
+}
 void PlotBlock(int scr, int y, int x, unsigned char type)
 {
-	if (y >= 0 && y < Players[scr].boardVisible &&
-		x >= 0 && x < Players[scr].boardWidth) {
+	if (y >= 0 && y < Players[scr].boardVisible
+	 && x >= 0 && x < Players[scr].boardWidth) {
 		if (boardSize[scr] > 1)
 			PlotBlock1(boardYPos[scr] - y, boardXPos[scr] + 2*x, type);
 		else
 			PlotBlock1S(boardYPos[scr] - y, boardXPos[scr] + x, type);
 	} //on screen
-} //PlotBlock
+}
 void PlotBlockXY(int y, int x, unsigned char type)
 { //Draw block at specified position on screen (not on field)
 	PlotBlock1(20 - y, 2 * x, type);
-} //PlotBlock
+}
 
 void ShowScore(int scr, struct _Score score)
 { //show score stuff
@@ -537,7 +536,7 @@ void ShowScore(int scr, struct _Score score)
 		for (i = 7; i <= 10; i++)
 			mvaddstr(i, statusXPos, "             ");
 	} //too early to display stats, remove old..
-} //ShowScore
+}
 
 void FieldMessage(int playa, char *message)
 { //put a message over playa's field
@@ -563,7 +562,7 @@ void FieldMessage(int playa, char *message)
 		for (x = 0; x <= Players[playa].boardWidth; x++)
 			PlotBlock(playa, y, x, GetBlock(playa, y, x));
 	} //restore field
-} //FieldMessage
+}
 
 void ShowPause(int playa)
 { //put paused over player's field
@@ -584,26 +583,26 @@ void ShowPause(int playa)
 			boardSize[playa] > 1 ? "G A M E  O V E R" : "GAME  OVER");
 	else
 		FieldMessage(playa, boardSize[playa] > 1 ? "E M P T Y" : "EMPTY");
-} //ShowPause
+}
 
 
 void ShowTime(void)
 { //display timer
 	mvprintw(statusYPos, statusXPos, "timer %7.0f ", CurTimeval() / 1e6);
-} //ShowTime
+}
 
 void ScheduleFullRedraw(void)
 {
 	touchwin(stdscr);
-} //ScheduleFullRedraw
+}
 
 void CatchWinCh(int sig)
 { //handle window resize
-	endwin();    //exit curses
-	refresh();    //and reinit display (with different sizes)
+	endwin();      //exit curses
+	refresh();     //and reinit display (with different sizes)
 	InitFields();  //manually redraw everything
-	refresh();    //refresh
-} //CatchWinCh
+	refresh();     //refresh
+}
 
 static MyEventType KeyGenFunc(EventGenRec *gen, MyEvent *event)
 { //read keypresses
@@ -611,9 +610,5 @@ static MyEventType KeyGenFunc(EventGenRec *gen, MyEvent *event)
 		return E_key;
 	else
 		return E_none;
-} //KeyGenFunc
+}
 
-/*
- * vi: ts=4 ai
- * vim: noai si
- */