Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-18 22:26:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

show current tray in pick dialog; begin work of letting user specify

Browse source 
how many tiles to use in hint.
This commit is contained in:
ehouse 2003-11-30 18:57:57 +00:00
parent 78ec0b9493
commit 8b458d4e53
1 changed files with 35 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
xwords4/palm/palmmain.c
View file

@ -114,7 +114,7 @@ static Boolean applicationHandleEvent( PalmAppGlobals* globals,
static Boolean mainViewHandleEvent( EventPtr event );
static UInt16 romVersion( void );
static Boolean handleHintRequest( PalmAppGlobals* globals );
static Boolean handleHintRequest( PalmAppGlobals* globals, XP_Bool askNTiles );
/* callbacks */
static VTableMgr* palm_util_getVTManager( XW_UtilCtxt* uc );
@ -1304,7 +1304,7 @@ handleNilEvent( PalmAppGlobals* globals, EventPtr event )
# endif
#endif
} else if ( globals->hintPending ) {
handled = handleHintRequest( globals );
handled = handleHintRequest( globals, XP_FALSE );
} else if ( globals->penTimerFireAt != TIMER_OFF &&
globals->penTimerFireAt <= TimGetTicks() ) {
@ -1359,12 +1359,21 @@ handleHideTray( PalmAppGlobals* globals )
} /* handleHideTray */
static Boolean
handleHintRequest( PalmAppGlobals* globals )
handleHintRequest( PalmAppGlobals* globals, XP_Bool askNTiles )
{
Boolean notDone;
Boolean draw;
XP_U16 nTiles;
XP_ASSERT( !!globals->game.board );
draw = board_requestHint( globals->game.board, &notDone );
if ( askNTiles ) {
nTiles = 3;
} else {
nTiles = MAX_TRAY_TILES;
}
draw = board_requestHint( globals->game.board, nTiles, &notDone );
globals->hintPending = notDone;
return draw;
} /* handleHintRequest */
@ -1426,6 +1435,7 @@ drawFormButtons( PalmAppGlobals* globals )
XW_MAIN_FLIP_BUTTON_ID, FLIP_BUTTON_BMP_RES_ID, XP_TRUE,
XW_MAIN_VALUE_BUTTON_ID, VALUE_BUTTON_BMP_RES_ID, XP_TRUE,
XW_MAIN_HINT_BUTTON_ID, HINT_BUTTON_BMP_RES_ID, XP_TRUE,
XW_MAIN_NHINT_BUTTON_ID, NHINT_BUTTON_BMP_RES_ID, XP_TRUE,
#ifndef EIGHT_TILES
XW_MAIN_HIDE_BUTTON_ID, TRAY_BUTTONS_BMP_RES_ID, XP_TRUE,
#endif
@ -1476,6 +1486,9 @@ palmSetCtrlsForTray( PalmAppGlobals* globals )
disOrEnable( form, XW_MAIN_HINT_BUTTON_ID,
(state==TRAY_REVEALED) &&
!globals->gameInfo.hintsNotAllowed );
disOrEnable( form, XW_MAIN_NHINT_BUTTON_ID,
(state==TRAY_REVEALED) &&
!globals->gameInfo.hintsNotAllowed );
#ifndef EIGHT_TILES
disOrEnable( form, XW_MAIN_DONE_BUTTON_ID, state==TRAY_REVEALED );
@ -1608,6 +1621,7 @@ updateForLefty( PalmAppGlobals* globals, FormPtr form )
XW_MAIN_FLIP_BUTTON_ID, 0,
XW_MAIN_VALUE_BUTTON_ID, 0,
XW_MAIN_HINT_BUTTON_ID, 0,
XW_MAIN_NHINT_BUTTON_ID, 0,
XW_MAIN_SCROLLBAR_ID, 0,
XW_MAIN_SHOWTRAY_BUTTON_ID, 0,
@ -1985,7 +1999,7 @@ mainViewHandleEvent( EventPtr event )
case XW_HINT_PULLDOWN_ID:
board_resetEngine( globals->game.board );
case XW_NEXTHINT_PULLDOWN_ID:
draw = handleHintRequest( globals );
draw = handleHintRequest( globals, XP_FALSE );
break;
case XW_UNDOCUR_PULLDOWN_ID:
@ -2136,7 +2150,10 @@ mainViewHandleEvent( EventPtr event )
draw = handleValueToggle( globals );
break;
case XW_MAIN_HINT_BUTTON_ID:
draw = handleHintRequest( globals );
draw = handleHintRequest( globals, XP_FALSE );
break;
case XW_MAIN_NHINT_BUTTON_ID:
draw = handleHintRequest( globals, XP_TRUE );
break;
#ifndef EIGHT_TILES
case XW_MAIN_DONE_BUTTON_ID:
@ -2648,7 +2665,6 @@ askBlankValue( PalmAppGlobals* globals, XP_U16 playerNum, PickInfo* pi,
LstSetSelection( lettersList, 0 );
fld = getActiveObjectPtr( XW_BLANK_LABEL_FIELD_ID );
name = globals->gameInfo.players[playerNum].name;
labelFmt = getResString( globals,
#ifdef FEATURE_TRAY_EDIT
@ -2659,12 +2675,21 @@ askBlankValue( PalmAppGlobals* globals, XP_U16 playerNum, PickInfo* pi,
#ifdef FEATURE_TRAY_EDIT
if ( !forBlank ) {
XP_U16 lenSoFar = XP_STRLEN(labelBuf);
XP_SNPRINTF( labelBuf + lenSoFar, sizeof(labelBuf) - lenSoFar,
" (%d/%d)", pi->thisPick, pi->nTotal );
XP_U16 lenSoFar;
XP_U16 i;
lenSoFar = XP_STRLEN(labelBuf);
lenSoFar += XP_SNPRINTF( labelBuf + lenSoFar, sizeof(labelBuf) - lenSoFar,
" (%d/%d)\nCur", pi->thisPick, pi->nTotal );
for ( i = 0; i < pi->nCurTiles; ++i ) {
lenSoFar += XP_SNPRINTF( labelBuf+lenSoFar, sizeof(labelBuf)-lenSoFar, "%s%s",
i==0?": ":", ", pi->curTiles[i] );
}
}
#endif
fld = getActiveObjectPtr( XW_BLANK_LABEL_FIELD_ID );
FldSetTextPtr( fld, labelBuf );
FldRecalculateField( fld, false );