Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-04 20:46:28 +01:00
Code Issues Projects Releases Packages Wiki Activity

compiles, but untested

Browse source 
And certainly won't work!
This commit is contained in:
Eric House 2023-02-17 08:57:25 -08:00
parent cc481373d8
commit 78d84a941e
8 changed files with 117 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
xwords4/wasm/LocalizedStrIncludes.h
View file

@ -60,6 +60,7 @@ enum {
STRSD_DUP_ONESCORE, STRSD_DUP_ONESCORE,
STR_BONUS_ALL_SUB, STR_BONUS_ALL_SUB,
STRS_DUP_ALLSCORES,
/* These three aren't in Android */ /* These three aren't in Android */
STR_LOCALPLAYERS, STR_LOCALPLAYERS,

4
xwords4/wasm/Makefile
View file

@ -48,6 +48,10 @@ DEFINES += -DXWFEATURE_BOARDWORDS
DEFINES += -DXWFEATURE_DEVICE DEFINES += -DXWFEATURE_DEVICE
DEFINES += -DNATIVE_NLI DEFINES += -DNATIVE_NLI
DEFINES += -DDEBUG_REF DEFINES += -DDEBUG_REF
DEFINES += -DXWFEATURE_COMMS_INVITE
DEFINES += -DMQTT_DEV_TOPICS
DEFINES += -DMQTT_GAMEID_TOPICS
DEFINES += -Wno-switch DEFINES += -Wno-switch
DEFINES += -DGITREV=\"$(shell git describe --tags --dirty)\" DEFINES += -DGITREV=\"$(shell git describe --tags --dirty)\"

159
xwords4/wasm/main.c
View file

@ -202,7 +202,7 @@ EM_JS(void, call_setup, (void* closure, bool dbg, const char* devid,
const char* gitrev, int now, const char* gitrev, int now,
StringProc conflictProc, StringProc conflictProc,
StringProc focussedProc, StringProc focussedProc,
BinProc msgProc), { MsgProc msgProc), {
let jsgr = UTF8ToString(gitrev); let jsgr = UTF8ToString(gitrev);
jssetup(closure, dbg, UTF8ToString(devid), jsgr, now, jssetup(closure, dbg, UTF8ToString(devid), jsgr, now,
conflictProc, focussedProc, msgProc); conflictProc, focussedProc, msgProc);
@ -338,43 +338,47 @@ call_alert( const char* msg )
call_dialog( msg, buttons, NULL, NULL ); call_dialog( msg, buttons, NULL, NULL );
} }
static bool static void
sendStreamToDev( XWStreamCtxt* stream, const MQTTDevID* devID ) onMsgAndTopic( void* closure, const XP_UCHAR* topic,
const XP_U8* msgBuf, XP_U16 msgLen )
{ {
XP_UCHAR topic[64]; /*bool success = */
formatMQTTTopic( devID, topic, sizeof(topic) ); call_mqttSend( topic, msgBuf, msgLen );
XP_U16 streamLen = stream_getSize( stream );
bool success = call_mqttSend( topic, stream_getPtr( stream ), streamLen );
stream_destroy( stream, NULL_XWE );
XP_LOGFF("(to: %s) => %s", topic, boolToStr(success) );
return success;
} }
static XP_S16 static XP_S16
send_msg( XWEnv xwe, const XP_U8* buf, XP_U16 len, send_msg( XWEnv xwe, const XP_U8* buf, XP_U16 len,
const XP_UCHAR* msgNo, const CommsAddrRec* addr, XP_U16 streamVersion, const XP_UCHAR* msgNo,
CommsConnType conType, XP_U32 gameID, void* closure ) XP_U32 createdStamp, const CommsAddrRec* addr,
CommsConnType conType, XP_U32 gameID,
void* closure )
{ {
XP_S16 nSent = -1; XP_S16 nSent = -1;
Globals* globals = (Globals*)closure; Globals* globals = (Globals*)closure;
if ( addr_hasType( addr, COMMS_CONN_MQTT ) ) { if ( addr_hasType( addr, COMMS_CONN_MQTT ) ) {
// MQTTDevID devID = addr->u.mqtt.devID; dvc_makeMQTTMessages( globals->dutil, NULL_XWE,
XWStreamCtxt* stream = mem_stream_make_raw( MPPARM(globals->mpool) onMsgAndTopic, NULL,
globals->vtMgr ); &addr->u.mqtt.devID,
dvc_makeMQTTMessage( globals->dutil, NULL_XWE, stream, gameID, buf, len,
gameID, buf, len ); streamVersion );
if ( sendStreamToDev( stream, &addr->u.mqtt.devID ) ) {
nSent = len;
} }
}
LOG_RETURNF( "%d", nSent ); LOG_RETURNF( "%d", nSent );
return nSent; return nSent;
} }
static XP_S16
send_invite( XWEnv xwe, const NetLaunchInfo* nli,
XP_U32 createdStamp, const CommsAddrRec* addr,
CommsConnType conType, void* closure )
{
Globals* globals = (Globals*)closure;
dvc_makeMQTTInvites( globals->dutil, NULL_XWE,
onMsgAndTopic, NULL,
&addr->u.mqtt.devID, nli );
return -1;
}
static void static void
formatGameID( char* buf, size_t len, int gameID ) formatGameID( char* buf, size_t len, int gameID )
{ {
@ -406,11 +410,9 @@ sendInviteTo(GameState* gs, const MQTTDevID* remoteDevID)
nli_init( &nli, &gs->gi, &myAddr, 1, 1 ); nli_init( &nli, &gs->gi, &myAddr, 1, 1 );
nli_setGameName( &nli, gs->gameName ); nli_setGameName( &nli, gs->gameName );
XWStreamCtxt* stream = mem_stream_make_raw( MPPARM(globals->mpool) dvc_makeMQTTInvites( globals->dutil, NULL_XWE,
globals->vtMgr ); onMsgAndTopic, NULL,
dvc_makeMQTTInvite( globals->dutil, NULL_XWE, stream, &nli ); remoteDevID, &nli );
sendStreamToDev( stream, remoteDevID );
} }
static void static void
@ -579,9 +581,9 @@ updateGameButtons( Globals* globals )
} }
static bool static bool
langNameFor( Globals* globals, XP_LangCode code, char buf[], size_t buflen ) langNameFor( Globals* globals, const char* lc, char buf[], size_t buflen )
{ {
const char* lc = lcToLocale( code ); /* const char* lc = lcToLocale( code ); */
const XP_UCHAR* keys[] = { KEY_DICTS, lc, KEY_LANG_NAME, NULL }; const XP_UCHAR* keys[] = { KEY_DICTS, lc, KEY_LANG_NAME, NULL };
XP_U32 len = buflen; XP_U32 len = buflen;
dutil_loadPtr( globals->dutil, NULL_XWE, keys, buf, &len ); dutil_loadPtr( globals->dutil, NULL_XWE, keys, buf, &len );
@ -598,7 +600,7 @@ showName( GameState* gs )
char buf[64]; char buf[64];
if ( 1 < countLangs( globals ) ) { if ( 1 < countLangs( globals ) ) {
char langName[32]; char langName[32];
if ( !langNameFor( globals, gs->gi.dictLang, langName, sizeof(langName) ) ) { if ( !langNameFor( globals, gs->gi.isoCodeStr, langName, sizeof(langName) ) ) {
strcpy( langName, "??" ); strcpy( langName, "??" );
} }
sprintf( buf, "%s (%s)", title, langName ); sprintf( buf, "%s (%s)", title, langName );
@ -659,7 +661,7 @@ formatForGame(Globals* globals, bool multiLangs, const XP_UCHAR* gameKey )
if ( len == sizeof(summary) ) { if ( len == sizeof(summary) ) {
if ( multiLangs ) { if ( multiLangs ) {
char langName[32]; char langName[32];
if ( langNameFor( globals, summary.lang, langName, sizeof(langName) ) ) { if ( langNameFor( globals, summary.isoCodeStr, langName, sizeof(langName) ) ) {
offset += snprintf( buf+offset, sizeof(buf)-offset, " (in %s)", langName ); offset += snprintf( buf+offset, sizeof(buf)-offset, " (in %s)", langName );
} }
} }
@ -977,10 +979,10 @@ onFocussed( void* closure, const char* newState )
} }
static void static void
onMqttMsg(void* closure, const uint8_t* data, int len ) onMqttMsg(void* closure, const char* topic, const uint8_t* data, int len )
{ {
CAST_GLOB(Globals*, globals, closure); CAST_GLOB(Globals*, globals, closure);
dvc_parseMQTTPacket( globals->dutil, NULL_XWE, data, len ); dvc_parseMQTTPacket( globals->dutil, NULL_XWE, topic, data, len );
} }
static bool static bool
@ -1093,7 +1095,8 @@ initDeviceGlobals( Globals* globals )
globals->cp.sortNewTiles = XP_TRUE; globals->cp.sortNewTiles = XP_TRUE;
globals->cp.showColors = XP_TRUE; globals->cp.showColors = XP_TRUE;
globals->transportProcs.send = send_msg; globals->transportProcs.sendMsg = send_msg;
globals->transportProcs.sendInvt = send_invite;
globals->transportProcs.closure = globals; globals->transportProcs.closure = globals;
#ifdef MEM_DEBUG #ifdef MEM_DEBUG
@ -1118,7 +1121,8 @@ initDeviceGlobals( Globals* globals )
false false
#endif #endif
; ;
call_setup( globals, dbg, buf, GITREV, now, onConflict, onFocussed, onMqttMsg ); call_setup( globals, dbg, buf, GITREV, now, onConflict,
onFocussed, onMqttMsg );
} }
static void static void
@ -1160,7 +1164,7 @@ startGame( GameState* gs, const char* name )
} }
static GameState* static GameState*
newFromInvite( Globals* globals, const NetLaunchInfo* invite ) newFromInvite( Globals* globals, const NetLaunchInfo* nli )
{ {
GameState* gs = newGameState(globals); GameState* gs = newGameState(globals);
gs->util = wasm_util_make( MPPARM(globals->mpool) &gs->gi, gs->util = wasm_util_make( MPPARM(globals->mpool) &gs->gi,
@ -1169,12 +1173,13 @@ newFromInvite( Globals* globals, const NetLaunchInfo* invite )
char playerName[32]; char playerName[32];
getLocalName( globals, playerName, sizeof(playerName) ); getLocalName( globals, playerName, sizeof(playerName) );
game_makeFromInvite( MPPARM(globals->mpool) NULL_XWE, invite, const CommsAddrRec* selfAddr = NULL;
&gs->game, &gs->gi, playerName, game_makeFromInvite( &gs->game, NULL_XWE, nli,
selfAddr,
gs->util, globals->draw, gs->util, globals->draw,
&globals->cp, &globals->transportProcs ); &globals->cp, &globals->transportProcs );
if ( invite->gameName[0] ) { if ( nli->gameName[0] ) {
nameGame( gs, invite->gameName ); nameGame( gs, nli->gameName );
} }
ensureName( gs ); ensureName( gs );
return gs; return gs;
@ -1222,22 +1227,22 @@ onDictConfirmed( void* closure, bool confirmed )
* host. * host.
*/ */
static GameState* static GameState*
gameFromInvite( Globals* globals, const NetLaunchInfo* invite ) gameFromInvite( Globals* globals, const NetLaunchInfo* nli )
{ {
bool needsLoad = true; bool needsLoad = true;
GameState* gs = getSavedGame( globals, invite->gameID ); GameState* gs = getSavedGame( globals, nli->gameID );
if ( !gs ) { if ( !gs ) {
const char* lc = lcToLocale( invite->lang ); const char* lc = nli->isoCodeStr;
if ( haveDictFor(globals, lc) ) { if ( haveDictFor(globals, lc) ) {
gs = newFromInvite( globals, invite ); gs = newFromInvite( globals, nli );
} else { } else {
char msg[128]; char msg[128];
sprintf( msg, "Invitation requires a wordlist %s for " sprintf( msg, "Invitation requires a wordlist %s for "
"locale %s; download now?", invite->dict, lc ); "locale %s; download now?", nli->dict, lc );
DictDownState* dds = XP_MALLOC( globals->mpool, sizeof(*dds) ); DictDownState* dds = XP_MALLOC( globals->mpool, sizeof(*dds) );
dds->globals = globals; dds->globals = globals;
dds->invite = *invite; dds->invite = *nli;
dds->lc = lc; dds->lc = lc;
call_confirm(globals, msg, onDictConfirmed, dds); call_confirm(globals, msg, onDictConfirmed, dds);
} }
@ -1314,7 +1319,7 @@ getSavedGame( Globals* globals, int gameID )
XP_FREE( globals->mpool, gs ); XP_FREE( globals->mpool, gs );
gs = NULL; gs = NULL;
} }
stream_destroy( stream, NULL_XWE ); stream_destroy( stream );
} }
XP_LOGFF( "(%X) => %p", gameID, gs ); XP_LOGFF( "(%X) => %p", gameID, gs );
return gs; return gs;
@ -1482,7 +1487,7 @@ loadAndDraw( Globals* globals, const NetLaunchInfo* invite,
gs->gi.phoniesAction = PHONIES_WARN; gs->gi.phoniesAction = PHONIES_WARN;
gs->gi.hintsNotAllowed = !!params && !params->allowHints || false; gs->gi.hintsNotAllowed = !!params && !params->allowHints || false;
gs->gi.gameID = 0; gs->gi.gameID = 0;
gs->gi.dictLang = dict_getLangCode(dict); XP_STRNCPY( gs->gi.isoCodeStr, dict_getISOCode(dict), VSIZE(gs->gi.isoCodeStr) );
replaceStringIfDifferent( globals->mpool, &gs->gi.dictName, replaceStringIfDifferent( globals->mpool, &gs->gi.dictName,
dict_getShortName(dict) ); dict_getShortName(dict) );
gs->gi.nPlayers = 2; gs->gi.nPlayers = 2;
@ -1503,17 +1508,21 @@ loadAndDraw( Globals* globals, const NetLaunchInfo* invite,
globals->dutil, gs ); globals->dutil, gs );
XP_LOGFF( "calling game_makeNewGame()" ); XP_LOGFF( "calling game_makeNewGame()" );
const CommsAddrRec* selfAddr = NULL;
CommsAddrRec _selfAddr;
if ( SERVER_STANDALONE != gs->gi.serverRole ) {
makeSelfAddr( globals, &_selfAddr );
selfAddr = &_selfAddr;
}
const CommsAddrRec* hostAddr = NULL;
game_makeNewGame( MPPARM(globals->mpool) NULL_XWE, game_makeNewGame( MPPARM(globals->mpool) NULL_XWE,
&gs->game, &gs->gi, &gs->game, &gs->gi,
selfAddr, hostAddr,
gs->util, globals->draw, gs->util, globals->draw,
&globals->cp, &globals->transportProcs ); &globals->cp, &globals->transportProcs );
ensureName( gs ); ensureName( gs );
if ( !!gs->game.comms ) {
CommsAddrRec addr = {0};
makeSelfAddr( globals, &addr );
comms_augmentHostAddr( gs->game.comms, NULL_XWE, &addr );
}
dict_unref( dict, NULL_XWE ); dict_unref( dict, NULL_XWE );
} }
} }
@ -1547,13 +1556,18 @@ typedef struct _OpenForMessageState {
void void
main_onGameMessage( Globals* globals, XP_U32 gameID, main_onGameMessage( Globals* globals, XP_U32 gameID,
const CommsAddrRec* from, XWStreamCtxt* stream ) const CommsAddrRec* from, const XP_U8* buf,
XP_U16 len )
{ {
GameState* gs = getSavedGame( globals, gameID ); GameState* gs = getSavedGame( globals, gameID );
if ( !!gs ) { if ( !!gs ) {
XWStreamCtxt* stream = mem_stream_make_raw( MPPARM(gs->globals->mpool)
gs->globals->vtMgr );
stream_putBytes( stream, buf, len );
if ( game_receiveMessage( &gs->game, NULL_XWE, stream, from ) ) { if ( game_receiveMessage( &gs->game, NULL_XWE, stream, from ) ) {
updateScreen( gs, true ); updateScreen( gs, true );
} }
stream_destroy( stream );
if ( !globals->focussed && GRANTED == js_getHaveNotifyPerm() ) { if ( !globals->focussed && GRANTED == js_getHaveNotifyPerm() ) {
GameSummary summary; GameSummary summary;
game_summarize( &gs->game, &gs->gi, &summary ); game_summarize( &gs->game, &gs->gi, &summary );
@ -1564,10 +1578,9 @@ main_onGameMessage( Globals* globals, XP_U32 gameID,
} }
} }
} else { } else {
XWStreamCtxt* stream = mem_stream_make_raw( MPPARM(globals->mpool) dvc_makeMQTTNoSuchGames( globals->dutil, NULL_XWE,
globals->vtMgr ); onMsgAndTopic, NULL,
dvc_makeMQTTNoSuchGame( globals->dutil, NULL_XWE, stream, gameID ); &from->u.mqtt.devID, gameID );
sendStreamToDev( stream, &from->u.mqtt.devID );
#ifdef DEBUG #ifdef DEBUG
char msg[128]; char msg[128];
snprintf( msg, sizeof(msg), "Dropping move for deleted game (id: %X/%d)", snprintf( msg, sizeof(msg), "Dropping move for deleted game (id: %X/%d)",
@ -1633,7 +1646,7 @@ main_showRemaining( GameState* gs )
board_formatRemainingTiles( gs->game.board, NULL_XWE, stream ); board_formatRemainingTiles( gs->game.board, NULL_XWE, stream );
stream_putU8( stream, 0 ); stream_putU8( stream, 0 );
call_alert( (const XP_UCHAR*)stream_getPtr( stream ) ); call_alert( (const XP_UCHAR*)stream_getPtr( stream ) );
stream_destroy( stream, NULL_XWE ); stream_destroy( stream );
} }
static void static void
@ -1724,7 +1737,7 @@ main_showGameOver( GameState* gs )
server_writeFinalScores( gs->game.server, NULL_XWE, stream ); server_writeFinalScores( gs->game.server, NULL_XWE, stream );
stream_putU8( stream, 0 ); stream_putU8( stream, 0 );
call_alert( (const XP_UCHAR*)stream_getPtr( stream ) ); call_alert( (const XP_UCHAR*)stream_getPtr( stream ) );
stream_destroy( stream, NULL_XWE ); stream_destroy( stream );
} }
} }
@ -1914,8 +1927,7 @@ updateScreen( GameState* gs, bool doSave )
if ( doSave ) { if ( doSave ) {
XWStreamCtxt* stream = mem_stream_make_raw( MPPARM(globals->mpool) XWStreamCtxt* stream = mem_stream_make_raw( MPPARM(globals->mpool)
globals->vtMgr ); globals->vtMgr );
game_saveToStream( &gs->game, NULL_XWE, &gs->gi, game_saveToStream( &gs->game, &gs->gi, stream, ++gs->saveToken );
stream, ++gs->saveToken );
GameSummary summary; GameSummary summary;
game_summarize( &gs->game, &gs->gi, &summary ); game_summarize( &gs->game, &gs->gi, &summary );
@ -1924,7 +1936,7 @@ updateScreen( GameState* gs, bool doSave )
formatGameID( gameIDStr, sizeof(gameIDStr), gs->gi.gameID ); formatGameID( gameIDStr, sizeof(gameIDStr), gs->gi.gameID );
const XP_UCHAR* keys[] = { KEY_GAMES, gameIDStr, KEY_GAME, NULL }; const XP_UCHAR* keys[] = { KEY_GAMES, gameIDStr, KEY_GAME, NULL };
dutil_storeStream( globals->dutil, NULL_XWE, keys, stream ); dutil_storeStream( globals->dutil, NULL_XWE, keys, stream );
stream_destroy( stream, NULL_XWE ); stream_destroy( stream );
game_saveSucceeded( &gs->game, NULL_XWE, gs->saveToken ); game_saveSucceeded( &gs->game, NULL_XWE, gs->saveToken );
keys[2] = KEY_SUMMARY; keys[2] = KEY_SUMMARY;
@ -1949,9 +1961,9 @@ onGotMissingDict( void* closure, GotDictData* gdd )
} }
void void
main_needDictForGame(GameState* gs, XP_LangCode lang, const XP_UCHAR* dictName) main_needDictForGame( GameState* gs, const char* lc,
const XP_UCHAR* dictName )
{ {
const char* lc = lcToLocale(lang);
call_get_dict( lc, onGotMissingDict, gs->globals ); call_get_dict( lc, onGotMissingDict, gs->globals );
} }
@ -2002,7 +2014,7 @@ inviteFromArgv( Globals* globals, NetLaunchInfo* nlip,
++param; /* skip the '=' */ ++param; /* skip the '=' */
if ( 0 == strcmp( "lang", arg ) ) { if ( 0 == strcmp( "lang", arg ) ) {
gi.dictLang = atoi(param); XP_STRNCPY( gi.isoCodeStr, param, VSIZE(gi.isoCodeStr) );
} else if ( 0 == strcmp( "np", arg ) ) { } else if ( 0 == strcmp( "np", arg ) ) {
gi.nPlayers = atoi(param); gi.nPlayers = atoi(param);
} else if ( 0 == strcmp( "nh", arg ) ) { } else if ( 0 == strcmp( "nh", arg ) ) {
@ -2150,7 +2162,7 @@ onResize( void* closure, int width, int height )
typedef struct _LaunchState { typedef struct _LaunchState {
Globals* globals; Globals* globals;
NetLaunchInfo invite; NetLaunchInfo nli;
char playerName[32]; char playerName[32];
bool hadName; bool hadName;
} LaunchState; } LaunchState;
@ -2176,7 +2188,7 @@ onGotInviteDictAtLaunch( void* closure, GotDictData* gdd )
/* We're ready to start. If we had an invitation, launch for it. Otherwise /* We're ready to start. If we had an invitation, launch for it. Otherwise
launch the last game that was open */ launch the last game that was open */
NetLaunchInfo* nlip = ls->invite.lang == 0 ? NULL : &ls->invite; NetLaunchInfo* nlip = '\0' == ls->nli.isoCodeStr[0] ? NULL : &ls->nli;
int gameID = 0; int gameID = 0;
XP_U32 len = sizeof(gameID); XP_U32 len = sizeof(gameID);
const XP_UCHAR* keys[] = {KEY_LAST_GID, NULL}; const XP_UCHAR* keys[] = {KEY_LAST_GID, NULL};
@ -2199,10 +2211,9 @@ onGotNativeDictAtLaunch( void* closure, GotDictData* gdd )
/* Now download a wordlist if we need one */ /* Now download a wordlist if we need one */
const char* neededLC = NULL; const char* neededLC = NULL;
if ( 0 != ls->invite.lang ) { /* 0 means unset: no invite */ if ( '\0' != ls->nli.isoCodeStr[0] ) { /* 0 means unset: no invite */
const char* lc = lcToLocale( ls->invite.lang ); if ( !haveDictFor(ls->globals, ls->nli.isoCodeStr) ) {
if ( !haveDictFor(ls->globals, lc) ) { neededLC = ls->nli.isoCodeStr;
neededLC = lc;
} }
} }
if ( !!neededLC ) { if ( !!neededLC ) {
@ -2244,7 +2255,7 @@ startLaunchSequence( Globals* globals, NetLaunchInfo* nli )
LaunchState* ls = XP_CALLOC( globals->mpool, sizeof(*ls) ); LaunchState* ls = XP_CALLOC( globals->mpool, sizeof(*ls) );
ls->globals = globals; ls->globals = globals;
if ( NULL != nli ) { if ( NULL != nli ) {
ls->invite = *nli; ls->nli = *nli;
} }
/* No saved name? Ask. Politely */ /* No saved name? Ask. Politely */

7
xwords4/wasm/main.h
View file

@ -37,6 +37,8 @@ typedef XP_Bool (*IdleProc)(void* closure);
typedef void (*BinProc)(void* closure, const uint8_t* data, int len); typedef void (*BinProc)(void* closure, const uint8_t* data, int len);
typedef void (*BoolProc)(void* closure, bool result); typedef void (*BoolProc)(void* closure, bool result);
typedef void (*StringProc)(void* closure, const char* str); typedef void (*StringProc)(void* closure, const char* str);
typedef void (*MsgProc)(void* closure, const char* topic,
const uint8_t* data, int len);
typedef struct GameState { typedef struct GameState {
#ifdef DEBUG #ifdef DEBUG
@ -103,7 +105,8 @@ void main_alert( GameState* gs, const XP_UCHAR* msg );
void main_gameFromInvite( Globals* globals, const NetLaunchInfo* invite ); void main_gameFromInvite( Globals* globals, const NetLaunchInfo* invite );
void main_onGameMessage( Globals* globals, XP_U32 gameID, void main_onGameMessage( Globals* globals, XP_U32 gameID,
const CommsAddrRec* from, XWStreamCtxt* stream ); const CommsAddrRec* from, const XP_U8* buf,
XP_U16 len );
void main_onGameGone( Globals* globals, XP_U32 gameID ); void main_onGameGone( Globals* globals, XP_U32 gameID );
void main_sendOnClose( XWStreamCtxt* stream, XWEnv env, void* closure ); void main_sendOnClose( XWStreamCtxt* stream, XWEnv env, void* closure );
void main_playerScoreHeld( GameState* gs, XP_U16 player ); void main_playerScoreHeld( GameState* gs, XP_U16 player );
@ -114,6 +117,6 @@ void main_chatReceived( GameState* gs, const char* msg );
void main_pickBlank( GameState* gs, int playerNum, int col, int row, void main_pickBlank( GameState* gs, int playerNum, int col, int row,
const char** tileFaces, int nTiles ); const char** tileFaces, int nTiles );
void main_updateScreen( GameState* gs ); void main_updateScreen( GameState* gs );
void main_needDictForGame(GameState* gs, XP_LangCode lang, const XP_UCHAR* dictName); void main_needDictForGame(GameState* gs, const char* lc, const XP_UCHAR* dictName);
#endif #endif

9
xwords4/wasm/wasmdict.c
View file

@ -146,14 +146,7 @@ wasm_dictionary_destroy( DictionaryCtxt* dict, XWEnv xwe )
XP_FREE( dict->mpool, ctxt->dictBase ); XP_FREE( dict->mpool, ctxt->dictBase );
} }
/* super's destructor should do this!!!! */ dict_super_destroy( &ctxt->super );
XP_FREEP( dict->mpool, &ctxt->super.desc );
XP_FREEP( dict->mpool, &ctxt->super.md5Sum );
XP_FREEP( dict->mpool, &ctxt->super.countsAndValues );
XP_FREEP( dict->mpool, &ctxt->super.faces );
XP_FREEP( dict->mpool, &ctxt->super.facePtrs );
XP_FREEP( dict->mpool, &ctxt->super.name );
XP_FREE( dict->mpool, ctxt );
} }
DictionaryCtxt* DictionaryCtxt*

8
xwords4/wasm/wasmdutil.c
View file

@ -411,12 +411,12 @@ wasm_dutil_onInviteReceived( XW_DUtilCtxt* duc, XWEnv XP_UNUSED(xwe),
} }
static void static void
wasm_dutil_onMessageReceived( XW_DUtilCtxt* duc, XWEnv XP_UNUSED(xwe), wasm_dutil_onMessageReceived( XW_DUtilCtxt* duc, XWEnv xwe, XP_U32 gameID,
XP_U32 gameID, const CommsAddrRec* from, const CommsAddrRec* from, const XP_U8* buf,
XWStreamCtxt* stream ) XP_U16 len )
{ {
Globals* globals = (Globals*)duc->closure; Globals* globals = (Globals*)duc->closure;
main_onGameMessage( globals, gameID, from, stream ); main_onGameMessage( globals, gameID, from, buf, len );
} }
static void static void

26
xwords4/wasm/wasmutil.c
View file

@ -41,7 +41,7 @@ wasm_util_makeStreamFromAddr( XW_UtilCtxt* uc, XWEnv xwe, XP_PlayerAddr channelN
GameState* gs = wuctxt->closure; GameState* gs = wuctxt->closure;
XWStreamCtxt* stream = mem_stream_make( MPPARM(uc->mpool) XWStreamCtxt* stream = mem_stream_make( MPPARM(uc->mpool)
gs->globals->vtMgr, gs, gs->globals->vtMgr, gs,
channelNo, main_sendOnClose ); channelNo, main_sendOnClose, NULL_XWE );
return stream; return stream;
} }
@ -316,7 +316,8 @@ wasm_util_informUndo( XW_UtilCtxt* uc, XWEnv xwe )
} }
static void static void
wasm_util_informNetDict( XW_UtilCtxt* uc, XWEnv xwe, XP_LangCode lang, wasm_util_informNetDict( XW_UtilCtxt* uc, XWEnv xwe,
const XP_UCHAR* isoCode,
const XP_UCHAR* oldName, const XP_UCHAR* oldName,
const XP_UCHAR* newName, const XP_UCHAR* newName,
const XP_UCHAR* newSum, const XP_UCHAR* newSum,
@ -474,8 +475,8 @@ gotForLang( void* closure, const XP_UCHAR* keys[] )
} }
static const DictionaryCtxt* static const DictionaryCtxt*
wasm_util_getDict( XW_UtilCtxt* uc, XWEnv xwe, wasm_util_getDict( XW_UtilCtxt* uc, XWEnv xwe, const XP_UCHAR* isoCode,
XP_LangCode lang, const XP_UCHAR* dictName ) const XP_UCHAR* dictName )
{ {
XP_LOGFF( "(dictName: %s)", dictName ); XP_LOGFF( "(dictName: %s)", dictName );
WasmUtilCtx* wuctxt = (WasmUtilCtx*)uc; WasmUtilCtx* wuctxt = (WasmUtilCtx*)uc;
@ -483,7 +484,7 @@ wasm_util_getDict( XW_UtilCtxt* uc, XWEnv xwe,
Globals* globals = gs->globals; Globals* globals = gs->globals;
XW_DUtilCtxt* duc = util_getDevUtilCtxt(uc, xwe); XW_DUtilCtxt* duc = util_getDevUtilCtxt(uc, xwe);
const char* lc = lcToLocale( lang ); const char* lc = isoCode;
const DictionaryCtxt* result = dmgr_get( globals->dictMgr, xwe, dictName ); const DictionaryCtxt* result = dmgr_get( globals->dictMgr, xwe, dictName );
if ( !result ) { if ( !result ) {
@ -512,7 +513,7 @@ wasm_util_getDict( XW_UtilCtxt* uc, XWEnv xwe,
} }
if ( !result ) { if ( !result ) {
main_needDictForGame( gs, lang, dictName ); main_needDictForGame( gs, isoCode, dictName );
} }
XP_LOGFF("(%s, %s)=>%p", lc, dictName, result ); XP_LOGFF("(%s, %s)=>%p", lc, dictName, result );
@ -534,15 +535,9 @@ wasm_util_cellSquareHeld( XW_UtilCtxt* uc, XWEnv xwe, XWStreamCtxt* words )
static void static void
wasm_util_informMissing( XW_UtilCtxt* uc, XWEnv xwe, XP_Bool isServer, wasm_util_informMissing( XW_UtilCtxt* uc, XWEnv xwe, XP_Bool isServer,
const CommsAddrRec* addr, XP_U16 nDevs, const CommsAddrRec* hostAddr,
XP_U16 nMissing ) const CommsAddrRec* selfAddr, XP_U16 nDevs,
{ XP_U16 nMissing, XP_U16 nInvited )
LOG_FUNC();
}
static void
wasm_util_addrChange( XW_UtilCtxt* uc, XWEnv xwe, const CommsAddrRec* oldAddr,
const CommsAddrRec* newAddr )
{ {
LOG_FUNC(); LOG_FUNC();
} }
@ -640,7 +635,6 @@ wasm_util_make( MPFORMAL CurGameInfo* gi, XW_DUtilCtxt* dctxt, GameState* closur
SET_VTABLE_ENTRY( wuctxt->super.vtable, util_cellSquareHeld, wasm ); SET_VTABLE_ENTRY( wuctxt->super.vtable, util_cellSquareHeld, wasm );
#endif #endif
SET_VTABLE_ENTRY( wuctxt->super.vtable, util_informMissing, wasm ); SET_VTABLE_ENTRY( wuctxt->super.vtable, util_informMissing, wasm );
SET_VTABLE_ENTRY( wuctxt->super.vtable, util_addrChange, wasm );
SET_VTABLE_ENTRY( wuctxt->super.vtable, util_informWordsBlocked, wasm ); SET_VTABLE_ENTRY( wuctxt->super.vtable, util_informWordsBlocked, wasm );
SET_VTABLE_ENTRY( wuctxt->super.vtable, util_getInviteeName, wasm ); SET_VTABLE_ENTRY( wuctxt->super.vtable, util_getInviteeName, wasm );
#ifdef XWFEATURE_CHAT #ifdef XWFEATURE_CHAT