X-Git-Url: http://git.shiar.net/netris.git/blobdiff_plain/0e934ad47c5e35e9a652dbe56961a707a32e7a54..cc18d725f485013b9be8bb16f3a93e5eef12d5c1:/curses.c diff --git a/curses.c b/curses.c index bece839..7b5a26d 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" @@ -31,16 +29,16 @@ #include "curses.h" #include "util.h" #include "board.h" -#include "msg.en.h" +#include "msg.h" #ifdef NCURSES_VERSION # define HAVE_NCURSES #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 +}; static int boardYPos[MAX_SCREENS], boardXPos[MAX_SCREENS]; static int boardSize[MAX_SCREENS]; @@ -51,12 +49,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) { @@ -69,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 { @@ -86,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; @@ -178,12 +176,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; @@ -204,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); @@ -212,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 - strlen(MSG_TITLE)); // 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 } @@ -290,8 +290,8 @@ 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; + messageWidth = MIN(x - messageXPos - 2, MSG_WIDTH); + messageHeight = MIN(y - messageYPos - 1, MSG_HEIGHT); if (messageHeight <= 0) { messageWidth = 27; messageHeight = y - 3; @@ -301,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 @@ -337,10 +337,6 @@ void InitFields(void) DrawField(scr); } -void CleanupScreen(int scr) -{ -} - void DisplayMessage(char *p) { char s[MSG_WIDTH]; @@ -353,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 (\) @@ -391,9 +387,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), '_'); @@ -414,59 +410,56 @@ void PlotBlock1(int y, int x, unsigned char type) } #endif switch (Sets.drawstyle) { - case 2: - switch (type & 192) { - case 64: //right neighbour - addstr("[["); - break; - case 128: //left - addstr("]]"); - break; - default: //both/none - addstr("[]"); - break; - } //horizontal stickiness - break; //ascii horizontally grouped - case 3: - switch (type & 240) { - case 48: - addstr("||"); break; //middle - case 64: case 80: case 96: - addstr("[="); break; //left end - case 112: - addstr("|="); break; - case 128: case 144: case 160: - addstr("=]"); break; //right end - case 176: - addstr("=|"); break; - case 192: case 208: case 224: - addstr("=="); break; - default: - addstr("[]"); break; //top/bottom/mid - } //neighbours - break; //ascii semi-grouped - case 7: - switch (type & 240) { - case 16: addch(ACS_ULCORNER); addch(ACS_URCORNER); break;//top end - case 32: addch(ACS_LLCORNER); addch(ACS_LRCORNER); break;//bottom end - case 48: addch(ACS_VLINE); addch(ACS_VLINE); break; //vertical middle - case 64: addch(' '); addch(ACS_HLINE); break; //left end - case 80: addch(ACS_ULCORNER); addch(ACS_TTEE); break; //top left corner - case 96: addch(ACS_LLCORNER); addch(ACS_BTEE); break; //bottom left corner - case 112: addch(ACS_LTEE); addch(ACS_PLUS); break; //vertical+right - case 128: addch(ACS_HLINE); addch(' '); break; //right end - case 144: addch(ACS_TTEE); addch(ACS_URCORNER); break; //top right corner - case 160: addch(ACS_BTEE); addch(ACS_LRCORNER); break; //bottom right corner - case 176: addch(ACS_PLUS); addch(ACS_RTEE); break; //vertical+left - case 192: addch(ACS_HLINE); addch(ACS_HLINE); break; //horizontal middle - case 208: addch(ACS_TTEE); addch(ACS_TTEE); break; //horizontal+down - case 224: addch(ACS_BTEE); addch(ACS_BTEE); break; //horizontal+up - default: addstr("[]"); break; - } //neighbours - break; //curses grouped + case 2: + switch (type & 192) { + case 64: //right neighbour + addstr("[["); break; + case 128: //left + addstr("]]"); break; + default: //both/none + addstr("[]"); break; + } //horizontal stickiness + break; //ascii horizontally grouped + case 3: + switch (type & 240) { + case 48: + addstr("||"); break; //middle + case 64: case 80: case 96: + addstr("[="); break; //left end + case 112: + addstr("|="); break; + case 128: case 144: case 160: + addstr("=]"); break; //right end + case 176: + addstr("=|"); break; + case 192: case 208: case 224: + addstr("=="); break; default: - addstr("[]"); - break; //ascii non-grouped + addstr("[]"); break; //top/bottom/mid + } //neighbours + break; //ascii semi-grouped + case 7: + switch (type & 240) { + case 16: addch(ACS_ULCORNER); addch(ACS_URCORNER); break;//top end + case 32: addch(ACS_LLCORNER); addch(ACS_LRCORNER); break;//bottom end + case 48: addch(ACS_VLINE); addch(ACS_VLINE); break; //vertical middle + case 64: addch('['); addch(ACS_HLINE); break; //left end + case 80: addch(ACS_ULCORNER); addch(ACS_TTEE); break; //top left corner + case 96: addch(ACS_LLCORNER); addch(ACS_BTEE); break; //bottom left corner + case 112: addch(ACS_LTEE); addch(ACS_PLUS); break; //vertical+right + case 128: addch(ACS_HLINE); addch(']'); break; //right end + case 144: addch(ACS_TTEE); addch(ACS_URCORNER); break; //top right corner + case 160: addch(ACS_BTEE); addch(ACS_LRCORNER); break; //bottom right corner + case 176: addch(ACS_PLUS); addch(ACS_RTEE); break; //vertical+left + case 192: addch(ACS_HLINE); addch(ACS_HLINE); break; //horizontal middle + case 208: addch(ACS_TTEE); addch(ACS_TTEE); break; //horizontal+down + case 224: addch(ACS_BTEE); addch(ACS_BTEE); break; //horizontal+up + default: addstr("[]"); break; + } //neighbours + break; //curses grouped + default: + addstr("[]"); + break; //ascii non-grouped } //draw block #ifdef HAVE_NCURSES if (Sets.standout) standend(); @@ -499,8 +492,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 @@ -518,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); @@ -599,10 +592,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)