maride/tty-solitaire
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #31 from Siborgium/master

Browse Source 
Option to use default terminal colors for color pair 0.
This commit is contained in:
Murilo Pereira 2020-06-01 15:42:31 +02:00 committed by GitHub
commit 456b66d008
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ttysolitaire.c
View File

@ -23,16 +23,18 @@ int main(int argc, char *argv[]) {
int option; int option;
int option_index; int option_index;
int passes_through_deck = 3; int passes_through_deck = 3;
int color = 1;
static const struct option options[] = { static const struct option options[] = {
{"help", no_argument, NULL, 'h'}, {"help", no_argument, NULL, 'h'},
{"version", no_argument, NULL, 'v'}, {"version", no_argument, NULL, 'v'},
{"passes", required_argument, NULL, 'p'}, {"passes", required_argument, NULL, 'p'},
{"color", required_argument, NULL, 'c'},
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
program_name = argv[0]; program_name = argv[0];
while ((option = getopt_long(argc, argv, "hvp:", options, &option_index)) != -1) { while ((option = getopt_long(argc, argv, "hvpc:", options, &option_index)) != -1) {
switch (option) { switch (option) {
case 'v': case 'v':
version(); version();
@ -40,6 +42,9 @@ int main(int argc, char *argv[]) {
case 'p': case 'p':
passes_through_deck = atoi(optarg); passes_through_deck = atoi(optarg);
break; break;
case 'c':
color = atoi(optarg) > 0 ? 1 : 0;
break;
case 'h': case 'h':
default: default:
usage(program_name); usage(program_name);
@ -55,7 +60,12 @@ int main(int argc, char *argv[]) {
start_color(); start_color();
curs_set(FALSE); curs_set(FALSE);
set_escdelay(0); set_escdelay(0);
assume_default_colors(COLOR_WHITE, COLOR_GREEN); if(color) {
assume_default_colors(COLOR_WHITE, COLOR_GREEN);
}
else {
use_default_colors();
}
init_pair(1, COLOR_BLACK, COLOR_WHITE); init_pair(1, COLOR_BLACK, COLOR_WHITE);
init_pair(2, COLOR_RED, COLOR_WHITE); init_pair(2, COLOR_RED, COLOR_WHITE);
init_pair(3, COLOR_WHITE, COLOR_BLUE); init_pair(3, COLOR_WHITE, COLOR_BLUE);
@ -124,6 +134,8 @@ void usage(const char *program_name) {
printf(" -v, --version Show version\n"); printf(" -v, --version Show version\n");
printf(" -h, --help Show this message\n"); printf(" -h, --help Show this message\n");
printf(" -p, --passes Number of passes through the deck\n"); printf(" -p, --passes Number of passes through the deck\n");
printf(" -c, --color 1 (default) - use suggested colors\n");
printf(" 0 - use terminal colors\n");
} }
void version() { void version() {