X-Git-Url: http://git.shiar.nl/netris.git/blobdiff_plain/1462010f0cd5937383b14e1e35a2a163087007f0..bed729727d8fef3695e5252f17cfbbe8f2aca879:/curses.c diff --git a/curses.c b/curses.c index 7c95782..98465b6 100644 --- a/curses.c +++ b/curses.c @@ -29,30 +29,27 @@ #include "curses.h" #include "util.h" #include "board.h" -#include "msg.en.h" +#include "msg.h" #ifdef NCURSES_VERSION # define HAVE_NCURSES #endif +window_t window[MAX_SCREENS]; + 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 int boardYPos[MAX_SCREENS], boardXPos[MAX_SCREENS]; -static int boardSize[MAX_SCREENS]; -//^^^struct static int statusYPos, statusXPos; static int messageYPos, messageXPos, messageHeight, messageWidth; WINDOW *msgwin; static int haveColor; -int PlayerDisp[MAX_SCREENS]; #define MSG_HEIGHT 64 //max history -char *message[MSG_HEIGHT]; -char messages[MSG_HEIGHT][MSG_WIDTH]; +static char *message[MSG_HEIGHT]; +static char messages[MSG_HEIGHT][MSG_WIDTH]; static char *term_vi; /* String to make cursor invisible */ static char *term_ve; /* String to make cursor visible */ @@ -68,7 +65,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 { @@ -85,14 +82,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; @@ -135,7 +132,7 @@ void CleanupScreens(void) OutputTermStr(term_ve, 1); } -void GetTermcapInfo(void) +static void GetTermcapInfo(void) { char *term, *buf, *data; int bufSize = 8192; @@ -192,7 +189,7 @@ void GetTermcapInfo(void) term_vi = term_ve = NULL; } -void OutputTermStr(char *str, int flush) +static void OutputTermStr(char *str, int flush) { if (str) { fputs(str, stdout); @@ -200,10 +197,10 @@ void OutputTermStr(char *str, int flush) } } -void DrawTitle(void) +static void DrawTitle(void) { int rows, cols; - char s[255]; + char *s; #ifdef HAVE_NCURSES attrset(A_REVERSE); @@ -211,13 +208,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 } @@ -243,11 +242,11 @@ void DrawBox(int x1, int y1, int x2, int y2) void DrawField(int scr) { //draw field for player scr - if (!PlayerDisp[scr]) return; - DrawBox(boardXPos[scr] - 1, boardYPos[scr] - Players[scr].boardVisible, - boardXPos[scr] + boardSize[scr] * Players[scr].boardWidth, boardYPos[scr] + 1); + if (!window[scr].shown) return; + DrawBox(window[scr].posx - 1, window[scr].posy - Players[scr].boardVisible, + window[scr].posx + window[scr].size * Players[scr].boardWidth, window[scr].posy + 1); { - char s[boardSize[scr]*Players[scr].boardWidth+1]; + char s[window[scr].size * Players[scr].boardWidth + 1]; if (Players[scr].host && Players[scr].host[0]) snprintf(s, sizeof(s), " %s <%s> ", @@ -256,7 +255,7 @@ void DrawField(int scr) s[sizeof(s)] = 0; if (haveColor && Players[scr].team > 0 && Players[scr].team <= 7) attrset(A_REVERSE | COLOR_PAIR(Players[scr].team + 1)); - mvaddstr(1, boardXPos[scr], s); + mvaddstr(1, window[scr].posx, s); if (haveColor) standend(); } //display playername/host @@ -279,20 +278,20 @@ void InitFields(void) clear(); DrawTitle(); getmaxyx(stdscr, y, x); - boardSize[me] = 2; - boardXPos[me] = 1; - boardYPos[me] = 21; - PlayerDisp[me] = 1; - statusXPos = boardSize[me] * Players[me].boardWidth + 3; + window[me].size = 2; + window[me].posx = 1; + window[me].posy = 21; + window[me].shown = 1; + statusXPos = window[me].size * Players[me].boardWidth + 3; statusYPos = 21; ShowScore(me, Players[me].score); 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; @@ -300,7 +299,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 @@ -311,36 +310,32 @@ void InitFields(void) spaceavail -= Players[scr].boardWidth+2; prevscr = me; for (scr = 1; scr < MAX_SCREENS; scr++) if (scr != me) { - boardYPos[scr] = 21; - boardXPos[scr] = - boardXPos[prevscr] + 2 + boardSize[prevscr] * Players[prevscr].boardWidth; + window[scr].posy = 21; + window[scr].posx = + window[prevscr].posx + 2 + window[prevscr].size * Players[prevscr].boardWidth; if (prevscr == me) { - boardXPos[scr] += 15; //scorebar + window[scr].posx += 15; //scorebar if (messageYPos < 24) - boardXPos[scr] += messageWidth + 4; //messagebox - spaceavail -= boardXPos[scr] - 3; + window[scr].posx += messageWidth + 4; //messagebox + spaceavail -= window[scr].posx - 3; } //stuff before second player if (spaceavail >= 0) { - boardSize[scr] = 2; + window[scr].size = 2; spaceavail -= Players[scr].boardWidth; } //not enough space, half width else - boardSize[scr] = 1; - if (x < boardXPos[scr] + 1 + boardSize[scr] * Players[scr].boardWidth) - PlayerDisp[scr] = 0; //field doesn't fit on screen + window[scr].size = 1; + if (x < window[scr].posx + 1 + window[scr].size * Players[scr].boardWidth) + window[scr].shown = 0; //field doesn't fit on screen else - PlayerDisp[scr] = 1; + window[scr].shown = 1; prevscr = scr; } for (scr = 1; scr <= maxPlayer; scr++) DrawField(scr); } -void CleanupScreen(int scr) -{ -} - -void DisplayMessage(char *p) +static void DisplayMessage(char *p) { char s[MSG_WIDTH]; char *psearch; @@ -352,7 +347,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 (\) @@ -400,7 +395,7 @@ void Messagetype(char c, int x, char *s) wrefresh(msgwin); } -void PlotBlock1(int y, int x, unsigned char type) +static void PlotBlock1(int y, int x, unsigned char type) { //display block on screen move(y, x); if (type == BT_none) addstr(" "); @@ -469,7 +464,7 @@ void PlotBlock1(int y, int x, unsigned char type) #endif } //display one brick } -void PlotBlock1S(int y, int x, unsigned char type) +static void PlotBlock1S(int y, int x, unsigned char type) { //display block small move(y, x); if (type == BT_none) addch(' '); @@ -497,10 +492,10 @@ 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 (boardSize[scr] > 1) - PlotBlock1(boardYPos[scr] - y, boardXPos[scr] + 2*x, type); + if (window[scr].size > 1) + PlotBlock1(window[scr].posy - y, window[scr].posx + 2*x, type); else - PlotBlock1S(boardYPos[scr] - y, boardXPos[scr] + x, type); + PlotBlock1S(window[scr].posy - y, window[scr].posx + x, type); } //on screen } void PlotBlockXY(int y, int x, unsigned char type) @@ -514,8 +509,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); @@ -537,20 +532,20 @@ void ShowScore(int scr, struct _Score score) void FieldMessage(int playa, char *message) { //put a message over playa's field - if (!PlayerDisp[playa]) return; + if (!window[playa].shown) return; if (message) { char s[MAX_BOARD_WIDTH+1]; memset(s, ' ', MAX_BOARD_WIDTH); - memcpy(&s[(boardSize[playa] * Players[playa].boardWidth / 2) - (strlen(message) / 2)], + memcpy(&s[(window[playa].size * Players[playa].boardWidth / 2) - (strlen(message) / 2)], message, strlen(message)); - s[boardSize[playa] * Players[playa].boardWidth] = 0; + s[window[playa].size * Players[playa].boardWidth] = 0; #ifdef HAVE_NCURSES attrset(A_REVERSE); #else standout(); #endif - mvprintw(boardYPos[playa] - Players[playa].boardVisible / 2, - boardXPos[playa], "%s", s); + mvprintw(window[playa].posy - Players[playa].boardVisible / 2, + window[playa].posx, "%s", s); standend(); } //display else { @@ -566,20 +561,20 @@ void ShowPause(int playa) if (Players[playa].alive > 0) if (Players[playa].flags & SCF_paused) if (Game.started > 1) - FieldMessage(playa, boardSize[playa] > 1 ? "P A U S E D" : "PAUSED"); + FieldMessage(playa, window[playa].size > 1 ? "P A U S E D" : "PAUSED"); else FieldMessage(playa, - boardSize[playa] > 1 ? "N O T R E A D Y" : "NOT READY"); + window[playa].size > 1 ? "N O T R E A D Y" : "NOT READY"); else if (Game.started > 1) FieldMessage(playa, NULL); else - FieldMessage(playa, boardSize[playa] > 1 ? "R E A D Y" : "READY"); + FieldMessage(playa, window[playa].size > 1 ? "R E A D Y" : "READY"); else if (!Players[playa].alive) FieldMessage(playa, - boardSize[playa] > 1 ? "G A M E O V E R" : "GAME OVER"); + window[playa].size > 1 ? "G A M E O V E R" : "GAME OVER"); else - FieldMessage(playa, boardSize[playa] > 1 ? "E M P T Y" : "EMPTY"); + FieldMessage(playa, window[playa].size > 1 ? "E M P T Y" : "EMPTY"); } @@ -593,7 +588,7 @@ void ScheduleFullRedraw(void) touchwin(stdscr); } -void CatchWinCh(int sig) +static void CatchWinCh(int sig) { //handle window resize endwin(); //exit curses refresh(); //and reinit display (with different sizes)