X-Git-Url: http://git.shiar.net/netris.git/blobdiff_plain/0e934ad47c5e35e9a652dbe56961a707a32e7a54..6286afa8518283f62f303e5b6ce188c9bb28e562:/curses.c

diff --git a/curses.c b/curses.c
index bece839..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)
 {
@@ -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;
@@ -391,9 +390,9 @@ 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), '_');
@@ -499,8 +498,8 @@ void PlotBlock1S(int y, int x, unsigned char type)
 }
 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
@@ -599,10 +598,10 @@ void ScheduleFullRedraw(void)
 
 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
+	refresh();     //refresh
 }
 
 static MyEventType KeyGenFunc(EventGenRec *gen, MyEvent *event)