Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-03 23:04:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reduce parameter count. No logic change.

Browse source
This commit is contained in:
ehouse 2008-09-10 11:57:30 +00:00
parent 7299675adc
commit 87ce5f06d4
1 changed files with 34 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
wince/cedraw.c
View file

@ -199,20 +199,20 @@ makeAndDrawBitmap( CEDrawCtx* dctx, HDC hdc, const RECT* bnds, XP_Bool center,
static void static void
ceDrawTextClipped( HDC hdc, wchar_t* buf, XP_S16 len, XP_Bool clip, ceDrawTextClipped( HDC hdc, wchar_t* buf, XP_S16 len, XP_Bool clip,
XP_U16 left, XP_U16 top, XP_U16 width, XP_U16 height, const FontCacheEntry* fce, XP_U16 left, XP_U16 top,
XP_U16 offset, XP_U16 hJust ) XP_U16 width, XP_U16 hJust )
{ {
RECT rect; RECT rect;
rect.left = left; rect.left = left;
rect.top = top; rect.top = top;
rect.bottom = top + height; rect.bottom = top + fce->actualHt;
rect.right = left + width; rect.right = left + width;
if ( clip ) { if ( clip ) {
ceClipToRect( hdc, &rect ); ceClipToRect( hdc, &rect );
} }
rect.top -= offset; rect.top -= fce->offset;
/* XP_LOGF( "%s: drawing left: %ld, top: %ld, right: %ld, bottom: %ld", */ /* XP_LOGF( "%s: drawing left: %ld, top: %ld, right: %ld, bottom: %ld", */
/* __func__, rect.left, rect.top, rect.right, rect.bottom ); */ /* __func__, rect.left, rect.top, rect.right, rect.bottom ); */
DrawText( hdc, buf, len, &rect, DT_SINGLELINE | DT_TOP | hJust ); DrawText( hdc, buf, len, &rect, DT_SINGLELINE | DT_TOP | hJust );
@ -607,9 +607,8 @@ ceBestFitFont( CEDrawCtx* dctx, XP_U16 soughtHeight, RFIndex index,
#endif #endif
} /* ceBestFitFont */ } /* ceBestFitFont */
static HFONT static const FontCacheEntry*
ceGetSizedFont( CEDrawCtx* dctx, XP_U16 height, RFIndex index, ceGetSizedFont( CEDrawCtx* dctx, XP_U16 height, RFIndex index )
XP_U16* offsetP, XP_U16* actualHtP )
{ {
FontCacheEntry* fce = &dctx->fcEntry[index]; FontCacheEntry* fce = &dctx->fcEntry[index];
if ( (0 != height) /* 0 means use what we have */ if ( (0 != height) /* 0 means use what we have */
@ -617,14 +616,8 @@ ceGetSizedFont( CEDrawCtx* dctx, XP_U16 height, RFIndex index,
ceBestFitFont( dctx, height, index, fce ); ceBestFitFont( dctx, height, index, fce );
} }
if ( !!offsetP ) {
*offsetP = fce->offset;
}
if ( !!actualHtP ) {
*actualHtP = fce->actualHt;
}
XP_ASSERT( !!fce->setFont ); /* failing... */ XP_ASSERT( !!fce->setFont ); /* failing... */
return fce->setFont; return fce;
} /* ceGetSizedFont */ } /* ceGetSizedFont */
#if 0 #if 0
@ -817,7 +810,7 @@ DRAW_FUNC_NAME(drawCell)( DrawCtx* p_dctx, const XP_Rect* xprect,
XP_Bool isFocussed = TREAT_AS_CURSOR( dctx, flags ); XP_Bool isFocussed = TREAT_AS_CURSOR( dctx, flags );
XP_Bool isDragSrc = (flags & CELL_DRAGSRC) != 0; XP_Bool isDragSrc = (flags & CELL_DRAGSRC) != 0;
HFONT oldFont; HFONT oldFont;
XP_U16 offset, actualHt; const FontCacheEntry* fce;
XP_ASSERT( !!hdc ); XP_ASSERT( !!hdc );
@ -832,9 +825,8 @@ DRAW_FUNC_NAME(drawCell)( DrawCtx* p_dctx, const XP_Rect* xprect,
InsetRect( &rt, 1, 1 ); InsetRect( &rt, 1, 1 );
ceClipToRect( hdc, &rt ); ceClipToRect( hdc, &rt );
oldFont = SelectObject( hdc, ceGetSizedFont( dctx, xprect->height - 3, fce = ceGetSizedFont( dctx, xprect->height - 3, RFONTS_CELL );
RFONTS_CELL, &offset, oldFont = SelectObject( hdc, fce->setFont );
&actualHt ) );
/* always init to silence compiler warning */ /* always init to silence compiler warning */
foreColorIndx = getPlayerColor(owner); foreColorIndx = getPlayerColor(owner);
@ -889,9 +881,8 @@ DRAW_FUNC_NAME(drawCell)( DrawCtx* p_dctx, const XP_Rect* xprect,
MultiByteToWideChar( CP_ACP, MB_PRECOMPOSED, letters, -1, MultiByteToWideChar( CP_ACP, MB_PRECOMPOSED, letters, -1,
widebuf, VSIZE(widebuf) ); widebuf, VSIZE(widebuf) );
#endif #endif
ceDrawTextClipped( hdc, widebuf, -1, XP_FALSE, xprect->left+1, ceDrawTextClipped( hdc, widebuf, -1, XP_FALSE, fce, xprect->left+1,
xprect->top+2, xprect->width, actualHt, offset, xprect->top+2, xprect->width, DT_CENTER );
DT_CENTER );
} else if ( !isDragSrc && !!bitmap ) { } else if ( !isDragSrc && !!bitmap ) {
makeAndDrawBitmap( dctx, hdc, &rt, XP_TRUE, makeAndDrawBitmap( dctx, hdc, &rt, XP_TRUE,
foreColorIndx, (CEBitmapInfo*)bitmap ); foreColorIndx, (CEBitmapInfo*)bitmap );
@ -1003,17 +994,15 @@ drawDrawTileGuts( DrawCtx* p_dctx, const XP_Rect* xprect,
} }
if ( !!letters ) { if ( !!letters ) {
XP_U16 offset, actualHt; const FontCacheEntry* fce;
HFONT font = ceGetSizedFont( dctx, charHt, fce = ceGetSizedFont( dctx, charHt, RFONTS_TRAY );
RFONTS_TRAY, &offset, &actualHt ); HFONT oldFont = SelectObject( hdc, fce->setFont );
HFONT oldFont = SelectObject( hdc, font );
MultiByteToWideChar( CP_ACP, MB_PRECOMPOSED, letters, -1, MultiByteToWideChar( CP_ACP, MB_PRECOMPOSED, letters, -1,
widebuf, widebuf, VSIZE(widebuf) );
VSIZE(widebuf) );
ceDrawTextClipped( hdc, widebuf, -1, XP_TRUE, xprect->left + 4, ceDrawTextClipped( hdc, widebuf, -1, XP_TRUE, fce,
xprect->top + 4, xprect->width, actualHt, xprect->left + 4, xprect->top + 4,
offset, DT_LEFT ); xprect->width, DT_LEFT );
SelectObject( hdc, oldFont ); SelectObject( hdc, oldFont );
} else if ( !!bitmap ) { } else if ( !!bitmap ) {
RECT lrt = rt; RECT lrt = rt;
@ -1026,17 +1015,15 @@ drawDrawTileGuts( DrawCtx* p_dctx, const XP_Rect* xprect,
} }
if ( val >= 0 ) { if ( val >= 0 ) {
XP_U16 offset, actualHt; const FontCacheEntry* fce;
HFONT font = ceGetSizedFont( dctx, valHt, RFONTS_TRAYVAL, fce = ceGetSizedFont( dctx, valHt, RFONTS_TRAYVAL );
&offset, &actualHt ); HFONT oldFont = SelectObject( hdc, fce->setFont );
HFONT oldFont = SelectObject( hdc, font );
swprintf( widebuf, L"%d", val ); swprintf( widebuf, L"%d", val );
ceDrawTextClipped( hdc, widebuf, -1, XP_TRUE, ceDrawTextClipped( hdc, widebuf, -1, XP_TRUE, fce,
xprect->left + 4, xprect->left + 4,
xprect->top + xprect->height - 4 - actualHt, xprect->top + xprect->height - 4 - fce->actualHt,
xprect->width - 8, actualHt, xprect->width - 8, DT_RIGHT );
offset, DT_RIGHT );
SelectObject( hdc, oldFont ); SelectObject( hdc, oldFont );
} }
} }
@ -1381,18 +1368,15 @@ DRAW_FUNC_NAME(score_pendingScore)( DrawCtx* p_dctx, const XP_Rect* xprect,
CEDrawCtx* dctx = (CEDrawCtx*)p_dctx; CEDrawCtx* dctx = (CEDrawCtx*)p_dctx;
CEAppGlobals* globals = dctx->globals; CEAppGlobals* globals = dctx->globals;
HDC hdc = globals->hdc; HDC hdc = globals->hdc;
XP_U16 offset, actualHt;
wchar_t widebuf[5]; wchar_t widebuf[5];
XP_UCHAR buf[5]; XP_UCHAR buf[5];
RECT rt; RECT rt;
XP_Bool focussed = TREAT_AS_CURSOR(dctx,flags); XP_Bool focussed = TREAT_AS_CURSOR(dctx,flags);
XP_U16 bkIndex = focussed ? CE_FOCUS_COLOR : CE_BKG_COLOR; XP_U16 bkIndex = focussed ? CE_FOCUS_COLOR : CE_BKG_COLOR;
const FontCacheEntry* fce
HFONT font = ceGetSizedFont( dctx, = ceGetSizedFont( dctx, (xprect->height-(2*PTS_OFFSET))/2, RFONTS_PTS );
(xprect->height-(2*PTS_OFFSET))/2, HFONT oldFont = SelectObject( hdc, fce->setFont );
RFONTS_PTS, &offset, &actualHt );
HFONT oldFont = SelectObject( hdc, font );
SetTextColor( hdc, SetTextColor( hdc,
dctx->globals->appPrefs.colors[getPlayerColor(playerNum)] ); dctx->globals->appPrefs.colors[getPlayerColor(playerNum)] );
@ -1402,10 +1386,9 @@ DRAW_FUNC_NAME(score_pendingScore)( DrawCtx* p_dctx, const XP_Rect* xprect,
ceClipToRect( hdc, &rt ); ceClipToRect( hdc, &rt );
FillRect( hdc, &rt, dctx->brushes[bkIndex] ); FillRect( hdc, &rt, dctx->brushes[bkIndex] );
ceDrawTextClipped( hdc, L"Pts", -1, XP_FALSE, ceDrawTextClipped( hdc, L"Pts", -1, XP_FALSE, fce,
xprect->left + PTS_OFFSET, xprect->top + PTS_OFFSET, xprect->left + PTS_OFFSET, xprect->top + PTS_OFFSET,
xprect->width - (PTS_OFFSET*2), actualHt, offset, xprect->width - (PTS_OFFSET*2), DT_CENTER );
DT_CENTER );
if ( score < 0 ) { if ( score < 0 ) {
buf[0] = '?'; buf[0] = '?';
@ -1417,10 +1400,10 @@ DRAW_FUNC_NAME(score_pendingScore)( DrawCtx* p_dctx, const XP_Rect* xprect,
MultiByteToWideChar( CP_ACP, MB_PRECOMPOSED, buf, -1, MultiByteToWideChar( CP_ACP, MB_PRECOMPOSED, buf, -1,
widebuf, VSIZE(widebuf) ); widebuf, VSIZE(widebuf) );
ceDrawTextClipped( hdc, widebuf, -1, XP_TRUE, xprect->left + PTS_OFFSET, ceDrawTextClipped( hdc, widebuf, -1, XP_TRUE, fce,
xprect->top + xprect->height - PTS_OFFSET - actualHt, xprect->left + PTS_OFFSET,
xprect->width - (PTS_OFFSET*2), actualHt, offset, xprect->top + xprect->height - PTS_OFFSET - fce->actualHt,
DT_CENTER ); xprect->width - (PTS_OFFSET*2), DT_CENTER );
SelectObject( hdc, oldFont ); SelectObject( hdc, oldFont );
# undef PTS_OFFSET # undef PTS_OFFSET
} /* ce_draw_score_pendingScore */ } /* ce_draw_score_pendingScore */