Index: uspace/app/tetris/input.c =================================================================== --- uspace/app/tetris/input.c (revision 0c25c10b972ef53d852bb84a0277997565177111) +++ uspace/app/tetris/input.c (revision ebe70f1610c35a5ff9b28fb7ce19713ff86b42ac) @@ -37,5 +37,5 @@ /** @addtogroup tetris - * @{ + * @{ */ /** @file @@ -93,11 +93,10 @@ * */ -int -rwait(struct timeval *tvp) +int rwait(struct timeval *tvp) { struct timeval starttv, endtv, *s; static ipc_call_t charcall; ipcarg_t rc; - + /* * Someday, select() will do this for us. @@ -111,5 +110,5 @@ } else s = NULL; - + if (!lastchar) { again: @@ -118,4 +117,5 @@ CONSOLE_GET_EVENT, &charcall); } + if (!s) async_wait_for(getchar_inprog, &rc); @@ -125,20 +125,23 @@ return (0); } + getchar_inprog = 0; - if (rc) { + if (rc) stop("end of file, help"); - } + if (IPC_GET_ARG1(charcall) == KEY_RELEASE) goto again; - + lastchar = IPC_GET_ARG4(charcall); } + if (tvp) { /* since there is input, we may not have timed out */ (void) gettimeofday(&endtv, NULL); TV_SUB(&endtv, &starttv); - TV_SUB(tvp, &endtv); /* adjust *tvp by elapsed time */ + TV_SUB(tvp, &endtv); /* adjust *tvp by elapsed time */ } - return (1); + + return 1; } @@ -147,9 +150,8 @@ * Eat any input that might be available. */ -void -tsleep(void) +void tsleep(void) { struct timeval tv; - + tv.tv_sec = 0; tv.tv_usec = fallrate; @@ -164,10 +166,9 @@ * getchar with timeout. */ -int -tgetchar(void) +int tgetchar(void) { static struct timeval timeleft; char c; - + /* * Reset timeleft to fallrate whenever it is not positive. @@ -180,16 +181,17 @@ */ if (!TV_POS(&timeleft)) { - faster(); /* go faster */ + faster(); /* go faster */ timeleft.tv_sec = 0; timeleft.tv_usec = fallrate; } + if (!rwait(&timeleft)) - return (-1); + return -1; + c = lastchar; lastchar = '\0'; - return ((int)(unsigned char)c); + return ((int) (unsigned char) c); } /** @} */ - Index: uspace/app/tetris/input.h =================================================================== --- uspace/app/tetris/input.h (revision 0c25c10b972ef53d852bb84a0277997565177111) +++ uspace/app/tetris/input.h (revision ebe70f1610c35a5ff9b28fb7ce19713ff86b42ac) @@ -37,14 +37,13 @@ /** @addtogroup tetris - * @{ + * @{ */ /** @file */ -int rwait(struct timeval *); -int tgetchar(void); -void tsleep(void); +extern int rwait(struct timeval *); +extern int tgetchar(void); +extern void tsleep(void); /** @} */ - Index: uspace/app/tetris/pathnames.h =================================================================== --- uspace/app/tetris/pathnames.h (revision 0c25c10b972ef53d852bb84a0277997565177111) +++ (revision ) @@ -1,49 +1,0 @@ -/* $OpenBSD: pathnames.h,v 1.3 2003/06/03 03:01:41 millert Exp $ */ -/* $NetBSD: pathnames.h,v 1.2 1995/04/22 07:42:37 cgd Exp $ */ - -/*- - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Chris Torek and Darren F. Provine. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)pathnames.h 8.1 (Berkeley) 5/31/93 - */ - -/** @addtogroup tetris - * @{ - */ -/** @file - */ - -#define _PATH_SCOREFILE "/var/games/tetris.scores" - - -/** @} - */ - Index: uspace/app/tetris/scores.c =================================================================== --- uspace/app/tetris/scores.c (revision 0c25c10b972ef53d852bb84a0277997565177111) +++ uspace/app/tetris/scores.c (revision ebe70f1610c35a5ff9b28fb7ce19713ff86b42ac) @@ -37,5 +37,5 @@ /** @addtogroup tetris - * @{ + * @{ */ /** @file @@ -49,10 +49,7 @@ * Major whacks since then. */ + #include -/* #include */ -/* #include */ -/* #include */ #include -/* #include */ #include #include @@ -60,12 +57,8 @@ #include #include -/* #include */ -/* #include */ -/* #include */ -/* #include */ -/* #include */ -/* #include */ - -#include "pathnames.h" +#include +#include +#include + #include "screen.h" #include "tetris.h" @@ -80,18 +73,20 @@ * that level. */ -#define NUMSPOTS (MAXHISCORES + 1) -#define NLEVELS (MAXLEVEL + 1) - -/* static time_t now; */ -/* static int nscores; */ -/* static int gotscores; */ -/* static struct highscore scores[NUMSPOTS]; */ + +#define NUMSPOTS (MAXHISCORES + 1) +#define NLEVELS (MAXLEVEL + 1) + static struct highscore scores[NUMSPOTS]; -/* static int checkscores(struct highscore *, int); */ -/* static int cmpscores(const void *, const void *); */ -/* static void getscores(FILE **); */ -/* static void printem(int, int, struct highscore *, int, const char *); */ -/* static char *thisuser(void); */ +/** Copy from hiscore table score with index src to dest + * + */ +static void copyhiscore(int dest, int src) +{ + str_cpy(scores[dest].hs_name, STR_BOUNDS(MAXLOGNAME) + 1, + scores[src].hs_name); + scores[dest].hs_score = scores[src].hs_score; + scores[dest].hs_level = scores[src].hs_level; +} void showscores(int firstgame) @@ -103,57 +98,53 @@ printf("\tRank \tLevel \tName\t points\n"); printf("\t========================================================\n"); - for (i = 0; i < NUMSPOTS - 1; i++) { - printf("\t%6d %6d %-16s %20d\n", i+1, scores[i].hs_level, scores[i].hs_name, scores[i].hs_score); - } + + for (i = 0; i < NUMSPOTS - 1; i++) + printf("\t%6d %6d %-16s %20d\n", + i + 1, scores[i].hs_level, scores[i].hs_name, scores[i].hs_score); + if (!firstgame) { printf("\t========================================================\n"); - printf("\t Last %6d %-16s %20d\n", scores[NUMSPOTS - 1].hs_level, scores[NUMSPOTS - 1].hs_name, scores[NUMSPOTS - 1].hs_score); + printf("\t Last %6d %-16s %20d\n", + scores[NUMSPOTS - 1].hs_level, scores[NUMSPOTS - 1].hs_name, scores[NUMSPOTS - 1].hs_score); } + printf("\n\n\n\n\tPress any key to return to main menu."); getchar(); } -/** Copy from hiscore table score with index src to dest - * - */ -static void copyhiscore(int dest, int src) -{ - str_cpy(scores[dest].hs_name, STR_BOUNDS(MAXLOGNAME) + 1, - scores[src].hs_name); - scores[dest].hs_score = scores[src].hs_score; - scores[dest].hs_level = scores[src].hs_level; -} - void insertscore(int score, int level) { - int i,j; + int i; + int j; size_t off; console_event_t ev; clear_screen(); - moveto(10 , 10); + moveto(10, 10); puts("Insert your name: "); str_cpy(scores[NUMSPOTS - 1].hs_name, STR_BOUNDS(MAXLOGNAME) + 1, "Player"); - i = 6; off = 6; - + i = 6; + off = 6; + moveto(10 , 28); - printf("%s%.*s",scores[NUMSPOTS - 1].hs_name,MAXLOGNAME-i,"........................................"); - + printf("%s%.*s", scores[NUMSPOTS - 1].hs_name, MAXLOGNAME-i, + "........................................"); + while (1) { fflush(stdout); if (!console_get_event(fphone(stdin), &ev)) exit(1); - + if (ev.type == KEY_RELEASE) continue; - + if (ev.key == KC_ENTER || ev.key == KC_NENTER) break; - + if (ev.key == KC_BACKSPACE) { if (i > 0) { wchar_t uc; - + --i; while (off > 0) { @@ -165,5 +156,5 @@ break; } - + scores[NUMSPOTS - 1].hs_name[off] = '\0'; } @@ -178,397 +169,32 @@ } - moveto(10 , 28); - printf("%s%.*s",scores[NUMSPOTS - 1].hs_name,MAXLOGNAME-i,"........................................"); + moveto(10, 28); + printf("%s%.*s", scores[NUMSPOTS - 1].hs_name, MAXLOGNAME - i, + "........................................"); } - scores[NUMSPOTS - 1].hs_score = score; + scores[NUMSPOTS - 1].hs_score = score; scores[NUMSPOTS - 1].hs_level = level; - i = NUMSPOTS-1; + i = NUMSPOTS - 1; while ((i > 0) && (scores[i - 1].hs_score < score)) i--; - - for (j = NUMSPOTS - 2; j > i; j--) { - copyhiscore(j,j-1); + + for (j = NUMSPOTS - 2; j > i; j--) + copyhiscore(j, j-1); + + copyhiscore(i, NUMSPOTS - 1); +} + +void initscores(void) +{ + int i; + for (i = 0; i < NUMSPOTS; i++) { + str_cpy(scores[i].hs_name, STR_BOUNDS(MAXLOGNAME) + 1, "HelenOS Team"); + scores[i].hs_score = (NUMSPOTS - i) * 200; + scores[i].hs_level = (i + 1 > MAXLEVEL ? MAXLEVEL : i + 1); } - copyhiscore(i, NUMSPOTS - 1); -} - -void initscores(void) -{ - int i; - for(i = 0; i < NUMSPOTS; i++) { - str_cpy(scores[i].hs_name, STR_BOUNDS(MAXLOGNAME) + 1, "HelenOS Team"); - scores[i].hs_score = (NUMSPOTS - i) * 200; - scores[i].hs_level = (i + 1 > MAXLEVEL?MAXLEVEL:i + 1); - } -} - -/* - * Read the score file. Can be called from savescore (before showscores) - * or showscores (if savescore will not be called). If the given pointer - * is not NULL, sets *fpp to an open file pointer that corresponds to a - * read/write score file that is locked with LOCK_EX. Otherwise, the - * file is locked with LOCK_SH for the read and closed before return. - * - * Note, we assume closing the stdio file releases the lock. - */ -/* static void */ -/* getscores(FILE **fpp) */ -/* { */ -/* int sd, mint, lck, mask, i; */ -/* char *mstr, *human; */ -/* FILE *sf; */ - -/* if (fpp != NULL) { */ -/* mint = O_RDWR | O_CREAT; */ -/* mstr = "r+"; */ -/* human = "read/write"; */ -/* lck = LOCK_EX; */ -/* } else { */ -/* mint = O_RDONLY; */ -/* mstr = "r"; */ -/* human = "reading"; */ -/* lck = LOCK_SH; */ -/* } */ -/* setegid(egid); */ -/* mask = umask(S_IWOTH); */ -/* sd = open(_PATH_SCOREFILE, mint, 0666); */ -/* (void)umask(mask); */ -/* setegid(gid); */ -/* if (sd < 0) { */ -/* if (fpp == NULL) { */ -/* nscores = 0; */ -/* return; */ -/* } */ -/* err(1, "cannot open %s for %s", _PATH_SCOREFILE, human); */ -/* } */ -/* setegid(egid); */ -/* if ((sf = fdopen(sd, mstr)) == NULL) */ -/* err(1, "cannot fdopen %s for %s", _PATH_SCOREFILE, human); */ -/* setegid(gid); */ - -/* /\* */ -/* * Grab a lock. */ -/* *\/ */ -/* if (flock(sd, lck)) */ -/* warn("warning: score file %s cannot be locked", */ -/* _PATH_SCOREFILE); */ - -/* nscores = fread(scores, sizeof(scores[0]), MAXHISCORES, sf); */ -/* if (ferror(sf)) */ -/* err(1, "error reading %s", _PATH_SCOREFILE); */ -/* for (i = 0; i < nscores; i++) */ -/* if (scores[i].hs_level < MINLEVEL || */ -/* scores[i].hs_level > MAXLEVEL) */ -/* errx(1, "scorefile %s corrupt", _PATH_SCOREFILE); */ - -/* if (fpp) */ -/* *fpp = sf; */ -/* else */ -/* (void)fclose(sf); */ -/* } */ - -void -savescore(int level) -{ - return; -} -/* struct highscore *sp; */ -/* int i; */ -/* int change; */ -/* FILE *sf; */ -/* const char *me; */ - -/* getscores(&sf); */ -/* gotscores = 1; */ -/* (void)time(&now); */ - -/* /\* */ -/* * Allow at most one score per person per level -- see if we */ -/* * can replace an existing score, or (easiest) do nothing. */ -/* * Otherwise add new score at end (there is always room). */ -/* *\/ */ -/* change = 0; */ -/* me = thisuser(); */ -/* for (i = 0, sp = &scores[0]; i < nscores; i++, sp++) { */ -/* if (sp->hs_level != level || str_cmp(sp->hs_name, me) != 0) */ -/* continue; */ -/* if (score > sp->hs_score) { */ -/* (void)printf("%s bettered %s %d score of %d!\n", */ -/* "\nYou", "your old level", level, */ -/* sp->hs_score * sp->hs_level); */ -/* sp->hs_score = score; /\* new score *\/ */ -/* sp->hs_time = now; /\* and time *\/ */ -/* change = 1; */ -/* } else if (score == sp->hs_score) { */ -/* (void)printf("%s tied %s %d high score.\n", */ -/* "\nYou", "your old level", level); */ -/* sp->hs_time = now; /\* renew it *\/ */ -/* change = 1; /\* gotta rewrite, sigh *\/ */ -/* } /\* else new score < old score: do nothing *\/ */ -/* break; */ -/* } */ -/* if (i >= nscores) { */ -/* strlcpy(sp->hs_name, me, sizeof sp->hs_name); */ -/* sp->hs_level = level; */ -/* sp->hs_score = score; */ -/* sp->hs_time = now; */ -/* nscores++; */ -/* change = 1; */ -/* } */ - -/* if (change) { */ -/* /\* */ -/* * Sort & clean the scores, then rewrite. */ -/* *\/ */ -/* nscores = checkscores(scores, nscores); */ -/* rewind(sf); */ -/* if (fwrite(scores, sizeof(*sp), nscores, sf) != nscores || */ -/* fflush(sf) == EOF) */ -/* warnx("error writing %s: %s\n\t-- %s", */ -/* _PATH_SCOREFILE, strerror(errno), */ -/* "high scores may be damaged"); */ -/* } */ -/* (void)fclose(sf); /\* releases lock *\/ */ -/* } */ - -/* - * Get login name, or if that fails, get something suitable. - * The result is always trimmed to fit in a score. - */ -/* static char * */ -/* thisuser(void) */ -/* { */ -/* const char *p; */ -/* struct passwd *pw; */ -/* static char u[sizeof(scores[0].hs_name)]; */ - -/* if (u[0]) */ -/* return (u); */ -/* p = getlogin(); */ -/* if (p == NULL || *p == '\0') { */ -/* pw = getpwuid(getuid()); */ -/* if (pw != NULL) */ -/* p = pw->pw_name; */ -/* else */ -/* p = " ???"; */ -/* } */ -/* strlcpy(u, p, sizeof(u)); */ -/* return (u); */ -/* } */ - -/* - * Score comparison function for qsort. - * - * If two scores are equal, the person who had the score first is - * listed first in the highscore file. - */ -/* static int */ -/* cmpscores(const void *x, const void *y) */ -/* { */ -/* const struct highscore *a, *b; */ -/* long l; */ - -/* a = x; */ -/* b = y; */ -/* l = (long)b->hs_level * b->hs_score - (long)a->hs_level * a->hs_score; */ -/* if (l < 0) */ -/* return (-1); */ -/* if (l > 0) */ -/* return (1); */ -/* if (a->hs_time < b->hs_time) */ -/* return (-1); */ -/* if (a->hs_time > b->hs_time) */ -/* return (1); */ -/* return (0); */ -/* } */ - -/* - * If we've added a score to the file, we need to check the file and ensure - * that this player has only a few entries. The number of entries is - * controlled by MAXSCORES, and is to ensure that the highscore file is not - * monopolised by just a few people. People who no longer have accounts are - * only allowed the highest score. Scores older than EXPIRATION seconds are - * removed, unless they are someone's personal best. - * Caveat: the highest score on each level is always kept. - */ -/* static int */ -/* checkscores(struct highscore *hs, int num) */ -/* { */ -/* struct highscore *sp; */ -/* int i, j, k, numnames; */ -/* int levelfound[NLEVELS]; */ -/* struct peruser { */ -/* char *name; */ -/* int times; */ -/* } count[NUMSPOTS]; */ -/* struct peruser *pu; */ - -/* /\* */ -/* * Sort so that highest totals come first. */ -/* * */ -/* * levelfound[i] becomes set when the first high score for that */ -/* * level is encountered. By definition this is the highest score. */ -/* *\/ */ -/* qsort((void *)hs, nscores, sizeof(*hs), cmpscores); */ -/* for (i = MINLEVEL; i < NLEVELS; i++) */ -/* levelfound[i] = 0; */ -/* numnames = 0; */ -/* for (i = 0, sp = hs; i < num;) { */ -/* /\* */ -/* * This is O(n^2), but do you think we care? */ -/* *\/ */ -/* for (j = 0, pu = count; j < numnames; j++, pu++) */ -/* if (str_cmp(sp->hs_name, pu->name) == 0) */ -/* break; */ -/* if (j == numnames) { */ -/* /\* */ -/* * Add new user, set per-user count to 1. */ -/* *\/ */ -/* pu->name = sp->hs_name; */ -/* pu->times = 1; */ -/* numnames++; */ -/* } else { */ -/* /\* */ -/* * Two ways to keep this score: */ -/* * - Not too many (per user), still has acct, & */ -/* * score not dated; or */ -/* * - High score on this level. */ -/* *\/ */ -/* if ((pu->times < MAXSCORES && */ -/* getpwnam(sp->hs_name) != NULL && */ -/* sp->hs_time + EXPIRATION >= now) || */ -/* levelfound[sp->hs_level] == 0) */ -/* pu->times++; */ -/* else { */ -/* /\* */ -/* * Delete this score, do not count it, */ -/* * do not pass go, do not collect $200. */ -/* *\/ */ -/* num--; */ -/* for (k = i; k < num; k++) */ -/* hs[k] = hs[k + 1]; */ -/* continue; */ -/* } */ -/* } */ -/* levelfound[sp->hs_level] = 1; */ -/* i++, sp++; */ -/* } */ -/* return (num > MAXHISCORES ? MAXHISCORES : num); */ -/* } */ - -/* - * Show current scores. This must be called after savescore, if - * savescore is called at all, for two reasons: - * - Showscores munches the time field. - * - Even if that were not the case, a new score must be recorded - * before it can be shown anyway. - */ -/* -void -showscores(int level) -{ - return; -} -*/ -/* struct highscore *sp; */ -/* int i, n, c; */ -/* const char *me; */ -/* int levelfound[NLEVELS]; */ - -/* if (!gotscores) */ -/* getscores((FILE **)NULL); */ -/* (void)printf("\n\t\t Tetris High Scores\n"); */ - -/* /\* */ -/* * If level == 0, the person has not played a game but just asked for */ -/* * the high scores; we do not need to check for printing in highlight */ -/* * mode. If SOstr is null, we can't do highlighting anyway. */ -/* *\/ */ -/* me = level && SOstr ? thisuser() : NULL; */ - -/* /\* */ -/* * Set times to 0 except for high score on each level. */ -/* *\/ */ -/* for (i = MINLEVEL; i < NLEVELS; i++) */ -/* levelfound[i] = 0; */ -/* for (i = 0, sp = scores; i < nscores; i++, sp++) { */ -/* if (levelfound[sp->hs_level]) */ -/* sp->hs_time = 0; */ -/* else { */ -/* sp->hs_time = 1; */ -/* levelfound[sp->hs_level] = 1; */ -/* } */ -/* } */ - -/* /\* */ -/* * Page each screenful of scores. */ -/* *\/ */ -/* for (i = 0, sp = scores; i < nscores; sp += n) { */ -/* n = 20; */ -/* if (i + n > nscores) */ -/* n = nscores - i; */ -/* printem(level, i + 1, sp, n, me); */ -/* if ((i += n) < nscores) { */ -/* (void)printf("\nHit RETURN to continue."); */ -/* (void)fflush(stdout); */ -/* while ((c = getchar()) != '\n') */ -/* if (c == EOF) */ -/* break; */ -/* (void)printf("\n"); */ -/* } */ -/* } */ - -/* if (nscores == 0) */ -/* printf("\t\t\t - none to date.\n"); */ -/* } */ - -/* static void */ -/* printem(int level, int offset, struct highscore *hs, int n, const char *me) */ -/* { */ -/* struct highscore *sp; */ -/* int row, highlight, i; */ -/* char buf[100]; */ -/* #define TITLE "Rank Score Name (points/level)" */ -/* #define TITL2 "==========================================================" */ - -/* printf("%s\n%s\n", TITLE, TITL2); */ - -/* highlight = 0; */ - -/* for (row = 0; row < n; row++) { */ -/* sp = &hs[row]; */ -/* (void)snprintf(buf, sizeof(buf), */ -/* "%3d%c %6d %-31s (%6d on %d)\n", */ -/* row + offset, sp->hs_time ? '*' : ' ', */ -/* sp->hs_score * sp->hs_level, */ -/* sp->hs_name, sp->hs_score, sp->hs_level); */ -/* /\* Print leaders every three lines *\/ */ -/* if ((row + 1) % 3 == 0) { */ -/* for (i = 0; i < sizeof(buf); i++) */ -/* if (buf[i] == ' ') */ -/* buf[i] = '_'; */ -/* } */ -/* /\* */ -/* * Highlight if appropriate. This works because */ -/* * we only get one score per level. */ -/* *\/ */ -/* if (me != NULL && */ -/* sp->hs_level == level && */ -/* sp->hs_score == score && */ -/* str_cmp(sp->hs_name, me) == 0) { */ -/* putpad(SOstr); */ -/* highlight = 1; */ -/* } */ -/* (void)printf("%s", buf); */ -/* if (highlight) { */ -/* putpad(SEstr); */ -/* highlight = 0; */ -/* } */ -/* } */ -/* } */ +} /** @} */ - Index: uspace/app/tetris/scores.h =================================================================== --- uspace/app/tetris/scores.h (revision 0c25c10b972ef53d852bb84a0277997565177111) +++ uspace/app/tetris/scores.h (revision ebe70f1610c35a5ff9b28fb7ce19713ff86b42ac) @@ -35,6 +35,7 @@ * @(#)scores.h 8.1 (Berkeley) 5/31/93 */ + /** @addtogroup tetris - * @{ + * @{ */ /** @file @@ -45,25 +46,24 @@ * Tetris scores. */ + #include #include -#define MAXLOGNAME 16 +#define MAXLOGNAME 16 +#define MAXHISCORES 10 +#define MAXSCORES 9 /* maximum high score entries per person */ +#define EXPIRATION (5L * 365 * 24 * 60 * 60) + struct highscore { - char hs_name[STR_BOUNDS(MAXLOGNAME) + 1]; /* login name */ - int hs_score; /* raw score */ - int hs_level; /* play level */ -// time_t hs_time; /* time at game end */ + char hs_name[STR_BOUNDS(MAXLOGNAME) + 1]; /* login name */ + int hs_score; /* raw score */ + int hs_level; /* play level */ + time_t hs_time; /* time at game end */ }; -#define MAXHISCORES 10 -//#define MAXSCORES 9 /* maximum high score entries per person */ -//#define EXPIRATION (5L * 365 * 24 * 60 * 60) - -void savescore(int); -void showscores(int); -void insertscore(int score, int level); -void initscores(void); +extern void showscores(int); +extern void initscores(void); +extern void insertscore(int score, int level); /** @} */ - Index: uspace/app/tetris/screen.c =================================================================== --- uspace/app/tetris/screen.c (revision 0c25c10b972ef53d852bb84a0277997565177111) +++ uspace/app/tetris/screen.c (revision ebe70f1610c35a5ff9b28fb7ce19713ff86b42ac) @@ -37,5 +37,5 @@ /** @addtogroup tetris - * @{ + * @{ */ /** @file @@ -57,7 +57,11 @@ #include -static cell curscreen[B_SIZE]; /* 1 => standout (or otherwise marked) */ +#define STOP (B_COLS - 3) + +static cell curscreen[B_SIZE]; /* non-zero => standout (or otherwise marked) */ static int curscore; -static int isset; /* true => terminal is in game mode */ +static int isset; /* true => terminal is in game mode */ + +static const struct shape *lastshape; @@ -72,7 +76,7 @@ } -static void start_standout(void) -{ - console_set_rgb_color(fphone(stdout), 0xf0f0f0, 0); +static void start_standout(uint32_t color) +{ + console_set_rgb_color(fphone(stdout), 0xf0f0f0, color); } @@ -91,12 +95,10 @@ * Clear the screen, forgetting the current contents in the process. */ -void -scr_clear(void) -{ - +void scr_clear(void) +{ resume_normal(); console_clear(fphone(stdout)); curscore = -1; - memset((char *)curscreen, 0, sizeof(curscreen)); + memset(curscreen, 0, sizeof(curscreen)); } @@ -104,6 +106,5 @@ * Set up screen */ -void -scr_init(void) +void scr_init(void) { console_cursor_visibility(fphone(stdout), 0); @@ -127,17 +128,19 @@ * Set up screen mode. */ -void -scr_set(void) +void scr_set(void) { winsize_t ws; - - Rows = 0, Cols = 0; + + Rows = 0; + Cols = 0; + if (get_display_size(&ws) == 0) { Rows = ws.ws_row; Cols = ws.ws_col; } - if (Rows < MINROWS || Cols < MINCOLS) { + + if ((Rows < MINROWS) || (Cols < MINCOLS)) { char smallscr[55]; - + snprintf(smallscr, sizeof(smallscr), "the screen is too small (must be at least %dx%d)", @@ -146,5 +149,5 @@ } isset = 1; - + scr_clear(); } @@ -153,33 +156,33 @@ * End screen mode. */ -void -scr_end(void) -{ -} - -void -stop(char *why) -{ - +void scr_end(void) +{ + console_cursor_visibility(fphone(stdout), 1); +} + +void stop(char *why) +{ if (isset) scr_end(); + errx(1, "aborting: %s", why); } - /* * Update the screen. */ -void -scr_update(void) -{ - cell *bp, *sp; - cell so, cur_so = 0; - int i, ccol, j; - static const struct shape *lastshape; - - /* always leave cursor after last displayed point */ +void scr_update(void) +{ + cell *bp; + cell *sp; + cell so; + cell cur_so = 0; + int i; + int j; + int ccol; + + /* Always leave cursor after last displayed point */ curscreen[D_LAST * B_COLS - 1] = -1; - + if (score != curscore) { moveto(0, 0); @@ -187,25 +190,29 @@ curscore = score; } - - /* draw preview of next pattern */ - if (showpreview && (nextshape != lastshape)) { + + /* Draw preview of next pattern */ + if ((showpreview) && (nextshape != lastshape)) { int i; - static int r=5, c=2; + static int r = 5, c = 2; int tr, tc, t; - + lastshape = nextshape; - - /* clean */ + + /* Clean */ resume_normal(); - moveto(r-1, c-1); putstr(" "); - moveto(r, c-1); putstr(" "); - moveto(r+1, c-1); putstr(" "); - moveto(r+2, c-1); putstr(" "); - - moveto(r-3, c-2); + moveto(r - 1, c - 1); + putstr(" "); + moveto(r, c - 1); + putstr(" "); + moveto(r + 1, c - 1); + putstr(" "); + moveto(r + 2, c - 1); + putstr(" "); + + moveto(r - 3, c - 2); putstr("Next shape:"); - - /* draw */ - start_standout(); + + /* Draw */ + start_standout(nextshape->color); moveto(r, 2 * c); putstr(" "); @@ -213,8 +220,8 @@ t = c + r * B_COLS; t += nextshape->off[i]; - + tr = t / B_COLS; tc = t % B_COLS; - + moveto(tr, 2*tc); putstr(" "); @@ -222,5 +229,5 @@ resume_normal(); } - + bp = &board[D_FIRST * B_COLS]; sp = &curscreen[D_FIRST * B_COLS]; @@ -230,4 +237,5 @@ if (*sp == (so = *bp)) continue; + *sp = so; if (i != ccol) { @@ -238,7 +246,8 @@ moveto(RTOD(j), CTOD(i)); } + if (so != cur_so) { if (so) - start_standout(); + start_standout(so); else resume_normal(); @@ -246,5 +255,5 @@ } putstr(" "); - + ccol = i + 1; /* @@ -256,10 +265,11 @@ * the next cell is a different color. */ -#define STOP (B_COLS - 3) - if (i > STOP || sp[1] != bp[1] || so != bp[1]) + + if ((i > STOP) || (sp[1] != bp[1]) || (so != bp[1])) continue; + if (sp[2] != bp[2]) sp[1] = -1; - else if (i < STOP && so == bp[2] && sp[3] != bp[3]) { + else if ((i < STOP) && (so == bp[2]) && (sp[3] != bp[3])) { sp[2] = -1; sp[1] = -1; @@ -267,20 +277,21 @@ } } + if (cur_so) resume_normal(); - fflush(stdout); -} - -/* - * Write a message (set!=0), or clear the same message (set==0). + + fflush(stdout); +} + +/* + * Write a message (set != 0), or clear the same message (set == 0). * (We need its length in case we have to overwrite with blanks.) */ -void -scr_msg(char *s, int set) -{ - +void scr_msg(char *s, int set) +{ int l = str_size(s); moveto(Rows - 2, ((Cols - l) >> 1) - 1); + if (set) putstr(s); @@ -292,3 +303,2 @@ /** @} */ - Index: uspace/app/tetris/screen.h =================================================================== --- uspace/app/tetris/screen.h (revision 0c25c10b972ef53d852bb84a0277997565177111) +++ uspace/app/tetris/screen.h (revision ebe70f1610c35a5ff9b28fb7ce19713ff86b42ac) @@ -37,5 +37,5 @@ /** @addtogroup tetris - * @{ + * @{ */ /** @file @@ -43,7 +43,7 @@ /* - * putpad() is for padded strings with count=1. + * putpad() is for padded strings with count = 1. */ -#define putpad(s) tputs(s, 1, put) +#define putpad(s) tputs(s, 1, put) #include @@ -57,16 +57,16 @@ extern winsize_t winsize; -void moveto(int r, int c); -void clear_screen(void); +extern void moveto(int r, int c); +extern void clear_screen(void); -int put(int); /* just calls putchar; for tputs */ -void scr_clear(void); -void scr_end(void); -void scr_init(void); -void scr_msg(char *, int); -void scr_set(void); -void scr_update(void); +/* just calls putchar; for tputs */ +extern int put(int); +extern void scr_clear(void); +extern void scr_end(void); +extern void scr_init(void); +extern void scr_msg(char *, int); +extern void scr_set(void); +extern void scr_update(void); /** @} */ - Index: uspace/app/tetris/shapes.c =================================================================== --- uspace/app/tetris/shapes.c (revision 0c25c10b972ef53d852bb84a0277997565177111) +++ uspace/app/tetris/shapes.c (revision ebe70f1610c35a5ff9b28fb7ce19713ff86b42ac) @@ -37,5 +37,5 @@ /** @addtogroup tetris - * @{ + * @{ */ /** @file @@ -51,33 +51,33 @@ #include "tetris.h" -#define TL -B_COLS-1 /* top left */ -#define TC -B_COLS /* top center */ -#define TR -B_COLS+1 /* top right */ -#define ML -1 /* middle left */ -#define MR 1 /* middle right */ -#define BL B_COLS-1 /* bottom left */ -#define BC B_COLS /* bottom center */ -#define BR B_COLS+1 /* bottom right */ +#define TL (-B_COLS - 1) /* top left */ +#define TC (-B_COLS) /* top center */ +#define TR (-B_COLS + 1) /* top right */ +#define ML -1 /* middle left */ +#define MR 1 /* middle right */ +#define BL (B_COLS - 1) /* bottom left */ +#define BC B_COLS /* bottom center */ +#define BR (B_COLS + 1) /* bottom right */ const struct shape shapes[] = { - /* 0*/ { 7, 7, { TL, TC, MR } }, - /* 1*/ { 8, 8, { TC, TR, ML } }, - /* 2*/ { 9, 11, { ML, MR, BC } }, - /* 3*/ { 3, 3, { TL, TC, ML } }, - /* 4*/ { 12, 14, { ML, BL, MR } }, - /* 5*/ { 15, 17, { ML, BR, MR } }, - /* 6*/ { 18, 18, { ML, MR, 2 } }, /* sticks out */ - /* 7*/ { 0, 0, { TC, ML, BL } }, - /* 8*/ { 1, 1, { TC, MR, BR } }, - /* 9*/ { 10, 2, { TC, MR, BC } }, - /*10*/ { 11, 9, { TC, ML, MR } }, - /*11*/ { 2, 10, { TC, ML, BC } }, - /*12*/ { 13, 4, { TC, BC, BR } }, - /*13*/ { 14, 12, { TR, ML, MR } }, - /*14*/ { 4, 13, { TL, TC, BC } }, - /*15*/ { 16, 5, { TR, TC, BC } }, - /*16*/ { 17, 15, { TL, MR, ML } }, - /*17*/ { 5, 16, { TC, BC, BL } }, - /*18*/ { 6, 6, { TC, BC, 2*B_COLS } }/* sticks out */ + /* 0 */ { 7, 7, { TL, TC, MR }, 0xff042d}, + /* 1 */ { 8, 8, { TC, TR, ML }, 0xff9304}, + /* 2 */ { 9, 11, { ML, MR, BC }, 0xbeff04}, + /* 3 */ { 3, 3, { TL, TC, ML }, 0x63ff04}, + /* 4 */ { 12, 14, { ML, BL, MR }, 0xce04ff}, + /* 5 */ { 15, 17, { ML, BR, MR }, 0xff04cf}, + /* 6 */ { 18, 18, { ML, MR, 2 }, 0x7604ff}, /* sticks out */ + /* 7 */ { 0, 0, { TC, ML, BL }, 0xff042d}, + /* 8 */ { 1, 1, { TC, MR, BR }, 0xff9304}, + /* 9 */ { 10, 2, { TC, MR, BC }, 0xbeff04}, + /* 10 */ { 11, 9, { TC, ML, MR }, 0xbeff04}, + /* 11 */ { 2, 10, { TC, ML, BC }, 0xbeff04}, + /* 12 */ { 13, 4, { TC, BC, BR }, 0xce04ff}, + /* 13 */ { 14, 12, { TR, ML, MR }, 0xce04ff}, + /* 14 */ { 4, 13, { TL, TC, BC }, 0xce04ff}, + /* 15 */ { 16, 5, { TR, TC, BC }, 0xff04cf}, + /* 16 */ { 17, 15, { TL, MR, ML }, 0xff04cf}, + /* 17 */ { 5, 16, { TC, BC, BL }, 0xff04cf}, + /* 18 */ { 6, 6, { TC, BC, 2 * B_COLS }, 0x7604ff} /* sticks out */ }; @@ -86,12 +86,12 @@ * taking the current board into account. */ -int -fits_in(const struct shape *shape, int pos) +int fits_in(const struct shape *shape, int pos) { int *o = shape->off; - - if (board[pos] || board[pos + *o++] || board[pos + *o++] || - board[pos + *o]) + + if ((board[pos]) || (board[pos + *o++]) || (board[pos + *o++]) || + (board[pos + *o])) return 0; + return 1; } @@ -101,16 +101,14 @@ * if `onoff' is 1, and off if `onoff' is 0. */ -void -place(const struct shape *shape, int pos, int onoff) +void place(const struct shape *shape, int pos, int onoff) { int *o = shape->off; - - board[pos] = onoff; - board[pos + *o++] = onoff; - board[pos + *o++] = onoff; - board[pos + *o] = onoff; + + board[pos] = onoff ? shape->color : 0x000000; + board[pos + *o++] = onoff ? shape->color : 0x000000; + board[pos + *o++] = onoff ? shape->color : 0x000000; + board[pos + *o] = onoff ? shape->color : 0x000000; } /** @} */ - Index: uspace/app/tetris/tetris.c =================================================================== --- uspace/app/tetris/tetris.c (revision 0c25c10b972ef53d852bb84a0277997565177111) +++ uspace/app/tetris/tetris.c (revision ebe70f1610c35a5ff9b28fb7ce19713ff86b42ac) @@ -37,23 +37,16 @@ /** @addtogroup tetris Tetris - * @brief Tetris ported from OpenBSD - * @{ + * @brief Tetris ported from OpenBSD + * @{ */ /** @file */ -#ifndef lint static const char copyright[] = -"@(#) Copyright (c) 1992, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -/* - * Tetris (or however it is spelled). - */ + "@(#) Copyright (c) 1992, 1993\n" + "\tThe Regents of the University of California. All rights reserved.\n"; #include #include - #include #include @@ -61,4 +54,5 @@ #include #include +#include #include "input.h" @@ -67,34 +61,38 @@ #include "tetris.h" -cell board[B_SIZE]; -int Rows, Cols; +cell board[B_SIZE]; + +int Rows; +int Cols; + const struct shape *curshape; const struct shape *nextshape; -long fallrate; -int score; -//gid_t gid, egid; -char key_msg[100]; -int showpreview, classic; - -static void elide(void); -static void setup_board(void); -const struct shape *randshape(void); -void onintr(int); -void usage(void); + +long fallrate; +int score; +char key_msg[100]; +int showpreview; +int classic; + +static void elide(void); +static void setup_board(void); +static const struct shape *randshape(void); + +static void usage(void); + +static int firstgame = 1; /* - * Set up the initial board. The bottom display row is completely set, - * along with another (hidden) row underneath that. Also, the left and + * Set up the initial board. The bottom display row is completely set, + * along with another (hidden) row underneath that. Also, the left and * right edges are set. */ -static void -setup_board(void) +static void setup_board(void) { int i; - cell *p; - - p = board; + cell *p = board; + for (i = B_SIZE; i; i--) - *p++ = i <= (2 * B_COLS) || (i % B_COLS) < 2; + *p++ = (i <= (2 * B_COLS) || (i % B_COLS) < 2) ? 0x0000ff : 0x000000; } @@ -102,11 +100,12 @@ * Elide any full active rows. */ -static void -elide(void) +static void elide(void) { int rows = 0; - int i, j, base; + int i; + int j; + int base; cell *p; - + for (i = A_FIRST; i < A_LAST; i++) { base = i * B_COLS + 1; @@ -114,17 +113,22 @@ for (j = B_COLS - 2; *p++ != 0;) { if (--j <= 0) { - /* this row is to be elided */ + /* This row is to be elided */ rows++; - memset(&board[base], 0, B_COLS - 2); + memset(&board[base], 0, sizeof(cell) * (B_COLS - 2)); + scr_update(); tsleep(); + while (--base != 0) board[base + B_COLS] = board[base]; + scr_update(); tsleep(); + break; } } } + switch (rows) { case 1: @@ -145,14 +149,13 @@ } -const struct shape * -randshape(void) -{ - const struct shape *tmp; - int i, j; - - tmp = &shapes[random() % 7]; - j = random() % 4; +const struct shape *randshape(void) +{ + const struct shape *tmp = &shapes[random() % 7]; + int i; + int j = random() % 4; + for (i = 0; i < j; i++) - tmp = &shapes[classic? tmp->rotc : tmp->rot]; + tmp = &shapes[classic ? tmp->rotc : tmp->rot]; + return (tmp); } @@ -161,5 +164,5 @@ { struct timeval tv; - + gettimeofday(&tv, NULL); srandom(tv.tv_sec + tv.tv_usec / 100000); @@ -168,57 +171,38 @@ static void tetris_menu_draw(int level) { - clear_screen(); - moveto(5,10); - puts("Tetris\n\n"); - - moveto(8,10); - printf("Level = %d (press keys 1 - 9 to change)",level); - moveto(9,10); - printf("Preview is %s (press 'p' to change)", (showpreview?"on ":"off")); - moveto(12,10); - printf("Press 'h' to show hiscore table."); - moveto(13,10); - printf("Press 's' to start game."); - moveto(14,10); - printf("Press 'q' to quit game."); - moveto(20,10); - printf("In game controls:"); - moveto(21,0); - puts(key_msg); -} - -static int tetris_menu(int *level) -{ - static int firstgame = 1; - int i; -/* if (showpreview == 0) - (void)printf("Your score: %d point%s x level %d = %d\n", - score, score == 1 ? "" : "s", level, score * level); - else { - (void)printf("Your score: %d point%s x level %d x preview penalty %0.3f = %d\n", - score, score == 1 ? "" : "s", level, (double)PRE_PENALTY, - (int)(score * level * PRE_PENALTY)); - score = score * PRE_PENALTY; - } - savescore(level); - - showscores(level); - - printf("\nHit 's' to new game, 'q' to quit.\n"); -*/ + clear_screen(); + moveto(5, 10); + puts("Tetris\n\n"); + + moveto(8, 10); + printf("Level = %d (press keys 1 - 9 to change)", level); + moveto(9, 10); + printf("Preview is %s (press 'p' to change)", (showpreview ? "on ": "off")); + moveto(12, 10); + printf("Press 'h' to show hiscore table."); + moveto(13, 10); + printf("Press 's' to start game."); + moveto(14, 10); + printf("Press 'q' to quit game."); + moveto(20, 10); + printf("In game controls:"); + moveto(21, 0); + puts(key_msg); +} + +static int tetris_menu(int *level) +{ tetris_menu_draw(*level); while (1) { - - i = getchar(); + int i = getchar(); switch(i) { case 'p': showpreview = !showpreview; - moveto(9,21); + moveto(9, 21); if (showpreview) printf("on "); else printf("off"); - break; case 'h': @@ -236,81 +220,70 @@ case '4': case '5': - case '6': + case '6': case '7': case '8': case '9': *level = i - '0'; - moveto(8,18); + moveto(8, 18); printf("%d", *level); break; } } - -} - -int -main(int argc, char *argv[]) -{ - int pos, c; +} + +int main(int argc, char *argv[]) +{ + int pos; + int c; char *keys; int level = 2; char key_write[6][10]; - int i, j; - + int i; + int j; + int ch; + keys = "jkl pq"; - -// gid = getgid(); -// egid = getegid(); -// setegid(gid); - + classic = 0; showpreview = 1; - -/* while ((ch = getopt(argc, argv, "ck:l:ps")) != -1) */ -/* switch(ch) { */ -/* case 'c': */ -/* /\* */ -/* * this means: */ -/* * - rotate the other way; */ -/* * - no reverse video. */ -/* *\/ */ -/* classic = 1; */ -/* break; */ -/* case 'k': */ -/* if (str_size(keys = optarg) != 6) */ -/* usage(); */ -/* break; */ -/* case 'l': */ -/* level = (int)strtonum(optarg, MINLEVEL, MAXLEVEL, */ -/* &errstr); */ -/* if (errstr) */ -/* errx(1, "level must be from %d to %d", */ -/* MINLEVEL, MAXLEVEL); */ -/* break; */ -/* case 'p': */ -/* showpreview = 1; */ -/* break; */ -/* case 's': */ -/* showscores(0); */ -/* exit(0); */ -/* default: */ -/* usage(); */ -/* } */ - -/* argc -= optind; */ -/* argv += optind; */ - -/* if (argc) */ -/* usage(); */ - - - + + while ((ch = getopt(argc, argv, "ck:ps")) != -1) + switch(ch) { + case 'c': + /* + * this means: + * - rotate the other way + * - no reverse video + */ + classic = 1; + break; + case 'k': + if (str_size(keys = optarg) != 6) + usage(); + break; + case 'p': + showpreview = 1; + break; + case 's': + showscores(0); + exit(0); + default: + usage(); + } + + argc -= optind; + argv += optind; + + if (argc) + usage(); + for (i = 0; i <= 5; i++) { - for (j = i+1; j <= 5; j++) { + for (j = i + 1; j <= 5; j++) { if (keys[i] == keys[j]) errx(1, "duplicate command keys specified."); } + if (keys[i] == ' ') - str_cpy(key_write[i], sizeof key_write[i], ""); + str_cpy(key_write[i], sizeof(key_write[i]), ""); else { key_write[i][0] = keys[i]; @@ -318,10 +291,10 @@ } } - - snprintf(key_msg, sizeof key_msg, -"%s - left %s - rotate %s - right %s - drop %s - pause %s - quit", - key_write[0], key_write[1], key_write[2], key_write[3], - key_write[4], key_write[5]); - + + snprintf(key_msg, sizeof(key_msg), + "%s - left %s - rotate %s - right %s - drop %s - pause %s - quit", + key_write[0], key_write[1], key_write[2], key_write[3], + key_write[4], key_write[5]); + scr_init(); initscores(); @@ -331,15 +304,15 @@ scr_clear(); setup_board(); - + srandomdev(); scr_set(); - - pos = A_FIRST*B_COLS + (B_COLS/2)-1; + + pos = A_FIRST * B_COLS + (B_COLS / 2) - 1; nextshape = randshape(); curshape = randshape(); - + scr_msg(key_msg, 1); - - for (;;) { + + while (1) { place(curshape, pos, 1); scr_update(); @@ -354,5 +327,5 @@ continue; } - + /* * Put up the current shape `permanently', @@ -362,5 +335,5 @@ score++; elide(); - + /* * Choose a new shape. If it does not fit, @@ -369,10 +342,12 @@ curshape = nextshape; nextshape = randshape(); - pos = A_FIRST*B_COLS + (B_COLS/2)-1; + pos = A_FIRST * B_COLS + (B_COLS / 2) - 1; + if (!fits_in(curshape, pos)) break; - continue; - } - + + continue; + } + /* * Handle command keys. @@ -382,8 +357,9 @@ break; } + if (c == keys[4]) { static char msg[] = "paused - press RETURN to continue"; - + place(curshape, pos, 1); do { @@ -392,5 +368,6 @@ scr_msg(msg, 1); (void) fflush(stdout); - } while (rwait((struct timeval *)NULL) == -1); + } while (rwait((struct timeval *) NULL) == -1); + scr_msg(msg, 0); scr_msg(key_msg, 1); @@ -398,4 +375,5 @@ continue; } + if (c == keys[0]) { /* move left */ @@ -404,13 +382,15 @@ continue; } + if (c == keys[1]) { /* turn */ - const struct shape *new = &shapes[ - classic? curshape->rotc : curshape->rot]; - + const struct shape *new = + &shapes[classic ? curshape->rotc : curshape->rot]; + if (fits_in(new, pos)) curshape = new; continue; } + if (c == keys[2]) { /* move right */ @@ -419,4 +399,5 @@ continue; } + if (c == keys[3]) { /* move to bottom */ @@ -427,4 +408,5 @@ continue; } + if (c == '\f') { scr_clear(); @@ -435,31 +417,17 @@ scr_clear(); insertscore(score, level); - score=0; + score = 0; } scr_clear(); - printf("\n\n\n\t\tGame over.\n"); -/* - while ((i = getchar()) != '\n') - if (i == EOF) - break -*/ + printf("\nGame over.\n"); scr_end(); - + return 0; } -/* void */ -/* onintr(int signo) */ -/* { */ -/* scr_clear(); /\* XXX signal race *\/ */ -/* scr_end(); /\* XXX signal race *\/ */ -/* _exit(0); */ -/* } */ - -void -usage(void) -{ - (void)fprintf(stderr, "usage: tetris [-ps] [-k keys] [-l level]\n"); +void usage(void) +{ + fprintf(stderr, "usage: tetris [-ps] [-k keys]\n"); exit(1); } @@ -467,3 +435,2 @@ /** @} */ - Index: uspace/app/tetris/tetris.h =================================================================== --- uspace/app/tetris/tetris.h (revision 0c25c10b972ef53d852bb84a0277997565177111) +++ uspace/app/tetris/tetris.h (revision ebe70f1610c35a5ff9b28fb7ce19713ff86b42ac) @@ -37,5 +37,5 @@ /** @addtogroup tetris - * @{ + * @{ */ /** @file @@ -56,27 +56,30 @@ */ - /* the board */ -#define B_COLS 12 -#define B_ROWS 23 -#define B_SIZE (B_ROWS * B_COLS) +/* The board */ +#define B_COLS 12 +#define B_ROWS 23 +#define B_SIZE (B_ROWS * B_COLS) -typedef unsigned char cell; -extern cell board[B_SIZE]; /* 1 => occupied, 0 => empty */ +typedef uint32_t cell; - /* the displayed area (rows) */ -#define D_FIRST 1 -#define D_LAST 22 +extern cell board[B_SIZE]; /* 1 => occupied, 0 => empty */ - /* the active area (rows) */ -#define A_FIRST 1 -#define A_LAST 21 +/* The displayed area (rows) */ +#define D_FIRST 1 +#define D_LAST 22 + +/* The active area (rows) */ +#define A_FIRST 1 +#define A_LAST 21 /* * Minimum display size. */ -#define MINROWS 23 -#define MINCOLS 40 +#define MINROWS 23 +#define MINCOLS 40 -extern int Rows, Cols; /* current screen size */ +/* Current screen size */ +extern int Rows; +extern int Cols; /* @@ -84,6 +87,6 @@ * As with board coordinates, display coordiates are zero origin. */ -#define RTOD(x) ((x) - 1) -#define CTOD(x) ((x) * 2 + (((Cols - 2 * B_COLS) >> 1) - 1)) +#define RTOD(x) ((x) - 1) +#define CTOD(x) ((x) * 2 + (((Cols - 2 * B_COLS) >> 1) - 1)) /* @@ -91,20 +94,20 @@ * are 7 basic shapes, each consisting of four `blots': * - * X.X X.X X.X - * X.X X.X X.X.X X.X X.X.X X.X.X X.X.X.X - * X X X + * X.X X.X X.X + * X.X X.X X.X.X X.X X.X.X X.X.X X.X.X.X + * X X X * - * 0 1 2 3 4 5 6 + * 0 1 2 3 4 5 6 * * Except for 3 and 6, the center of each shape is one of the blots. - * This blot is designated (0,0). The other three blots can then be + * This blot is designated (0, 0). The other three blots can then be * described as offsets from the center. Shape 3 is the same under * rotation, so its center is effectively irrelevant; it has been chosen * so that it `sticks out' upward and leftward. Except for shape 6, - * all the blots are contained in a box going from (-1,-1) to (+1,+1); + * all the blots are contained in a box going from (-1, -1) to (+1, +1); * shape 6's center `wobbles' as it rotates, so that while it `sticks out' * rightward, its rotation---a vertical line---`sticks out' downward. - * The containment box has to include the offset (2,0), making the overall - * containment box range from offset (-1,-1) to (+2,+1). (This is why + * The containment box has to include the offset (2, 0), making the overall + * containment box range from offset (-1, -1) to (+2, +1). (This is why * there is only one row above, but two rows below, the display area.) * @@ -117,5 +120,5 @@ * these rows move down to make more room. A new random shape is again * introduced at the top of the board, and the whole process repeats. - * The game ends when the new shape will not fit at (1,5). + * The game ends when the new shape will not fit at (1, 5). * * While the shapes are falling, the user can rotate them counterclockwise @@ -129,7 +132,8 @@ */ struct shape { - int rot; /* index of rotated version of this shape */ - int rotc; /* -- " -- in classic version */ - int off[3]; /* offsets to other blots if center is at (0,0) */ + int rot; /* index of rotated version of this shape */ + int rotc; /* -- " -- in classic version */ + int off[3]; /* offsets to other blots if center is at (0,0) */ + uint32_t color; }; @@ -149,6 +153,7 @@ * but by then the game is utterly impossible. */ -extern long fallrate; /* less than 1 million; smaller => faster */ -#define faster() (fallrate -= fallrate / 3000) +extern long fallrate; /* less than 1 million; smaller => faster */ + +#define faster() (fallrate -= fallrate / 3000) /* @@ -156,6 +161,6 @@ * and affects scoring. */ -#define MINLEVEL 1 -#define MAXLEVEL 9 +#define MINLEVEL 1 +#define MAXLEVEL 9 /* @@ -171,18 +176,16 @@ * If previewing has been turned on, the score is multiplied by PRE_PENALTY. */ -#define PRE_PENALTY 0.75 +#define PRE_PENALTY 0.75 -extern int score; /* the obvious thing */ -//extern gid_t gid, egid; +extern int score; /* The obvious thing */ -extern char key_msg[100]; -extern int showpreview; -extern int classic; +extern char key_msg[100]; +extern int showpreview; +extern int classic; -int fits_in(const struct shape *, int); -void place(const struct shape *, int, int); -void stop(char *); +extern int fits_in(const struct shape *, int); +extern void place(const struct shape *, int, int); +extern void stop(char *); /** @} */ -