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

s/shape/window

Browse Source
This commit is contained in:
Murilo Pereira 2011-05-09 00:50:56 -03:00
parent 9ecf0acec8
commit d2950f95ce
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/display.c
View File

@ -58,8 +58,8 @@ static char *card_value(enum value value) {
void erase_stack(struct stack *stack) { void erase_stack(struct stack *stack) {
WINDOW *empty_stack = NULL; WINDOW *empty_stack = NULL;
wbkgd(stack->card->frame->shape, WHITE_ON_GREEN); wbkgd(stack->card->frame->window, WHITE_ON_GREEN);
wrefresh(stack->card->frame->shape); wrefresh(stack->card->frame->window);
empty_stack = newwin(FRAME_HEIGHT, empty_stack = newwin(FRAME_HEIGHT,
FRAME_WIDTH, FRAME_WIDTH,
stack->card->frame->begin_y, stack->card->frame->begin_y,
@ -70,8 +70,8 @@ void erase_stack(struct stack *stack) {
} }
void draw_value(struct card *card) { void draw_value(struct card *card) {
mvwprintw(card->frame->shape, 0, 0, card_value(card->value)); mvwprintw(card->frame->window, 0, 0, card_value(card->value));
mvwprintw(card->frame->shape, mvwprintw(card->frame->window,
4, 4,
6 - (strlen(card_value(card->value)) - 1), 6 - (strlen(card_value(card->value)) - 1),
card_value(card->value)); card_value(card->value));
@ -79,39 +79,39 @@ void draw_value(struct card *card) {
void draw_suit(struct card *card) { void draw_suit(struct card *card) {
if (card->suit % 2 == 0) { if (card->suit % 2 == 0) {
wattron(card->frame->shape, COLOR_PAIR(RED_ON_WHITE)); wattron(card->frame->window, COLOR_PAIR(RED_ON_WHITE));
} else { } else {
wattron(card->frame->shape, COLOR_PAIR(BLACK_ON_WHITE)); wattron(card->frame->window, COLOR_PAIR(BLACK_ON_WHITE));
} }
mvwprintw(card->frame->shape, 0, 1 + (strlen(card_value(card->value) + 1)), mvwprintw(card->frame->window, 0, 1 + (strlen(card_value(card->value) + 1)),
card_suit(card->suit)); card_suit(card->suit));
mvwprintw(card->frame->shape, 4, 5 - (strlen(card_value(card->value) + 1)), mvwprintw(card->frame->window, 4, 5 - (strlen(card_value(card->value) + 1)),
card_suit(card->suit)); card_suit(card->suit));
if (card->suit % 2 == 0) { if (card->suit % 2 == 0) {
wattroff(card->frame->shape, COLOR_PAIR(RED_ON_WHITE)); wattroff(card->frame->window, COLOR_PAIR(RED_ON_WHITE));
} else { } else {
wattroff(card->frame->shape, COLOR_PAIR(BLACK_ON_WHITE)); wattroff(card->frame->window, COLOR_PAIR(BLACK_ON_WHITE));
} }
} }
void draw_front(struct card *card) { void draw_front(struct card *card) {
wbkgd(card->frame->shape, COLOR_PAIR(BLACK_ON_WHITE)); wbkgd(card->frame->window, COLOR_PAIR(BLACK_ON_WHITE));
draw_value(card); draw_value(card);
draw_suit(card); draw_suit(card);
} }
void draw_back(struct card *card) { void draw_back(struct card *card) {
wbkgd(card->frame->shape, COLOR_PAIR(WHITE_ON_BLUE)); wbkgd(card->frame->window, COLOR_PAIR(WHITE_ON_BLUE));
} }
void draw_card(struct card *card) { void draw_card(struct card *card) {
mvwin(card->frame->shape, card->frame->begin_y, card->frame->begin_x); mvwin(card->frame->window, card->frame->begin_y, card->frame->begin_x);
if (card->face == EXPOSED) { if (card->face == EXPOSED) {
draw_front(card); draw_front(card);
} else { } else {
draw_back(card); draw_back(card);
} }
wrefresh(card->frame->shape); wrefresh(card->frame->window);
} }
void draw_stack(struct stack *stack) { void draw_stack(struct stack *stack) {

12
lib/frame.c
View File

@ -14,7 +14,7 @@ void allocate_frame(struct frame **frame) {
} }
void initialize_frame(struct frame *frame) { void initialize_frame(struct frame *frame) {
frame->shape = NULL; frame->window = NULL;
frame->begin_y = 0; frame->begin_y = 0;
frame->begin_x = 0; frame->begin_x = 0;
} }
@ -30,7 +30,7 @@ struct frame *duplicate_frame(struct frame *frame) {
void free_frame(struct frame *frame) { void free_frame(struct frame *frame) {
if (frame) { if (frame) {
delwin(frame->shape); delwin(frame->window);
} }
free(frame); free(frame);
} }
@ -38,8 +38,8 @@ void free_frame(struct frame *frame) {
void set_frame(struct frame *frame, int begin_y, int begin_x) { void set_frame(struct frame *frame, int begin_y, int begin_x) {
frame->begin_y = begin_y; frame->begin_y = begin_y;
frame->begin_x = begin_x; frame->begin_x = begin_x;
frame->shape = newwin(FRAME_HEIGHT, frame->window = newwin(FRAME_HEIGHT,
FRAME_WIDTH, FRAME_WIDTH,
frame->begin_y, frame->begin_y,
frame->begin_x); frame->begin_x);
} }

2
lib/frame.h
View File

@ -7,7 +7,7 @@
#define FRAME_HEIGHT 5 #define FRAME_HEIGHT 5
struct frame { struct frame {
WINDOW *shape; WINDOW *window;
int begin_y; int begin_y;
int begin_x; int begin_x;
}; };

2
test/frame_test.c
View File

@ -8,7 +8,7 @@ void test_initialize_frame() {
allocate_frame(&frame); allocate_frame(&frame);
initialize_frame(frame); initialize_frame(frame);
assert(frame->shape == NULL); assert(frame->window == NULL);
assert(frame->begin_y == 0); assert(frame->begin_y == 0);
assert(frame->begin_x == 0); assert(frame->begin_x == 0);