tanner/2048-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5 from AMDmi3/auto-color

Browse Source 
Autodetect color support, allow override through arguments
This commit is contained in:
Tiehuis 2014-09-13 09:29:20 +12:00
commit 2dab267db2
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/2048.c
View File

@ -231,23 +231,15 @@ int main(int argc, char **argv)
/* parse options */
int c;
while ((c = getopt(argc, argv, "rchs:b:")) != -1) {
int enable_color = has_colors();
while ((c = getopt(argc, argv, "rcChs:b:")) != -1) {
switch (c) {
/* Color support */
case 'c':
if (has_colors()) {
start_color();
init_pair(0, 1, 0);
init_pair(1, 2, 0);
init_pair(2, 3, 0);
init_pair(3, 4, 0);
init_pair(4, 5, 0);
init_pair(5, 6, 0);
init_pair(6, 7, 0);
}
else {
fprintf(stderr, "Terminal does not support color\n");
}
enable_color = 1;
break;
case 'C':
enable_color = 0;
break;
// different board sizes
case 's':;
@ -275,7 +267,22 @@ int main(int argc, char **argv)
exit(EXIT_SUCCESS);
}
}
if (enable_color) {
if (!has_colors()) {
fprintf(stderr, "Terminal does not support color\n");
} else {
start_color();
init_pair(0, 1, 0);
init_pair(1, 2, 0);
init_pair(2, 3, 0);
init_pair(3, 4, 0);
init_pair(4, 5, 0);
init_pair(5, 6, 0);
init_pair(6, 7, 0);
}
}
/* Allocate memory once we actually know amount */
CALLOC2D(grid, grid_size);

3
src/2048.h
View File

@ -59,6 +59,7 @@ const char* get_highscore_file();
"Options:\n"\
" -s <size> Set the grid border length\n"\
" -b <rate> Set the block spawn rate\n"\
" -c Enables color support (ncurses version only)\n"
" -c Enables color support (ncurses version only)\n"\
" -C Disabled color support (ncurses version only)\n"
#endif