new game works

Only two options: local game with one robot, or networked needing to
invite someone.

xwords4/wasm/Makefile

@@ -72,7 +72,7 @@ main.html: ${INPUTS} Makefile shell_minimal.html
 		--preload-file assets_dir --shell-file shell_minimal.html \
 		-s USE_SDL_TTF=2 -s USE_SDL_IMAGE=2 -s SDL2_IMAGE_FORMATS='["png"]' \
 		-s "EXTRA_EXPORTED_RUNTIME_METHODS=['ccall']" \
-		-s EXPORTED_FUNCTIONS='["_main", "_gotMQTTMsg", "_jscallback", "_onDlgButton", "_MQTTConnectedChanged"]' \
+		-s EXPORTED_FUNCTIONS='["_main", "_gotMQTTMsg", "_jscallback", "_onDlgButton", "_MQTTConnectedChanged", "_onNewGame"]' \
 		-s WASM=1 \
 		${INPUTS} -o $@
 

xwords4/wasm/main.c

@@ -83,9 +83,13 @@
 #define BUTTON_GAME_DELETE "Delete Game"
 #define MAX_BUTTONS 20          /* not sure what's safe here */
 
+typedef struct _NewGameParams {
+    bool isRobotNotRemote;
+    bool hintsNotAllowed;
+} NewGameParams;
 
 static void loadAndDraw( Globals* globals, const NetLaunchInfo* invite,
-                         const char* key, bool forceNew );
+                         const char* key, NewGameParams* params );
 static void nameGame( Globals* globals );
 static void ensureName( Globals* globals );
 static void loadName( Globals* globals );
@@ -205,6 +209,11 @@ EM_JS(void, setButtons, (const char* id, const char** bstrs,
           setDivButtons(UTF8ToString(id), buttons, proc, closure);
     });
 
+EM_JS(void, callNewGame, (const char* msg, void* closure), {
+        let jsmsg = UTF8ToString(msg);
+        nbGetNewGame(closure, jsmsg);
+    });
+
 static void updateScreen( Globals* globals, bool doSave );
 
 typedef void (*ConfirmProc)( void* closure, bool confirmed );
@@ -290,11 +299,17 @@ formatGameID( char* buf, size_t len, int gameID )
 }
 
 static void
-formatGameKey( char* buf, size_t len, const char* gameID )
+formatGameKeyStr( char* buf, size_t len, const char* gameID )
 {
     snprintf( buf, len, KEY_GAME_PREFIX "%s", gameID );
 }
 
+static void
+formatGameKeyInt( char* buf, size_t len, int gameID )
+{
+    snprintf( buf, len, KEY_GAME_PREFIX "%X", gameID );
+}
+
 static void
 formatNameKey( char* buf, size_t len, int gameID )
 {
@@ -342,33 +357,34 @@ onGameButton( void* closure, const char* button )
 static void
 updateGameButtons( Globals* globals )
 {
-    GameStateInfo gsi;
-    game_getState( &globals->gs.game, NULL, &gsi );
-
     const char* buttons[MAX_BUTTONS];
     int cur = 0;
 
-    if ( gsi.canHint ) {
+    if ( !!globals->gs.util ) {
-        buttons[cur++] = BUTTON_HINTDOWN;
+        GameStateInfo gsi;
-        buttons[cur++] = BUTTON_HINTUP;
+        game_getState( &globals->gs.game, NULL, &gsi );
+
+        if ( gsi.canHint ) {
+            buttons[cur++] = BUTTON_HINTDOWN;
+            buttons[cur++] = BUTTON_HINTUP;
+        }
+
+        if ( gsi.inTrade ) {
+            buttons[cur++] = BUTTON_STOPTRADE;
+        } else if ( gsi.canTrade ) {
+            buttons[cur++] = BUTTON_TRADE;
+        }
+        buttons[cur++] = BUTTON_COMMIT;
+        buttons[cur++] = BUTTON_FLIP;
+
+        if ( gsi.canUndo ) {
+            buttons[cur++] = BUTTON_UNDO;
+        } else if ( gsi.canRedo ) {
+            buttons[cur++] = BUTTON_REDO;
+        }
+
+        buttons[cur++] = BUTTON_VALS;
     }
-
-    if ( gsi.inTrade ) {
-        buttons[cur++] = BUTTON_STOPTRADE;
-    } else if ( gsi.canTrade ) {
-        buttons[cur++] = BUTTON_TRADE;
-    }
-    buttons[cur++] = BUTTON_COMMIT;
-    buttons[cur++] = BUTTON_FLIP;
-
-    if ( gsi.canUndo ) {
-        buttons[cur++] = BUTTON_UNDO;
-    } else if ( gsi.canRedo ) {
-        buttons[cur++] = BUTTON_REDO;
-    }
-
-    buttons[cur++] = BUTTON_VALS;
-
     buttons[cur++] = NULL;
 
     setButtons( BUTTONS_ID_GAME, buttons, onGameButton, globals );
@@ -378,7 +394,7 @@ static void
 onGameChosen( void* closure, const char* key )
 {
     Globals* globals = (Globals*)closure;
-    loadAndDraw( globals, NULL, key, false );
+    loadAndDraw( globals, NULL, key, NULL );
 }
 
 static void
@@ -394,13 +410,47 @@ onGameRanamed( void* closure, const char* newName )
     }
 }
 
+static void
+cleanupGame( Globals* globals )
+{
+    if ( !!globals->gs.util ) {
+        game_dispose( &globals->gs.game, NULL );
+        wasm_util_destroy( globals->gs.util );
+        XP_MEMSET( &globals->gs, 0, sizeof(globals->gs) );
+    }
+}
+
+static void
+deleteCurGame( Globals* globals )
+{
+    int gameID = globals->gs.gi.gameID; /* remember it */
+    cleanupGame( globals );
+
+    char key[32];
+    formatNameKey( key, sizeof(key), gameID );
+    remove_stored_value( key );
+
+    formatGameKeyInt( key, sizeof(key), gameID );
+    remove_stored_value( key );
+}
+
+static void
+onDeleteConfirmed( void* closure, bool confirmed )
+{
+    if ( confirmed ) {
+        Globals* globals = (Globals*)closure;
+        deleteCurGame( globals );
+        updateScreen( globals, false );
+    }
+}
+
 static void
 onDeviceButton( void* closure, const char* button )
 {
     Globals* globals = (Globals*)closure;
     XP_LOGFF( "(button=%s)", button );
     if ( 0 == strcmp(button, BUTTON_GAME_NEW) ) {
-        loadAndDraw( globals, NULL, NULL, true );
+        callNewGame("Configure your new game", globals);
     } else if ( 0 == strcmp(button, BUTTON_GAME_OPEN) ) {
         const char* msg = "Choose game to open";
         call_pickGame( msg, onGameChosen, globals);
@@ -409,6 +459,11 @@ onDeviceButton( void* closure, const char* button )
         call_get_string( "Rename your game", globals->gs.gameName,
                          onGameRanamed, globals );
     } else if ( 0 == strcmp(button, BUTTON_GAME_DELETE) ) {
+        char msg[256];
+        snprintf( msg, sizeof(msg), "Are you sure you want to delete the game \"%s\"?"
+                  "\nThis action cannot be undone.",
+                  globals->gs.gameName );
+        call_confirm( globals, msg, onDeleteConfirmed, globals );
     }
 }
 
@@ -492,16 +547,6 @@ startGame( Globals* globals, const char* name )
     LOG_RETURN_VOID();
 }
 
-static void
-cleanupGame( Globals* globals )
-{
-    if ( !!globals->gs.util ) {
-        game_dispose( &globals->gs.game, NULL );
-        wasm_util_destroy( globals->gs.util );
-        XP_MEMSET( &globals->gs, 0, sizeof(globals->gs) );
-    }
-}
-
 typedef struct _AskReplaceState {
     Globals* globals;
     NetLaunchInfo invite;
@@ -588,7 +633,7 @@ loadSavedGame( Globals* globals, const char* key )
     XWStreamCtxt* stream = mem_stream_make_raw( MPPARM(globals->mpool)
                                                 globals->vtMgr );
     char buf[32];
-    formatGameKey( buf, sizeof(buf), key );
+    formatGameKeyStr( buf, sizeof(buf), key );
     dutil_loadStream( globals->dutil, NULL, buf, NULL, stream );
     if ( 0 < stream_getSize( stream ) ) {
         XP_ASSERT( !globals->gs.util );
@@ -653,12 +698,12 @@ nameGame( Globals* globals )
 
 static void
 loadAndDraw( Globals* globals, const NetLaunchInfo* invite,
-             const char* key, bool forceNew )
+             const char* key, NewGameParams* params )
 {
     cleanupGame( globals );
 
     bool haveGame;
-    if ( forceNew ) {
+    if ( !!params ) {
         haveGame = false;
     } else {
         /* First, load any saved game. We need it e.g. to confirm that an incoming
@@ -672,24 +717,25 @@ loadAndDraw( Globals* globals, const NetLaunchInfo* invite,
     }
 
     if ( !haveGame ) {
-        bool p0robot = false;
+        globals->gs.gi.serverRole = !!params && !params->isRobotNotRemote
-        bool p1robot = true;
+            ? SERVER_ISSERVER : SERVER_STANDALONE;
-        globals->gs.gi.serverRole = SERVER_STANDALONE;
+
         globals->gs.gi.phoniesAction = PHONIES_WARN;
-        globals->gs.gi.hintsNotAllowed = false;
+        globals->gs.gi.hintsNotAllowed = !!params && params->hintsNotAllowed || false;
         globals->gs.gi.gameID = 0;
         globals->gs.gi.nPlayers = 2;
         globals->gs.gi.boardSize = 15;
-        globals->gs.gi.players[0].name = copyString( globals->mpool, "Player 1" );
+        globals->gs.gi.players[0].name = copyString( globals->mpool, "Player 1" ); /* FIXME */
         globals->gs.gi.players[0].isLocal = XP_TRUE;
-        globals->gs.gi.players[0].robotIQ = p0robot ? 99 : 0;
+        globals->gs.gi.players[0].robotIQ = 0;
 
         globals->gs.gi.players[1].name = copyString( globals->mpool, "Player 2" );
-        globals->gs.gi.players[1].isLocal = XP_TRUE;
+        globals->gs.gi.players[1].isLocal = !!params ? params->isRobotNotRemote : true;
-        globals->gs.gi.players[1].robotIQ = p1robot ? 99 : 0;
+        XP_LOGFF( "set isLocal[1]: %d", globals->gs.gi.players[1].isLocal );
+        globals->gs.gi.players[1].robotIQ = 99; /* doesn't matter if remote */
 
         globals->gs.util = wasm_util_make( MPPARM(globals->mpool) &globals->gs.gi,
-                                        globals->dutil, globals );
+                                           globals->dutil, globals );
 
         XP_LOGFF( "calling game_makeNewGame()" );
         game_makeNewGame( MPPARM(globals->mpool) NULL,
@@ -1001,8 +1047,10 @@ static void
 updateScreen( Globals* globals, bool doSave )
 {
     SDL_RenderClear( globals->renderer );
-    board_draw( globals->gs.game.board, NULL );
+    if ( !!globals->gs.game.board ) {
-    wasm_draw_render( globals->draw, globals->renderer );
+        board_draw( globals->gs.game.board, NULL );
+        wasm_draw_render( globals->draw, globals->renderer );
+    }
     SDL_RenderPresent( globals->renderer );
 
     updateGameButtons( globals );
@@ -1014,14 +1062,14 @@ updateScreen( Globals* globals, bool doSave )
         game_saveToStream( &globals->gs.game, NULL, &globals->gs.gi,
                            stream, ++globals->gs.saveToken );
 
-        char gidBuf[16];
-        formatGameID( gidBuf, sizeof(gidBuf), globals->gs.gi.gameID );
         char buf[32];
-        formatGameKey( buf, sizeof(buf), gidBuf );
+        formatGameKeyInt( buf, sizeof(buf), globals->gs.gi.gameID );
         dutil_storeStream( globals->dutil, NULL, buf, stream );
         stream_destroy( stream, NULL );
         game_saveSucceeded( &globals->gs.game, NULL, globals->gs.saveToken );
 
+        char gidBuf[16];
+        formatGameID( gidBuf, sizeof(gidBuf), globals->gs.gi.gameID );
         set_stored_value( KEY_LAST, gidBuf );
         XP_LOGFF( "saved KEY_LAST: %s", gidBuf );
     }
@@ -1135,7 +1183,7 @@ initNoReturn( int argc, const char** argv )
 
     const char* lastKey = get_stored_value( KEY_LAST );
     XP_LOGFF( "loaded KEY_LAST: %s", lastKey );
-    loadAndDraw( globals, nlip, lastKey, false );
+    loadAndDraw( globals, nlip, lastKey, NULL );
     if ( !!lastKey ) {
         free( (void*)lastKey );
     }
@@ -1177,6 +1225,17 @@ onDlgButton( AlertProc proc, void* closure, const char* button )
     }
 }
 
+void
+onNewGame( void* closure, bool opponentIsRobot )
+{
+    Globals* globals = (Globals*)closure;
+    XP_LOGFF( "isRobot: %d", opponentIsRobot );
+
+    NewGameParams ngp = {0};
+    ngp.isRobotNotRemote = opponentIsRobot;
+    loadAndDraw( globals, NULL, NULL, &ngp );
+}
+
 int
 main( int argc, const char** argv )
 {

xwords4/wasm/wasmasm.c

@@ -38,3 +38,8 @@ EM_JS(void, set_stored_value, (const char* key, const char* val), {
         var jsVal = UTF8ToString(val);
         var jsString = localStorage.setItem(jsKey, jsVal);
     });
+
+EM_JS(void, remove_stored_value, (const char* key), {
+        var jsKey = UTF8ToString(key);
+        var jsString = localStorage.removeItem(jsKey);
+    });

xwords4/wasm/wasmasm.h

@@ -22,5 +22,6 @@
 
 const char* get_stored_value( const char* key );
 void set_stored_value(const char* key, const char* val);
+void remove_stored_value(const char* key);
 
 #endif

xwords4/wasm/xwutils.js

@@ -200,8 +200,48 @@ function nbGetString(msg, dflt, proc, closure) {
 	dlg.appendChild( newButtonDiv( buttons, butProc ) );
 }
 
+function newRadio(txt, id, proc) {
+	let span = document.createElement('span');
+	let radio = document.createElement('input');
+	radio.type = 'radio';
+	radio.id = id;
+	radio.name = id;
+	radio.onclick = proc;
+
+	let label = document.createElement('label')
+	label.htmlFor = id;
+	var description = document.createTextNode(txt);
+	label.appendChild(description);
+
+	span.appendChild(label);
+	span.appendChild(radio);
+
+	return span;
+}
+
+function nbGetNewGame(closure, msg) {
+	let dlg = newDlgWMsg('Is your opponent a robot or someone you will invite?');
+
+	let radioDiv = document.createElement('div');
+	dlg.appendChild( radioDiv );
+	var robotSet = [null];
+	radioDiv.appendChild(newRadio('Robot', 'newgame', function() {robotSet[0] = true;}));
+	radioDiv.appendChild(newRadio('Remote player', 'newgame', function() {robotSet[0] = false;}));
+
+	butProc = function(str) {
+		if ( str === 'OK' && null !== robotSet[0]) {
+			types = ['number', 'boolean'];
+			params = [closure, robotSet[0]];
+			Module.ccall('onNewGame', null, types, params);
+		}
+		dlg.parentNode.removeChild(dlg);
+	}
+
+	dlg.appendChild( newButtonDiv( ['Cancel', 'OK'], butProc ) );
+}
+
 for ( let one of ['paho-mqtt.js'] ) {
 	let script = document.createElement('script');
-	script.src = one
+	script.src = one;
 	document.body.appendChild(script);
 }