Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-29 10:26:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

snapshot

Browse source 
Staring to hack stuff: I need an alert mechanism already to confirm a
move.
This commit is contained in:
Eric House 2021-02-02 12:04:31 -08:00
parent 0b34018d98
commit de98a70b9f
7 changed files with 247 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/wasm/Makefile
View file

@ -21,7 +21,7 @@ DEFINES += -DKEY_SUPPORT
DEFINES += -DSTREAM_VERS_HASHSTREAM
DEFINES += -DXWFEATURE_KNOWNPLAYERS
DEFINES += -DXWFEATURE_DICTSANITY
DEFINES += -DPOINTER_SUPPORT
all: main.html

82
xwords4/wasm/main.c
View file

@ -14,6 +14,7 @@
#include "game.h"
#include "mempool.h"
#include "main.h"
#include "wasmdraw.h"
#include "wasmutil.h"
#include "wasmdutil.h"
@ -25,25 +26,12 @@
#define WASM_BOARD_LEFT 0
#define WASM_HOR_SCORE_TOP 0
#define WINDOW_WIDTH 400
#define WINDOW_HEIGHT 600
#define BDWIDTH 330
#define BDHEIGHT 330
typedef struct _Globals {
SDL_Window* window;
SDL_Renderer* renderer;
XWGame game;
CurGameInfo gi;
VTableMgr* vtMgr;
XW_DUtilCtxt* dutil;
XW_UtilCtxt* util;
DrawCtx* draw;
DictionaryCtxt* dict;
TransportProcs procs;
CommonPrefs cp;
MemPoolCtx* mpool;
} Globals;
static void
initGlobals( Globals* globals )
{
@ -61,10 +49,12 @@ initGlobals( Globals* globals )
globals->mpool = mpool_make( "wasm" );
globals->vtMgr = make_vtablemgr( globals->mpool );
globals->dutil = wasm_dutil_make( globals->mpool, globals->vtMgr, globals );
globals->util = wasm_util_make( globals->mpool, &globals->gi, globals->dutil );
globals->util = wasm_util_make( globals->mpool, &globals->gi,
globals->dutil, globals );
globals->dict = wasm_load_dict( globals->mpool );
globals->draw = wasm_draw_make( MPPARM(globals->mpool) globals->renderer );
globals->draw = wasm_draw_make( MPPARM(globals->mpool)
WINDOW_WIDTH, WINDOW_HEIGHT );
}
static void
@ -92,15 +82,60 @@ makeAndDraw( Globals* globals )
board_draw( globals->game.board, NULL );
}
static void
checkForEvent( Globals* globals )
{
XP_Bool handled;
XP_Bool draw = XP_FALSE;
SDL_Event event;
if ( SDL_PollEvent(&event) ) {
switch ( event.type ) {
case SDL_MOUSEBUTTONDOWN:
draw = event.button.button == SDL_BUTTON_LEFT
&& board_handlePenDown( globals->game.board, NULL,
event.button.x, event.button.y,
&handled );
break;
case SDL_MOUSEBUTTONUP:
draw = event.button.button == SDL_BUTTON_LEFT
&& board_handlePenUp( globals->game.board, NULL,
event.button.x, event.button.y );
break;
// SDL_MouseButtonEvent
default:
break;
}
}
// XP_LOGFF( "draw: %d", draw );
if ( draw ) {
SDL_RenderClear( globals->renderer );
board_draw( globals->game.board, NULL );
wasm_draw_render( globals->draw, globals->renderer );
SDL_RenderPresent( globals->renderer );
}
}
static void
looper( void* closure )
{
Globals* globals = (Globals*)closure;
checkForEvent( globals );
}
int main( int argc, char** argv )
{
LOG_FUNC();
Globals globals = {0};
SDL_Init(SDL_INIT_VIDEO);
SDL_Init( SDL_INIT_EVENTS );
TTF_Init();
int foo = SDL_SWSURFACE;
SDL_CreateWindowAndRenderer(600, 400, 0,
&globals.window, &globals.renderer);
// Do I want SDL_CreateWindow() plus something else?
SDL_CreateWindowAndRenderer( WINDOW_WIDTH, WINDOW_HEIGHT, 0,
&globals.window, &globals.renderer );
/**
* Set up a white background
@ -114,9 +149,10 @@ int main( int argc, char** argv )
/**
* Show what is in the renderer
*/
SDL_RenderPresent(globals.renderer);
wasm_draw_render( globals.draw, globals.renderer );
SDL_RenderPresent( globals.renderer );
printf("you should see an image.\n");
emscripten_set_main_loop_arg( looper, &globals, -1, 1 );
return 0;
}

26
xwords4/wasm/main.h Normal file
View file

@ -0,0 +1,26 @@
#ifndef _MAIN_H_
#define _MAIN_H_
#include <SDL2/SDL.h>
#include <SDL2/SDL_ttf.h>
#include "game.h"
typedef struct _Globals {
SDL_Window* window;
SDL_Renderer* renderer;
XWGame game;
CurGameInfo gi;
VTableMgr* vtMgr;
XW_DUtilCtxt* dutil;
XW_UtilCtxt* util;
DrawCtx* draw;
DictionaryCtxt* dict;
TransportProcs procs;
CommonPrefs cp;
MemPoolCtx* mpool;
} Globals;
#endif

201
xwords4/wasm/wasmdraw.c
View file

@ -10,8 +10,12 @@
typedef struct _WasmDrawCtx {
DrawCtxVTable* vtable;
SDL_Renderer* renderer;
SDL_Surface* surface;
SDL_Texture* texture;
TTF_Font* font12;
TTF_Font* font20;
TTF_Font* font36;
TTF_Font* font48;
} WasmDrawCtx;
static int sBonusColors[4][3] = {
@ -58,22 +62,39 @@ frameRect( WasmDrawCtx* wdctx, const XP_Rect* rect )
SDL_RenderDrawRect( wdctx->renderer, &sdlr );
}
static void
textInRect( WasmDrawCtx* wdctx, const XP_UCHAR* text, const XP_Rect* rect )
{
TTF_Font* font;
if ( rect->height <= 12 ) {
font = wdctx->font12;
} else if ( rect->height <= 20 ) {
font = wdctx->font20;
} else if ( rect->height <= 36 ) {
font = wdctx->font36;
} else {
XP_LOGFF( "unexpected height: %d", rect->height );
font = wdctx->font48;
}
SDL_Color color = { 0, 0, 0, 255 };
SDL_Surface* surface = TTF_RenderText_Blended( font, text, color );
SDL_Texture* texture = SDL_CreateTextureFromSurface( wdctx->renderer, surface );
SDL_FreeSurface( surface );
SDL_Rect sdlr;
rectXPToSDL( &sdlr, rect );
// SDL_QueryTexture( texture, NULL, NULL, &sdlr.w, &sdlr.h );
SDL_RenderCopy( wdctx->renderer, texture, NULL, &sdlr );
SDL_DestroyTexture( texture );
}
static void
drawTile( WasmDrawCtx* wdctx, const XP_UCHAR* face, XP_U16 val, const XP_Rect* rect )
{
clearRect( wdctx, rect );
frameRect( wdctx, rect );
SDL_Color color = {0,0,0,255};
SDL_Surface* text_surface = TTF_RenderText_Blended( wdctx->font12, face, color );
SDL_Texture* text_tex = SDL_CreateTextureFromSurface( wdctx->renderer, text_surface );
SDL_FreeSurface( text_surface );
SDL_Rect sdlr;
rectXPToSDL( &sdlr, rect );
SDL_QueryTexture( text_tex, NULL, NULL, &sdlr.w, &sdlr.h);
SDL_RenderCopy( wdctx->renderer, text_tex, NULL, &sdlr );
SDL_DestroyTexture( text_tex );
textInRect( wdctx, face, rect );
}
static void
@ -87,6 +108,8 @@ static XP_Bool
wasm_draw_beginDraw( DrawCtx* dctx, XWEnv xwe )
{
LOG_FUNC();
WasmDrawCtx* wdctx = (WasmDrawCtx*)dctx;
SDL_RenderPresent( wdctx->renderer );
return XP_TRUE;
}
@ -174,13 +197,28 @@ wasm_draw_score_drawPlayer( DrawCtx* dctx, XWEnv xwe,
const XP_Rect* rOuter,
XP_U16 gotPct,
const DrawScoreInfo* dsi ){ LOG_FUNC(); }
static void
wasm_draw_score_pendingScore( DrawCtx* dctx, XWEnv xwe,
const XP_Rect* rect,
XP_S16 score,
XP_U16 playerNum,
XP_Bool curTurn,
CellFlags flags ){ LOG_FUNC(); }
XP_S16 score, XP_U16 playerNum,
XP_Bool curTurn, CellFlags flags )
{
WasmDrawCtx* wdctx = (WasmDrawCtx*)dctx;
clearRect( wdctx, rect );
XP_Rect tmp = *rect;
tmp.height /= 2;
textInRect( wdctx, "Pts:", &tmp );
tmp.top += tmp.height;
XP_UCHAR buf[16];
if ( score >= 0 ) {
XP_SNPRINTF( buf, VSIZE(buf), "%.3d", score );
} else {
XP_STRNCPY( buf, "???", VSIZE(buf) );
}
textInRect( wdctx, buf, &tmp );
}
static void
wasm_draw_drawTimer( DrawCtx* dctx, XWEnv xwe, const XP_Rect* rect,
@ -199,11 +237,18 @@ wasm_draw_drawCell( DrawCtx* dctx, XWEnv xwe, const XP_Rect* rect,
CellFlags flags )
{
WasmDrawCtx* wdctx = (WasmDrawCtx*)dctx;
if ( BONUS_NONE == bonus ) {
clearRect( wdctx, rect );
} else {
fillRect( wdctx, rect, sBonusColors[bonus-1] );
clearRect( wdctx, rect );
if ( (flags & (CELL_DRAGSRC|CELL_ISEMPTY)) != 0 ) {
if ( BONUS_NONE == bonus ) {
clearRect( wdctx, rect );
} else {
fillRect( wdctx, rect, sBonusColors[bonus-1] );
}
} else if ( !!text ) {
textInRect( wdctx, text, rect );
}
frameRect( wdctx, rect );
return XP_TRUE;
@ -225,8 +270,7 @@ wasm_draw_drawTile( DrawCtx* dctx, XWEnv xwe, const XP_Rect* rect,
{
XP_LOGFF( "(text=%s)", text );
WasmDrawCtx* wdctx = (WasmDrawCtx*)dctx;
clearRect( wdctx, rect );
frameRect( wdctx, rect );
drawTile( wdctx, text, val, rect );
return XP_TRUE;
}
@ -242,6 +286,8 @@ wasm_draw_drawTileMidDrag( DrawCtx* dctx, XWEnv xwe,
CellFlags flags )
{
LOG_FUNC();
WasmDrawCtx* wdctx = (WasmDrawCtx*)dctx;
drawTile( wdctx, text, val, rect );
return XP_TRUE;
}
#endif
@ -274,53 +320,94 @@ static void
wasm_draw_drawBoardArrow ( DrawCtx* dctx, XWEnv xwe,
const XP_Rect* rect,
XWBonusType bonus, XP_Bool vert,
HintAtts hintAtts, CellFlags flags)
HintAtts hintAtts, CellFlags flags )
{
LOG_FUNC();
WasmDrawCtx* wdctx = (WasmDrawCtx*)dctx;
const XP_UCHAR* str = vert ? "|" : "-";
textInRect( wdctx, str, rect );
}
static void
createSurface( WasmDrawCtx* wdctx, int width, int height )
{
#if SDL_BYTEORDER == SDL_BIG_ENDIAN
uint32_t rmask = 0xff000000;
uint32_t gmask = 0x00ff0000;
uint32_t bmask = 0x0000ff00;
uint32_t amask = 0x000000ff;
#else
uint32_t rmask = 0x000000ff;
uint32_t gmask = 0x0000ff00;
uint32_t bmask = 0x00ff0000;
uint32_t amask = 0xff000000;
#endif
wdctx->surface = SDL_CreateRGBSurface( 0, width, height, 32,
rmask, gmask, bmask, amask );
wdctx->renderer = SDL_CreateSoftwareRenderer( wdctx->surface );
// wdctx->texture = SDL_CreateTextureFromSurface( wdctx->renderer, wdctx->surface );
}
void
wasm_draw_render( DrawCtx* dctx, SDL_Renderer* dest )
{
LOG_FUNC();
WasmDrawCtx* wdctx = (WasmDrawCtx*)dctx;
// SDL_RenderPresent( wdctx->renderer );
SDL_Texture* texture =
SDL_CreateTextureFromSurface( dest, wdctx->surface );
SDL_RenderCopyEx( dest, texture, NULL, NULL, 0,
NULL, SDL_FLIP_NONE );
SDL_DestroyTexture( texture );
}
DrawCtx*
wasm_draw_make( MPFORMAL SDL_Renderer* renderer )
wasm_draw_make( MPFORMAL int width, int height )
{
LOG_FUNC();
WasmDrawCtx* dctx = XP_MALLOC( mpool, sizeof(*dctx) );
dctx->renderer = renderer;
WasmDrawCtx* wdctx = XP_MALLOC( mpool, sizeof(*wdctx) );
dctx->font12 = TTF_OpenFont( "assets_dir/FreeSans.ttf", 30 );
XP_LOGFF( "got font: %p", dctx->font12 );
XP_ASSERT( !!dctx->font12 );
wdctx->font12 = TTF_OpenFont( "assets_dir/FreeSans.ttf", 12 );
XP_ASSERT( !!wdctx->font12 );
wdctx->font20 = TTF_OpenFont( "assets_dir/FreeSans.ttf", 20 );
wdctx->font36 = TTF_OpenFont( "assets_dir/FreeSans.ttf", 36 );
wdctx->font48 = TTF_OpenFont( "assets_dir/FreeSans.ttf", 48 );
dctx->vtable = XP_MALLOC( mpool, sizeof(*dctx->vtable) );
wdctx->vtable = XP_MALLOC( mpool, sizeof(*wdctx->vtable) );
SET_VTABLE_ENTRY( dctx->vtable, draw_clearRect, wasm );
SET_VTABLE_ENTRY( dctx->vtable, draw_dictChanged, wasm );
SET_VTABLE_ENTRY( dctx->vtable, draw_beginDraw, wasm );
SET_VTABLE_ENTRY( wdctx->vtable, draw_clearRect, wasm );
SET_VTABLE_ENTRY( wdctx->vtable, draw_dictChanged, wasm );
SET_VTABLE_ENTRY( wdctx->vtable, draw_beginDraw, wasm );
SET_VTABLE_ENTRY( dctx->vtable, draw_clearRect, wasm );
SET_VTABLE_ENTRY( dctx->vtable, draw_dictChanged, wasm );
SET_VTABLE_ENTRY( dctx->vtable, draw_beginDraw, wasm );
SET_VTABLE_ENTRY( dctx->vtable, draw_destroyCtxt, wasm );
SET_VTABLE_ENTRY( dctx->vtable, draw_endDraw, wasm );
SET_VTABLE_ENTRY( dctx->vtable, draw_boardBegin, wasm );
SET_VTABLE_ENTRY( dctx->vtable, draw_objFinished, wasm );
SET_VTABLE_ENTRY( dctx->vtable, draw_vertScrollBoard, wasm );
SET_VTABLE_ENTRY( dctx->vtable, draw_trayBegin, wasm );
SET_VTABLE_ENTRY( dctx->vtable, draw_scoreBegin, wasm );
SET_VTABLE_ENTRY( dctx->vtable, draw_measureRemText, wasm );
SET_VTABLE_ENTRY( dctx->vtable, draw_drawRemText, wasm );
SET_VTABLE_ENTRY( dctx->vtable, draw_measureScoreText, wasm );
SET_VTABLE_ENTRY( dctx->vtable, draw_score_drawPlayer, wasm );
SET_VTABLE_ENTRY( dctx->vtable, draw_score_pendingScore, wasm );
SET_VTABLE_ENTRY( dctx->vtable, draw_drawTimer, wasm );
SET_VTABLE_ENTRY( dctx->vtable, draw_drawCell, wasm );
SET_VTABLE_ENTRY( dctx->vtable, draw_invertCell, wasm );
SET_VTABLE_ENTRY( dctx->vtable, draw_drawTile, wasm );
SET_VTABLE_ENTRY( wdctx->vtable, draw_clearRect, wasm );
SET_VTABLE_ENTRY( wdctx->vtable, draw_dictChanged, wasm );
SET_VTABLE_ENTRY( wdctx->vtable, draw_beginDraw, wasm );
SET_VTABLE_ENTRY( wdctx->vtable, draw_destroyCtxt, wasm );
SET_VTABLE_ENTRY( wdctx->vtable, draw_endDraw, wasm );
SET_VTABLE_ENTRY( wdctx->vtable, draw_boardBegin, wasm );
SET_VTABLE_ENTRY( wdctx->vtable, draw_objFinished, wasm );
SET_VTABLE_ENTRY( wdctx->vtable, draw_vertScrollBoard, wasm );
SET_VTABLE_ENTRY( wdctx->vtable, draw_trayBegin, wasm );
SET_VTABLE_ENTRY( wdctx->vtable, draw_scoreBegin, wasm );
SET_VTABLE_ENTRY( wdctx->vtable, draw_measureRemText, wasm );
SET_VTABLE_ENTRY( wdctx->vtable, draw_drawRemText, wasm );
SET_VTABLE_ENTRY( wdctx->vtable, draw_measureScoreText, wasm );
SET_VTABLE_ENTRY( wdctx->vtable, draw_score_drawPlayer, wasm );
SET_VTABLE_ENTRY( wdctx->vtable, draw_score_pendingScore, wasm );
SET_VTABLE_ENTRY( wdctx->vtable, draw_drawTimer, wasm );
SET_VTABLE_ENTRY( wdctx->vtable, draw_drawCell, wasm );
SET_VTABLE_ENTRY( wdctx->vtable, draw_invertCell, wasm );
SET_VTABLE_ENTRY( wdctx->vtable, draw_drawTile, wasm );
#ifdef POINTER_SUPPORT
SET_VTABLE_ENTRY( dctx->vtable, draw_drawTileMidDrag, wasm );
SET_VTABLE_ENTRY( wdctx->vtable, draw_drawTileMidDrag, wasm );
#endif
SET_VTABLE_ENTRY( dctx->vtable, draw_drawTileBack, wasm );
SET_VTABLE_ENTRY( dctx->vtable, draw_drawTrayDivider, wasm );
SET_VTABLE_ENTRY( dctx->vtable, draw_drawBoardArrow, wasm );
SET_VTABLE_ENTRY( wdctx->vtable, draw_drawTileBack, wasm );
SET_VTABLE_ENTRY( wdctx->vtable, draw_drawTrayDivider, wasm );
SET_VTABLE_ENTRY( wdctx->vtable, draw_drawBoardArrow, wasm );
return (DrawCtx*)dctx;
createSurface( wdctx, width, height );
return (DrawCtx*)wdctx;
}

7
xwords4/wasm/wasmdraw.h
View file

@ -1,5 +1,10 @@
#ifndef _WASMDRAW_H_
#define _WASMDRAW_H_
#include "draw.h"
DrawCtx* wasm_draw_make();
DrawCtx* wasm_draw_make( MPFORMAL int width, int height );
void wasm_draw_render( DrawCtx* dctx, SDL_Renderer* dest );
#endif

11
xwords4/wasm/wasmutil.c
View file

@ -1,11 +1,13 @@
#include "util.h"
#include "comtypes.h"
#include "main.h"
typedef struct _WasmUtilCtx {
XW_UtilCtxt super;
XW_DUtilCtxt* dctxt;
void* closure;
} WasmUtilCtx;
static XWStreamCtxt*
@ -51,7 +53,11 @@ wasm_util_userError( XW_UtilCtxt* uc, XWEnv xwe, UtilErrID id )
static void
wasm_util_notifyMove( XW_UtilCtxt* uc, XWEnv xwe, XWStreamCtxt* stream )
{
LOG_FUNC();
WasmUtilCtx* wuctxt = (WasmUtilCtx*)uc;
Globals* globals = (Globals*)wuctxt->closure;
if ( board_commitTurn( globals->game.board, NULL, XP_TRUE, XP_TRUE, NULL ) ) {
board_draw( globals->game.board, NULL );
}
}
static void
@ -266,7 +272,7 @@ wasm_util_getDevUtilCtxt( XW_UtilCtxt* uc, XWEnv xwe )
}
XW_UtilCtxt*
wasm_util_make( MPFORMAL CurGameInfo* gi, XW_DUtilCtxt* dctxt )
wasm_util_make( MPFORMAL CurGameInfo* gi, XW_DUtilCtxt* dctxt, void* closure )
{
LOG_FUNC();
WasmUtilCtx* wuctxt = XP_MALLOC( mpool, sizeof(*wuctxt) );
@ -275,6 +281,7 @@ wasm_util_make( MPFORMAL CurGameInfo* gi, XW_DUtilCtxt* dctxt )
wuctxt->super.gameInfo = gi;
wuctxt->dctxt = dctxt;
wuctxt->closure = closure;
SET_VTABLE_ENTRY( wuctxt->super.vtable, util_userError, wasm );
SET_VTABLE_ENTRY( wuctxt->super.vtable, util_makeStreamFromAddr, wasm );

3
xwords4/wasm/wasmutil.h
View file

@ -4,7 +4,8 @@
#include "dutil.h"
XW_UtilCtxt* wasm_util_make( MPFORMAL CurGameInfo* gi, XW_DUtilCtxt* dutil );
XW_UtilCtxt* wasm_util_make( MPFORMAL CurGameInfo* gi, XW_DUtilCtxt* dutil,
void* closure );
void wasm_util_destroy( XW_UtilCtxt* util );
#endif