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

format rem text as two lines

Browse source
This commit is contained in:
Eric House 2014-01-05 13:30:27 -08:00
parent 123141e0df
commit 83692fd2e8
1 changed files with 29 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
xwords4/linux/cursesdraw.c
View file

@ -122,40 +122,56 @@ curses_draw_drawRemText( DrawCtx* p_dctx, XP_S16 nTilesLeft,
} }
#else #else
static void static void
formatRemText( char* buf, int bufLen, XP_S16 nTilesLeft, int XP_UNUSED(width) ) formatRemText( XP_S16 nTilesLeft, const XP_Rect* rect, char* buf, char** lines )
{ {
/* int len = snprintf( buf, bufLen, "Tiles left in pool: %.3d", nTilesLeft ); */ if ( 1 == rect->height ) {
/* if ( len > bufLen || strlen(buf)+1 >= width ) { */ *lines = buf;
snprintf( buf, bufLen, "Rem: %.3d", nTilesLeft ); sprintf( buf, "Rem: %.3d", nTilesLeft );
/* } */ } else {
sprintf( buf, "Rem:" );
*lines++ = buf;
buf += 1 + strlen(buf);
sprintf( buf, "%.3d", nTilesLeft );
*lines++ = buf;
}
} /* formatRemText */ } /* formatRemText */
static XP_Bool static XP_Bool
curses_draw_measureRemText( DrawCtx* XP_UNUSED(dctx), curses_draw_measureRemText( DrawCtx* XP_UNUSED(dctx),
const XP_Rect* r, const XP_Rect* rect,
XP_S16 nTilesLeft, XP_S16 nTilesLeft,
XP_U16* width, XP_U16* height ) XP_U16* width, XP_U16* height )
{ {
char buf[64]; char buf[64];
formatRemText( buf, sizeof(buf), nTilesLeft, r->width ); char* lines[2] = {0};
formatRemText( nTilesLeft, rect, buf, lines );
*width = strlen(buf); *width = 0;
*height = r->height; int ii;
for ( ii = 0; ii < VSIZE(lines) && !!lines[ii]; ++ii ) {
*width = XP_MAX( *width, strlen(lines[ii]) );
}
*height = ii;
return XP_TRUE; return XP_TRUE;
} /* curses_draw_measureRemText */ } /* curses_draw_measureRemText */
static void static void
curses_draw_drawRemText( DrawCtx* p_dctx, const XP_Rect* rInner, curses_draw_drawRemText( DrawCtx* p_dctx, const XP_Rect* rInner,
const XP_Rect* XP_UNUSED(rOuter), XP_S16 nTilesLeft, const XP_Rect* rOuter, XP_S16 nTilesLeft,
XP_Bool focussed ) XP_Bool focussed )
{ {
CursesDrawCtx* dctx = (CursesDrawCtx*)p_dctx; CursesDrawCtx* dctx = (CursesDrawCtx*)p_dctx;
char buf[32]; char buf[32];
formatRemText( buf, sizeof(buf), nTilesLeft, rInner->width ); char* lines[2] = {0};
mvwprintw( dctx->boardWin, rInner->top, rInner->left, buf ); formatRemText( nTilesLeft, rInner, buf, lines );
int ii;
for ( ii = 0; ii < VSIZE(lines) && !!lines[ii]; ++ii ) {
mvwprintw( dctx->boardWin, rInner->top + ii, rInner->left, lines[ii] );
}
if ( focussed ) { if ( focussed ) {
cursesHiliteRect( dctx->boardWin, rInner ); cursesHiliteRect( dctx->boardWin, rOuter );
} }
} /* curses_draw_drawRemText */ } /* curses_draw_drawRemText */
#endif #endif