niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

Implemented invisibleghost, deckx and decko drawing modes, and

Browse source 
improved ghost drawing mode.
This commit is contained in:
Sami Nopanen 2004-03-29 20:26:21 +00:00 • committed by Alexandre Julliard
parent 74bd1e47ed
commit f6c513ca60
5 changed files with 670 additions and 646 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dlls/cards/.cvsignore
View file

@ -30,6 +30,7 @@ d9.bmp
dj.bmp dj.bmp
dk.bmp dk.bmp
dq.bmp dq.bmp
free.bmp
h1.bmp h1.bmp
h10.bmp h10.bmp
h2.bmp h2.bmp
@ -57,4 +58,6 @@ s9.bmp
sj.bmp sj.bmp
sk.bmp sk.bmp
sq.bmp sq.bmp
theo.bmp
thex.bmp
version.res version.res

5
dlls/cards/Makefile.in
View file

@ -42,6 +42,7 @@ RC_BINARIES = \
dj.bmp \ dj.bmp \
dk.bmp \ dk.bmp \
dq.bmp \ dq.bmp \
free.bmp \
h1.bmp \ h1.bmp \
h2.bmp \ h2.bmp \
h3.bmp \ h3.bmp \
@ -68,7 +69,9 @@ RC_BINARIES = \
s10.bmp \ s10.bmp \
sj.bmp \ sj.bmp \
sk.bmp \ sk.bmp \
sq.bmp sq.bmp \
theo.bmp \
thex.bmp
@MAKE_DLL_RULES@ @MAKE_DLL_RULES@

48
dlls/cards/cards.c
View file

@ -86,6 +86,8 @@ BOOL WINAPI cdtDrawExt(HDC hdc, int x, int y, int dx, int dy, int card, int mode
DWORD rasterOp = SRCCOPY; DWORD rasterOp = SRCCOPY;
BOOL roundCornersFlag; BOOL roundCornersFlag;
COLORREF savedPixels[12]; COLORREF savedPixels[12];
BOOL eraseFlag = FALSE;
BOOL drawFlag = TRUE;
TRACE("(%p, %d, %d, %d, %d, %d, %d, %ld)\n", hdc, x, y, dx, dy, card, mode, color); TRACE("(%p, %d, %d, %d, %d, %d, %d, %ld)\n", hdc, x, y, dx, dy, card, mode, color);
@ -105,17 +107,41 @@ BOOL WINAPI cdtDrawExt(HDC hdc, int x, int y, int dx, int dy, int card, int mode
return FALSE; return FALSE;
} }
if(mode == MODE_INVISIBLEGHOST || mode == MODE_DECKX || mode == MODE_DECKO) switch(mode)
{ {
FIXME("Mode %d not implemented.\n", mode); case MODE_FACEUP:
return FALSE; break;
case MODE_FACEDOWN:
break;
case MODE_HILITE:
rasterOp = NOTSRCCOPY;
break;
case MODE_GHOST:
card = CARD_FREE_MASK;
eraseFlag = TRUE;
rasterOp = SRCAND;
break;
case MODE_REMOVE:
eraseFlag = TRUE;
drawFlag = FALSE;
break;
case MODE_INVISIBLEGHOST:
card = CARD_FREE_MASK;
rasterOp = SRCAND;
break;
case MODE_DECKX:
card = CARD_BACK_THE_X;
break;
case MODE_DECKO:
card = CARD_BACK_THE_O;
break;
} }
hMemoryDC = CreateCompatibleDC(hdc); hMemoryDC = CreateCompatibleDC(hdc);
if(hMemoryDC == 0) if(hMemoryDC == 0)
return FALSE; return FALSE;
if((mode == MODE_REMOVE) || (mode == MODE_GHOST)) if(eraseFlag)
{ {
HBRUSH hBrush; HBRUSH hBrush;
RECT rect; RECT rect;
@ -125,18 +151,10 @@ BOOL WINAPI cdtDrawExt(HDC hdc, int x, int y, int dx, int dy, int card, int mode
rect.right = x + cardWidth - 1; rect.right = x + cardWidth - 1;
rect.bottom = y + cardHeight - 1; rect.bottom = y + cardHeight - 1;
FillRect(hdc, &rect, hBrush); FillRect(hdc, &rect, hBrush);
if(mode == MODE_GHOST)
{
hBrush = CreateSolidBrush(RGB(255, 255, 255));
FrameRect(hdc, &rect, hBrush);
}
} }
else /* MODE_FACEUP, MODE_FACEDOWN, MODE_HILITE */
{
if(mode == MODE_HILITE)
rasterOp = NOTSRCCOPY;
if(drawFlag)
{
hCardBitmap = cardBitmaps[card]; hCardBitmap = cardBitmaps[card];
if(hCardBitmap == 0) if(hCardBitmap == 0)
return FALSE; return FALSE;
@ -204,7 +222,7 @@ BOOL WINAPI cdtDrawExt(HDC hdc, int x, int y, int dx, int dy, int card, int mode
* MODE_HILITE ; draw face up, with NOTSRCCOPY * MODE_HILITE ; draw face up, with NOTSRCCOPY
* MODE_GHOST ; draw 'ghost' card * MODE_GHOST ; draw 'ghost' card
* MODE_REMOVE ; draw with background color * MODE_REMOVE ; draw with background color
* MODE_INVISIBLEGHOST ; ? * MODE_INVISIBLEGHOST ; draw 'ghost' card, without clearing background
* MODE_DECKX ; draw X * MODE_DECKX ; draw X
* MODE_DECKO ; draw O * MODE_DECKO ; draw O
* *

4
dlls/cards/cards.h
View file

@ -29,9 +29,9 @@
/* 0-51 = normal 52 cards of deck */ /* 0-51 = normal 52 cards of deck */
/* 52 = ? */ /* 52 = ghost card mask */
/* 53-68 = card backs */ /* 53-68 = card backs */
#define CARD_UNKNOWN 52 #define CARD_FREE_MASK 52
#define CARD_BACK_CROSSHATCH 53 #define CARD_BACK_CROSSHATCH 53
#define CARD_BACK_WEAVE1 54 #define CARD_BACK_WEAVE1 54
#define CARD_BACK_WEAVE2 55 #define CARD_BACK_WEAVE2 55

1256
dlls/cards/cards.rc
View file

File diff suppressed because it is too large Load diff