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

fix to compile on raspberry pi (64-bit ARM)

Browse source
This commit is contained in:
Eric House 2020-12-15 10:02:51 -08:00
parent c2c4a0b60a
commit 7fd82b4831
5 changed files with 33 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/linux/cursesboard.c
View file

@ -1239,7 +1239,7 @@ inviteList( CommonGlobals* cGlobals, CommsAddrRec* addr, GSList* invitees,
nli_init( &nli, cGlobals->gi, addr, nPlayersH, forceChannel ); nli_init( &nli, cGlobals->gi, addr, nPlayersH, forceChannel );
switch ( typ ) { switch ( typ ) {
case COMMS_CONN_RELAY: { case COMMS_CONN_RELAY: {
uint64_t inviteeRelayID = (uint64_t)g_slist_nth_data( invitees, ii ); uint64_t inviteeRelayID = *(uint64_t*)g_slist_nth_data( invitees, ii );
relaycon_invite( params, (XP_U32)inviteeRelayID, NULL, &nli ); relaycon_invite( params, (XP_U32)inviteeRelayID, NULL, &nli );
} }
break; break;

2
xwords4/linux/gamesdb.c
View file

@ -294,7 +294,7 @@ addSnapshot( CommonGlobals* cGlobals )
LOG_FUNC(); LOG_FUNC();
BoardCtxt* board = cGlobals->game.board; BoardCtxt* board = cGlobals->game.board;
GtkDrawCtx* dctx = (GtkDrawCtx*)board_getDraw( board ); GtkDrawCtx* dctx = (GtkDrawCtx*)(void*)board_getDraw( board );
if ( !!dctx ) { if ( !!dctx ) {
addSurface( dctx, SNAP_WIDTH, SNAP_HEIGHT ); addSurface( dctx, SNAP_WIDTH, SNAP_HEIGHT );
board_drawSnapshot( board, NULL_XWE, (DrawCtx*)dctx, SNAP_WIDTH, SNAP_HEIGHT ); board_drawSnapshot( board, NULL_XWE, (DrawCtx*)dctx, SNAP_WIDTH, SNAP_HEIGHT );

4
xwords4/linux/gtkboard.c
View file

@ -326,7 +326,7 @@ relay_status_gtk( XWEnv XP_UNUSED(xwe), void* closure, CommsRelayState state )
if ( !!cGlobals->draw ) { if ( !!cGlobals->draw ) {
cGlobals->state = state; cGlobals->state = state;
globals->stateChar = 'A' + COMMS_RELAYSTATE_ALLCONNECTED - state; globals->stateChar = 'A' + COMMS_RELAYSTATE_ALLCONNECTED - state;
draw_gtk_status( (GtkDrawCtx*)cGlobals->draw, globals->stateChar ); draw_gtk_status( (GtkDrawCtx*)(void*)cGlobals->draw, globals->stateChar );
} }
} }
@ -2492,7 +2492,7 @@ on_draw_event( GtkWidget* widget, cairo_t* cr, gpointer user_data )
CommonGlobals* cGlobals = &globals->cGlobals; CommonGlobals* cGlobals = &globals->cGlobals;
board_invalAll( cGlobals->game.board ); board_invalAll( cGlobals->game.board );
board_draw( cGlobals->game.board, NULL_XWE ); board_draw( cGlobals->game.board, NULL_XWE );
draw_gtk_status( (GtkDrawCtx*)cGlobals->draw, globals->stateChar ); draw_gtk_status( (GtkDrawCtx*)(void*)cGlobals->draw, globals->stateChar );
XP_USE(widget); XP_USE(widget);
XP_USE(cr); XP_USE(cr);

52
xwords4/linux/gtkdraw.c
View file

@ -442,7 +442,7 @@ freer( gpointer data, gpointer XP_UNUSED(user_data) )
static void static void
gtk_draw_destroyCtxt( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe) ) gtk_draw_destroyCtxt( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe) )
{ {
GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)(void*)p_dctx;
GtkAllocation alloc; GtkAllocation alloc;
gtk_widget_get_allocation( dctx->drawing_area, &alloc ); gtk_widget_get_allocation( dctx->drawing_area, &alloc );
@ -471,7 +471,7 @@ static XP_Bool
gtk_draw_beginDraw( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe) ) gtk_draw_beginDraw( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe) )
{ {
#ifdef USE_CAIRO #ifdef USE_CAIRO
GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)(void*)p_dctx;
return initCairo( dctx ); return initCairo( dctx );
#else #else
fix this fix this
@ -482,7 +482,7 @@ static void
gtk_draw_endDraw( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe) ) gtk_draw_endDraw( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe) )
{ {
#ifdef USE_CAIRO #ifdef USE_CAIRO
GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)(void*)p_dctx;
destroyCairo( dctx ); destroyCairo( dctx );
#endif #endif
} }
@ -493,13 +493,13 @@ gtk_draw_boardBegin( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* rect,
DrawFocusState XP_UNUSED(dfs) ) DrawFocusState XP_UNUSED(dfs) )
{ {
GdkRectangle gdkrect; GdkRectangle gdkrect;
GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)(void*)p_dctx;
dctx->cellWidth = width; dctx->cellWidth = width;
dctx->cellHeight = height; dctx->cellHeight = height;
gtkSetForeground( dctx, &dctx->black ); gtkSetForeground( dctx, &dctx->black );
gdkrect = *(GdkRectangle*)rect; gdkrect = *(GdkRectangle*)(void*)rect;
++gdkrect.width; ++gdkrect.width;
++gdkrect.height; ++gdkrect.height;
@ -518,7 +518,7 @@ static XP_Bool
gtk_draw_vertScrollBoard( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), XP_Rect* rect, gtk_draw_vertScrollBoard( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), XP_Rect* rect,
XP_S16 dist, DrawFocusState XP_UNUSED(dfs) ) XP_S16 dist, DrawFocusState XP_UNUSED(dfs) )
{ {
GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)(void*)p_dctx;
XP_Bool down = dist <= 0; XP_Bool down = dist <= 0;
gint ysrc, ydest; gint ysrc, ydest;
@ -612,7 +612,7 @@ gtk_draw_drawCell( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* rect, c
XP_U16 XP_UNUSED(value), XP_S16 owner, XWBonusType bonus, XP_U16 XP_UNUSED(value), XP_S16 owner, XWBonusType bonus,
HintAtts hintAtts, CellFlags flags ) HintAtts hintAtts, CellFlags flags )
{ {
GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)(void*)p_dctx;
XP_Rect rectInset = *rect; XP_Rect rectInset = *rect;
GtkGameGlobals* globals = dctx->globals; GtkGameGlobals* globals = dctx->globals;
XP_Bool showGrid = globals->gridOn; XP_Bool showGrid = globals->gridOn;
@ -741,7 +741,7 @@ gtk_draw_trayBegin( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* XP_UNU
XP_U16 owner, XP_S16 XP_UNUSED(owner), XP_U16 owner, XP_S16 XP_UNUSED(owner),
DrawFocusState XP_UNUSED(dfs) ) DrawFocusState XP_UNUSED(dfs) )
{ {
GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)(void*)p_dctx;
XP_Bool doDraw = !dctx->surface; XP_Bool doDraw = !dctx->surface;
if ( doDraw ) { if ( doDraw ) {
dctx->trayOwner = owner; dctx->trayOwner = owner;
@ -754,7 +754,7 @@ gtkDrawTileImpl( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* rect, con
const XP_Bitmaps* bitmaps, XP_U16 val, CellFlags flags, const XP_Bitmaps* bitmaps, XP_U16 val, CellFlags flags,
XP_Bool clearBack ) XP_Bool clearBack )
{ {
GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)(void*)p_dctx;
XP_UCHAR numbuf[3]; XP_UCHAR numbuf[3];
XP_Rect insetR = *rect; XP_Rect insetR = *rect;
XP_Bool isCursor = (flags & CELL_ISCURSOR) != 0; XP_Bool isCursor = (flags & CELL_ISCURSOR) != 0;
@ -838,7 +838,7 @@ static XP_Bool
gtk_draw_drawTileBack( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* rect, gtk_draw_drawTileBack( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* rect,
CellFlags flags ) CellFlags flags )
{ {
GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)(void*)p_dctx;
XP_Bool hasCursor = (flags & CELL_ISCURSOR) != 0; XP_Bool hasCursor = (flags & CELL_ISCURSOR) != 0;
XP_Rect r = *rect; XP_Rect r = *rect;
@ -859,7 +859,7 @@ static void
gtk_draw_drawTrayDivider( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), gtk_draw_drawTrayDivider( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe),
const XP_Rect* rect, CellFlags flags ) const XP_Rect* rect, CellFlags flags )
{ {
GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)(void*)p_dctx;
XP_Rect r = *rect; XP_Rect r = *rect;
XP_Bool selected = 0 != (flags & (CELL_RECENT|CELL_PENDING)); XP_Bool selected = 0 != (flags & (CELL_RECENT|CELL_PENDING));
XP_Bool isCursor = 0 != (flags & CELL_ISCURSOR); XP_Bool isCursor = 0 != (flags & CELL_ISCURSOR);
@ -882,7 +882,7 @@ gtk_draw_drawTrayDivider( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe),
static void static void
gtk_draw_clearRect( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* rectP ) gtk_draw_clearRect( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* rectP )
{ {
GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)(void*)p_dctx;
XP_Rect rect = *rectP; XP_Rect rect = *rectP;
++rect.width; ++rect.width;
@ -897,7 +897,7 @@ gtk_draw_drawBoardArrow( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* r
XWBonusType XP_UNUSED(cursorBonus), XP_Bool vertical, XWBonusType XP_UNUSED(cursorBonus), XP_Bool vertical,
HintAtts hintAtts, CellFlags XP_UNUSED(flags) ) HintAtts hintAtts, CellFlags XP_UNUSED(flags) )
{ {
GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)(void*)p_dctx;
const XP_UCHAR* curs = vertical? "|":"-"; const XP_UCHAR* curs = vertical? "|":"-";
/* font needs to be small enough that "|" doesn't overwrite cell below */ /* font needs to be small enough that "|" doesn't overwrite cell below */
@ -914,7 +914,7 @@ gtk_draw_scoreBegin( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* rect,
XP_S16 XP_UNUSED(remCount), XP_S16 XP_UNUSED(remCount),
DrawFocusState XP_UNUSED(dfs) ) DrawFocusState XP_UNUSED(dfs) )
{ {
GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)(void*)p_dctx;
XP_Bool doDraw = !dctx->surface; XP_Bool doDraw = !dctx->surface;
if ( doDraw ) { if ( doDraw ) {
gtkEraseRect( dctx, rect ); gtkEraseRect( dctx, rect );
@ -962,7 +962,7 @@ static void
gtkDrawDrawRemText( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* rect, gtkDrawDrawRemText( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* rect,
XP_S16 nTilesLeft, XP_U16* widthP, XP_U16* heightP, XP_Bool focussed ) XP_S16 nTilesLeft, XP_U16* widthP, XP_U16* heightP, XP_Bool focussed )
{ {
GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)(void*)p_dctx;
XP_UCHAR buf[10]; XP_UCHAR buf[10];
XP_SNPRINTF( buf, sizeof(buf), "rem:%d", nTilesLeft ); XP_SNPRINTF( buf, sizeof(buf), "rem:%d", nTilesLeft );
PangoLayout* layout = getLayoutToFitRect( dctx, buf, rect, NULL ); PangoLayout* layout = getLayoutToFitRect( dctx, buf, rect, NULL );
@ -996,7 +996,7 @@ gtk_draw_score_drawPlayer( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect*
const XP_Rect* rOuter, const XP_Rect* rOuter,
XP_U16 XP_UNUSED(gotPct), const DrawScoreInfo* dsi ) XP_U16 XP_UNUSED(gotPct), const DrawScoreInfo* dsi )
{ {
GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)(void*)p_dctx;
XP_Bool hasCursor = (dsi->flags & CELL_ISCURSOR) != 0; XP_Bool hasCursor = (dsi->flags & CELL_ISCURSOR) != 0;
GdkRGBA* cursor = NULL; GdkRGBA* cursor = NULL;
XP_U16 playerNum = dsi->playerNum; XP_U16 playerNum = dsi->playerNum;
@ -1190,7 +1190,7 @@ gtk_draw_measureScoreText( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect*
const DrawScoreInfo* dsi, const DrawScoreInfo* dsi,
XP_U16* widthP, XP_U16* heightP ) XP_U16* widthP, XP_U16* heightP )
{ {
GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)(void*)p_dctx;
XP_UCHAR buf[VSIZE(dctx->scoreCache[0].str)]; XP_UCHAR buf[VSIZE(dctx->scoreCache[0].str)];
PangoLayout* layout; PangoLayout* layout;
int lineHeight = GTK_HOR_SCORE_HEIGHT, nLines; int lineHeight = GTK_HOR_SCORE_HEIGHT, nLines;
@ -1212,7 +1212,7 @@ gtk_draw_score_pendingScore( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rec
XP_S16 score, XP_U16 XP_UNUSED(playerNum), XP_S16 score, XP_U16 XP_UNUSED(playerNum),
XP_Bool curTurn, CellFlags flags ) XP_Bool curTurn, CellFlags flags )
{ {
GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)(void*)p_dctx;
XP_UCHAR buf[5]; XP_UCHAR buf[5];
XP_U16 ht; XP_U16 ht;
XP_Rect localR; XP_Rect localR;
@ -1251,7 +1251,7 @@ gtk_draw_drawTimer( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_Rect* rInner
XP_U16 playerNum, XP_S16 secondsLeft, XP_U16 playerNum, XP_S16 secondsLeft,
XP_Bool localTurnDone ) XP_Bool localTurnDone )
{ {
GtkDrawCtx* dctx = (GtkDrawCtx*)p_dctx; GtkDrawCtx* dctx = (GtkDrawCtx*)(void*)p_dctx;
XP_Bool hadCairo = haveCairo( dctx ); XP_Bool hadCairo = haveCairo( dctx );
if ( hadCairo || initCairo( dctx ) ) { if ( hadCairo || initCairo( dctx ) ) {
gtkEraseRect( dctx, rInner ); gtkEraseRect( dctx, rInner );
@ -1355,10 +1355,6 @@ gtk_draw_drawMiniWindow( DrawCtx* p_dctx, XWEnv XP_UNUSED(xwe), const XP_UCHAR*
c.green = (g); \ c.green = (g); \
c.blue = (b); \ c.blue = (b); \
} }
static void
draw_doNothing( DrawCtx* XP_UNUSED(dctx), ... )
{
} /* draw_doNothing */
static gdouble static gdouble
figureColor( int in ) figureColor( int in )
@ -1404,11 +1400,11 @@ gtkDrawCtxtMake( GtkWidget* drawing_area, GtkGameGlobals* globals )
size_t tableSize = sizeof(*(((GtkDrawCtx*)dctx)->vtable)); size_t tableSize = sizeof(*(((GtkDrawCtx*)dctx)->vtable));
dctx->vtable = g_malloc( tableSize ); dctx->vtable = g_malloc( tableSize );
void** ptr = (void**)dctx->vtable; /* void** ptr = (void**)dctx->vtable; */
void** end = (void**)(((unsigned char*)ptr) + tableSize); /* void** end = (void**)(((unsigned char*)ptr) + tableSize); */
while ( ptr < end ) { /* while ( ptr < end ) { */
*ptr++ = draw_doNothing; /* *ptr++ = draw_doNothing; */
} /* } */
SET_VTABLE_ENTRY( dctx->vtable, draw_clearRect, gtk ); SET_VTABLE_ENTRY( dctx->vtable, draw_clearRect, gtk );

8
xwords4/linux/linuxmain.c
View file

@ -3054,11 +3054,13 @@ main( int argc, char** argv )
case CMD_BONUSFILE: case CMD_BONUSFILE:
mainParams.bonusFile = optarg; mainParams.bonusFile = optarg;
break; break;
case CMD_INVITEE_RELAYID: case CMD_INVITEE_RELAYID: {
uint64_t* ptr = g_malloc( sizeof(*ptr) );
*ptr = (uint64_t)atoi(optarg);
mainParams.connInfo.relay.inviteeRelayIDs = mainParams.connInfo.relay.inviteeRelayIDs =
g_slist_append(mainParams.connInfo.relay.inviteeRelayIDs, g_slist_append(mainParams.connInfo.relay.inviteeRelayIDs, ptr );
(void*)(uint64_t)atoi(optarg));
addr_addType( &mainParams.addr, COMMS_CONN_RELAY ); addr_addType( &mainParams.addr, COMMS_CONN_RELAY );
}
break; break;
#endif #endif
case CMD_CLOSESTDIN: case CMD_CLOSESTDIN: