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

use strbox for move confirmation; pass full path to GetSaveFileName

Browse source
This commit is contained in:
ehouse 2004-02-14 06:13:18 +00:00
parent b2af413a2a
commit 165d6e9c46
1 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
xwords4/wince/cemain.c
View file

@ -104,8 +104,9 @@ static void messageBoxChar( CEAppGlobals* globals, XP_UCHAR* str,
wchar_t* title ); wchar_t* title );
static XP_Bool queryBoxChar( CEAppGlobals* globals, XP_UCHAR* msg ); static XP_Bool queryBoxChar( CEAppGlobals* globals, XP_UCHAR* msg );
static void ceMsgFromStream( CEAppGlobals* globals, XWStreamCtxt* stream, static XP_U16 ceMsgFromStream( CEAppGlobals* globals, XWStreamCtxt* stream,
wchar_t* title, XP_Bool destroy ); wchar_t* title, XP_Bool isQuery,
XP_Bool destroy );
static void RECTtoXPR( XP_Rect* dest, RECT* src ); static void RECTtoXPR( XP_Rect* dest, RECT* src );
static XP_Bool doNewGame( CEAppGlobals* globals, XP_Bool silent ); static XP_Bool doNewGame( CEAppGlobals* globals, XP_Bool silent );
static XP_Bool ceSaveCurGame( CEAppGlobals* globals, XP_Bool autoSave ); static XP_Bool ceSaveCurGame( CEAppGlobals* globals, XP_Bool autoSave );
@ -794,7 +795,8 @@ ceCountsAndValues( CEAppGlobals* globals )
server_formatPoolCounts( globals->game.server, stream, server_formatPoolCounts( globals->game.server, stream,
2 ); /* 2: ncols */ 2 ); /* 2: ncols */
ceMsgFromStream( globals, stream, L"Tile Counts and Values", TRUE ); ceMsgFromStream( globals, stream, L"Tile Counts and Values",
XP_FALSE, XP_TRUE );
} }
} /* ceCountsAndValues */ } /* ceCountsAndValues */
@ -811,7 +813,7 @@ ceDoHistory( CEAppGlobals* globals )
model_writeGameHistory( globals->game.model, stream, model_writeGameHistory( globals->game.model, stream,
globals->game.server, gameOver ); globals->game.server, gameOver );
ceMsgFromStream( globals, stream, L"Game history", TRUE ); ceMsgFromStream( globals, stream, L"Game history", XP_FALSE, XP_TRUE );
} /* ceDoHistory */ } /* ceDoHistory */
static void static void
@ -842,7 +844,7 @@ ceDisplayFinalScores( CEAppGlobals* globals )
server_writeFinalScores( globals->game.server, stream ); server_writeFinalScores( globals->game.server, stream );
stream_putU8( stream, '\0' ); stream_putU8( stream, '\0' );
ceMsgFromStream( globals, stream, L"Final scores", TRUE ); ceMsgFromStream( globals, stream, L"Final scores", XP_FALSE, XP_TRUE );
} /* ceDisplayFinalScores */ } /* ceDisplayFinalScores */
static XP_Bool static XP_Bool
@ -1025,20 +1027,18 @@ ceSaveCurGame( CEAppGlobals* globals, XP_Bool autoSave )
XP_MEMSET( &sfs, 0, sizeof(sfs) ); XP_MEMSET( &sfs, 0, sizeof(sfs) );
XP_MEMSET( nameBuf, 0, sizeof(nameBuf) ); XP_MEMSET( nameBuf, 0, sizeof(nameBuf) );
wcscpy( nameBuf, DEFAULT_DIR_NAME L"\\Untitled.xwg" );
sfs.lStructSize = sizeof(sfs); sfs.lStructSize = sizeof(sfs);
sfs.Flags = OFN_PATHMUSTEXIST; sfs.Flags = OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT;
sfs.hwndOwner = globals->hWnd; sfs.hwndOwner = globals->hWnd;
sfs.lpstrFile = nameBuf; sfs.lpstrFile = nameBuf;
sfs.nMaxFile = sizeof(nameBuf)/sizeof(nameBuf[0]); sfs.nMaxFile = sizeof(nameBuf)/sizeof(nameBuf[0]);
sfs.lpstrDefExt = L"xwg"; sfs.lpstrDefExt = L"xwg";
/* Doesn't seem to be working.... */ // sfs.lpstrTitle: doesn't work
XP_LOGF( "setting the bleeping title to: Save current game as" ); // sfs.lpstrInitialDir: doesn't either
sfs.lpstrTitle = L"Save current game as";
/* XP_ASSERT( !!globals->lastDefaultDir ); */
sfs.lpstrInitialDir = L"hello world";
confirmed = GetSaveFileName( &sfs ); confirmed = GetSaveFileName( &sfs );
@ -1369,14 +1369,15 @@ notImpl( CEAppGlobals* globals )
messageBoxChar( globals, "feature not implemented", NULL ); messageBoxChar( globals, "feature not implemented", NULL );
} /* notImpl */ } /* notImpl */
static void static XP_U16
ceMsgFromStream( CEAppGlobals* globals, XWStreamCtxt* stream, ceMsgFromStream( CEAppGlobals* globals, XWStreamCtxt* stream,
wchar_t* title, XP_Bool destroy ) wchar_t* title, XP_Bool isQuery, XP_Bool destroy )
{ {
StrBoxInit init; StrBoxInit init;
init.title = title; init.title = title;
init.stream = stream; init.stream = stream;
init.isQuery = isQuery;
init.globals = globals; init.globals = globals;
DialogBoxParam( globals->hInst, (LPCTSTR)IDD_STRBOX, globals->hWnd, DialogBoxParam( globals->hInst, (LPCTSTR)IDD_STRBOX, globals->hWnd,
@ -1385,6 +1386,8 @@ ceMsgFromStream( CEAppGlobals* globals, XWStreamCtxt* stream,
if ( destroy ) { if ( destroy ) {
stream_destroy( stream ); stream_destroy( stream );
} }
return init.result;
} /* ceMsgFromStream */ } /* ceMsgFromStream */
static void static void
@ -1454,6 +1457,13 @@ queryBoxStream( CEAppGlobals* globals, XWStreamCtxt* stream )
return result; return result;
} /* queryBoxStream */ } /* queryBoxStream */
static XP_Bool
ceQueryFromStream( CEAppGlobals* globals, XWStreamCtxt* stream )
{
return ceMsgFromStream( globals, stream, L"Question", XP_TRUE,
XP_FALSE );
} /* ceQueryFromStream */
static void static void
RECTtoXPR( XP_Rect* dest, RECT* src ) RECTtoXPR( XP_Rect* dest, RECT* src )
{ {
@ -1630,7 +1640,7 @@ ce_util_userQuery( XW_UtilCtxt* uc, UtilQueryID id, XWStreamCtxt* stream )
} }
if ( queryWithStream ) { if ( queryWithStream ) {
answer = queryBoxStream( globals, stream ); answer = ceQueryFromStream( globals, stream );
} else if ( !!query ) { } else if ( !!query ) {
answer = queryBoxChar( globals, query ); answer = queryBoxChar( globals, query );
} else if ( !!info ) { } else if ( !!info ) {