Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-15 15:41:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Get rid of TALL_FONT macro, since it's permanently on anyway.

Browse source
This commit is contained in:
ehouse 2006-04-01 21:25:58 +00:00
parent 13b7fa62aa
commit 01d7f9b344
3 changed files with 0 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
palm/palmdict.c
View file

@ -186,9 +186,7 @@ palm_dictionary_make( MPFORMAL PalmAppGlobals* globals,
charPtr = (unsigned char*)MemHandleLock(tmpH); charPtr = (unsigned char*)MemHandleLock(tmpH);
XP_ASSERT( MemHandleLockCount( tmpH ) == 1 ); XP_ASSERT( MemHandleLockCount( tmpH ) == 1 );
// use 2; ARM thinks sizeof(Xloc_header) is 4. // use 2; ARM thinks sizeof(Xloc_header) is 4.
#ifdef TALL_FONTS
ctxt->super.langCode = *charPtr; ctxt->super.langCode = *charPtr;
#endif
ctxt->super.countsAndValues = charPtr + 2; ctxt->super.countsAndValues = charPtr + 2;
/* for those dicts with special chars */ /* for those dicts with special chars */

18
palm/palmdraw.c
View file

@ -39,9 +39,7 @@
static XP_Bool palm_common_draw_drawCell( DrawCtx* p_dctx, const XP_Rect* rect, static XP_Bool palm_common_draw_drawCell( DrawCtx* p_dctx, const XP_Rect* rect,
const XP_UCHAR* letters, XP_Bitmap bitmap, const XP_UCHAR* letters, XP_Bitmap bitmap,
#ifdef TALL_FONTS
Tile tile, Tile tile,
#endif
XP_S16 owner, XWBonusType bonus, XP_S16 owner, XWBonusType bonus,
HintAtts hintAtts, XP_Bool isBlank, HintAtts hintAtts, XP_Bool isBlank,
XP_Bool isPending, XP_Bool isStar ); XP_Bool isPending, XP_Bool isStar );
@ -126,7 +124,6 @@ bitmapInRect( PalmDrawCtx* dctx, Int16 resID, const XP_Rect* rectP )
drawBitmapAt( (DrawCtx*)dctx, resID, left, top ); drawBitmapAt( (DrawCtx*)dctx, resID, left, top );
} /* bitmapInRect */ } /* bitmapInRect */
#ifdef TALL_FONTS
# define BMP_WIDTH 16 # define BMP_WIDTH 16
# define BMP_HT 16 # define BMP_HT 16
@ -229,9 +226,6 @@ checkFontOffsets( PalmDrawCtx* dctx, const DictionaryCtxt* dict )
dctx->fontLangCode = code; dctx->fontLangCode = code;
} }
} }
#else
# define checkFontOffsets(a,b)
#endif
static XP_Bool static XP_Bool
palm_common_draw_boardBegin( DrawCtx* p_dctx, const DictionaryCtxt* dict, palm_common_draw_boardBegin( DrawCtx* p_dctx, const DictionaryCtxt* dict,
@ -277,9 +271,7 @@ palm_clr_draw_boardFinished( DrawCtx* p_dctx )
static XP_Bool static XP_Bool
palm_clr_draw_drawCell( DrawCtx* p_dctx, const XP_Rect* rect, palm_clr_draw_drawCell( DrawCtx* p_dctx, const XP_Rect* rect,
const XP_UCHAR* letters, XP_Bitmap bitmap, const XP_UCHAR* letters, XP_Bitmap bitmap,
#ifdef TALL_FONTS
Tile tile, Tile tile,
#endif
XP_S16 owner, XWBonusType bonus, HintAtts hintAtts, XP_S16 owner, XWBonusType bonus, HintAtts hintAtts,
XP_Bool isBlank, XP_Bool isBlank,
XP_Bool isPending, XP_Bool isStar ) XP_Bool isPending, XP_Bool isStar )
@ -313,9 +305,7 @@ palm_clr_draw_drawCell( DrawCtx* p_dctx, const XP_Rect* rect,
} }
return palm_common_draw_drawCell( p_dctx, rect, letters, bitmap, return palm_common_draw_drawCell( p_dctx, rect, letters, bitmap,
#ifdef TALL_FONTS
tile, tile,
#endif
owner, bonus, hintAtts, isBlank, isPending, owner, bonus, hintAtts, isBlank, isPending,
isStar ); isStar );
} /* palm_clr_draw_drawCell */ } /* palm_clr_draw_drawCell */
@ -374,9 +364,7 @@ palmDrawHintBorders( const XP_Rect* rect, HintAtts hintAtts )
static XP_Bool static XP_Bool
palm_common_draw_drawCell( DrawCtx* p_dctx, const XP_Rect* rect, palm_common_draw_drawCell( DrawCtx* p_dctx, const XP_Rect* rect,
const XP_UCHAR* letters, XP_Bitmap bitmap, const XP_UCHAR* letters, XP_Bitmap bitmap,
#ifdef TALL_FONTS
Tile tile, Tile tile,
#endif
XP_S16 owner, XWBonusType bonus, HintAtts hintAtts, XP_S16 owner, XWBonusType bonus, HintAtts hintAtts,
XP_Bool isBlank, XP_Bool isPending, XP_Bool isStar ) XP_Bool isBlank, XP_Bool isPending, XP_Bool isStar )
{ {
@ -431,12 +419,8 @@ palm_common_draw_drawCell( DrawCtx* p_dctx, const XP_Rect* rect,
XP_S16 strWidth = FntCharsWidth( (const char*)letters, len ); XP_S16 strWidth = FntCharsWidth( (const char*)letters, len );
XP_U16 x, y; XP_U16 x, y;
x = localR.left + ((localR.width-strWidth) / 2); x = localR.left + ((localR.width-strWidth) / 2);
#ifdef TALL_FONTS
y = localR.top - dctx->fontHtInfo[tile].topOffset; y = localR.top - dctx->fontHtInfo[tile].topOffset;
y += (localR.height - dctx->fontHtInfo[tile].height) / 2; y += (localR.height - dctx->fontHtInfo[tile].height) / 2;
#else
y = localR.top-1;
#endif
if ( len == 1 ) { if ( len == 1 ) {
++x; ++x;
} }
@ -1456,10 +1440,8 @@ palm_drawctxt_destroy( DrawCtx* p_dctx )
PalmDrawCtx* dctx = (PalmDrawCtx*)p_dctx; PalmDrawCtx* dctx = (PalmDrawCtx*)p_dctx;
XP_FREE( dctx->mpool, p_dctx->vtable ); XP_FREE( dctx->mpool, p_dctx->vtable );
#ifdef TALL_FONTS
if ( !!dctx->fontHtInfo ) { if ( !!dctx->fontHtInfo ) {
XP_FREE( dctx->mpool, dctx->fontHtInfo ); XP_FREE( dctx->mpool, dctx->fontHtInfo );
} }
#endif
XP_FREE( dctx->mpool, dctx ); XP_FREE( dctx->mpool, dctx );
} /* palm_drawctxt_destroy */ } /* palm_drawctxt_destroy */

4
palm/palmmain.h
View file

@ -57,14 +57,12 @@ typedef struct PalmAppGlobals PalmAppGlobals;
typedef XP_UCHAR* (*GetResStringFunc)( PalmAppGlobals* globals, typedef XP_UCHAR* (*GetResStringFunc)( PalmAppGlobals* globals,
XP_U16 strID ); XP_U16 strID );
#ifdef TALL_FONTS
typedef struct { typedef struct {
XP_S16 topOffset; /* how many pixels from the top of the XP_S16 topOffset; /* how many pixels from the top of the
drawing area is the first pixel set in drawing area is the first pixel set in
the glyph */ the glyph */
XP_U16 height; /* How many rows tall is the image? */ XP_U16 height; /* How many rows tall is the image? */
} PalmFontHtInfo; } PalmFontHtInfo;
#endif
typedef struct PalmDrawCtx { typedef struct PalmDrawCtx {
DrawCtxVTable* vtable; DrawCtxVTable* vtable;
@ -87,10 +85,8 @@ typedef struct PalmDrawCtx {
XP_Bool doHiRes; XP_Bool doHiRes;
XP_Bool oneDotFiveAvail; XP_Bool oneDotFiveAvail;
#ifdef TALL_FONTS
XP_LangCode fontLangCode; XP_LangCode fontLangCode;
PalmFontHtInfo* fontHtInfo; PalmFontHtInfo* fontHtInfo;
#endif
union { union {
struct { struct {