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

part of previous (merge) commit that got left out -- files not saved.

Browse source
This commit is contained in:
Eric House 2013-05-09 06:33:19 -07:00
parent 7d8cddb31f
commit d74814a806
3 changed files with 43 additions and 144 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xwords4/linux/gtkboard.c
View file

@ -1173,9 +1173,9 @@ disenable_buttons( GtkGameGlobals* globals )
XP_Bool canToggle = board_canTogglePending( globals->cGlobals.game.board ); XP_Bool canToggle = board_canTogglePending( globals->cGlobals.game.board );
gtk_widget_set_sensitive( globals->toggle_undo_button, canToggle ); gtk_widget_set_sensitive( globals->toggle_undo_button, canToggle );
XP_Bool canHing = board_canHint( globals->cGlobals.game.board ); XP_Bool canHint = board_canHint( globals->cGlobals.game.board );
gtk_widget_set_sensitive( globals->prevhint_button, canHing ); gtk_widget_set_sensitive( globals->prevhint_button, canHint );
gtk_widget_set_sensitive( globals->nexthint_button, canHing ); gtk_widget_set_sensitive( globals->nexthint_button, canHint );
#ifdef XWFEATURE_CHAT #ifdef XWFEATURE_CHAT
XP_Bool canChat = !!globals->cGlobals.game.comms XP_Bool canChat = !!globals->cGlobals.game.comms

177
xwords4/linux/linuxmain.c
View file

@ -1765,7 +1765,7 @@ dawg2dict( const LaunchParams* params, GSList* testDicts )
guint count = g_slist_length( testDicts ); guint count = g_slist_length( testDicts );
for ( int ii = 0; ii < count; ++ii ) { for ( int ii = 0; ii < count; ++ii ) {
DictionaryCtxt* dict = DictionaryCtxt* dict =
linux_dictionary_make( MPPARM(params->util->mpool) params, linux_dictionary_make( MPPARM(params->mpool) params,
g_slist_nth_data( testDicts, ii ), g_slist_nth_data( testDicts, ii ),
params->useMmap ); params->useMmap );
if ( NULL != dict ) { if ( NULL != dict ) {
@ -2190,37 +2190,22 @@ main( int argc, char** argv )
} }
} }
<<<<<<< HEAD
XP_ASSERT( mainParams.pgi.nPlayers == mainParams.nLocalPlayers
+ mainParams.info.serverInfo.nRemotePlayers );
if ( isServer ) {
if ( mainParams.info.serverInfo.nRemotePlayers == 0 ) {
mainParams.pgi.serverRole = SERVER_STANDALONE;
} else {
mainParams.pgi.serverRole = SERVER_ISSERVER;
}
} else {
mainParams.pgi.serverRole = SERVER_ISCLIENT;
}
=======
int result; int result;
if ( g_str_has_suffix( argv[0], "dawg2dict" ) ) { if ( g_str_has_suffix( argv[0], "dawg2dict" ) ) {
result = dawg2dict( &mainParams, testDicts ); result = dawg2dict( &mainParams, testDicts );
} else { } else {
XP_ASSERT( mainParams.gi.nPlayers == mainParams.nLocalPlayers XP_ASSERT( mainParams.pgi.nPlayers == mainParams.nLocalPlayers
+ mainParams.info.serverInfo.nRemotePlayers ); + mainParams.info.serverInfo.nRemotePlayers );
if ( isServer ) { if ( isServer ) {
if ( mainParams.info.serverInfo.nRemotePlayers == 0 ) { if ( mainParams.info.serverInfo.nRemotePlayers == 0 ) {
mainParams.gi.serverRole = SERVER_STANDALONE; mainParams.pgi.serverRole = SERVER_STANDALONE;
} else { } else {
mainParams.gi.serverRole = SERVER_ISSERVER; mainParams.pgi.serverRole = SERVER_ISSERVER;
} }
} else { } else {
mainParams.gi.serverRole = SERVER_ISCLIENT; mainParams.pgi.serverRole = SERVER_ISCLIENT;
} }
>>>>>>> android_branch
/* sanity checks */ /* sanity checks */
totalPlayerCount = mainParams.nLocalPlayers totalPlayerCount = mainParams.nLocalPlayers
@ -2236,39 +2221,21 @@ main( int argc, char** argv )
} }
} }
<<<<<<< HEAD if ( !!mainParams.pgi.dictName ) {
if ( !!mainParams.pgi.dictName ) {
/* char path[256]; */
/* getDictPath( &mainParams, mainParams.gi.dictName, path, VSIZE(path) ); */
/* mainParams.dict = */
/* linux_dictionary_make( MPPARM(mainParams.mpool) &mainParams, */
/* mainParams.pgi.dictName, */
/* mainParams.useMmap ); */
/* XP_ASSERT( !!mainParams.dict ); */
/* mainParams.pgi.dictLang = dict_getLangCode( mainParams.dict ); */
} else if ( isServer ) {
#ifdef STUBBED_DICT
mainParams.dict = make_stubbed_dict(
MPPARM_NOCOMMA(mainParams.util->mpool) );
XP_WARNF( "no dictionary provided: using English stub dict\n" );
mainParams.pgi.dictLang = dict_getLangCode( mainParams.dict );
=======
if ( !!mainParams.gi.dictName ) {
/* char path[256]; */ /* char path[256]; */
/* getDictPath( &mainParams, mainParams.gi.dictName, path, VSIZE(path) ); */ /* getDictPath( &mainParams, mainParams.gi.dictName, path, VSIZE(path) ); */
mainParams.dict = /* mainParams.dict = */
linux_dictionary_make( MPPARM(mainParams.util->mpool) &mainParams, /* linux_dictionary_make( MPPARM(mainParams.mpool) &mainParams, */
mainParams.gi.dictName, /* mainParams.pgi.dictName, */
mainParams.useMmap ); /* mainParams.useMmap ); */
XP_ASSERT( !!mainParams.dict ); /* XP_ASSERT( !!mainParams.dict ); */
mainParams.gi.dictLang = dict_getLangCode( mainParams.dict ); /* mainParams.pgi.dictLang = dict_getLangCode( mainParams.dict ); */
} else if ( isServer ) { } else if ( isServer ) {
#ifdef STUBBED_DICT #ifdef STUBBED_DICT
mainParams.dict = make_stubbed_dict( mainParams.dict =
MPPARM_NOCOMMA(mainParams.util->mpool) ); make_stubbed_dict( MPPARM_NOCOMMA(mainParams.util->mpool) );
XP_WARNF( "no dictionary provided: using English stub dict\n" ); XP_WARNF( "no dictionary provided: using English stub dict\n" );
mainParams.gi.dictLang = dict_getLangCode( mainParams.dict ); mainParams.pgi.dictLang = dict_getLangCode( mainParams.dict );
>>>>>>> android_branch
#else #else
if ( 0 == nPlayerDicts ) { if ( 0 == nPlayerDicts ) {
mainParams.needsNewGame = XP_TRUE; mainParams.needsNewGame = XP_TRUE;
@ -2278,34 +2245,8 @@ main( int argc, char** argv )
mainParams.needsNewGame = XP_TRUE; mainParams.needsNewGame = XP_TRUE;
} }
<<<<<<< HEAD
if ( 0 < mainParams.info.serverInfo.nRemotePlayers
&& SERVER_STANDALONE == mainParams.pgi.serverRole ) {
mainParams.needsNewGame = XP_TRUE;
}
/* per-player dicts are for local players only. Assign in the order
given. It's an error to give too many, or not to give enough if
there's no game-dict */
if ( 0 < nPlayerDicts ) {
/* XP_U16 nextDict = 0; */
/* for ( ii = 0; ii < mainParams.pgi.nPlayers; ++ii ) { */
/* if ( mainParams.pgi.players[ii].isLocal ) { */
/* const XP_UCHAR* name = mainParams.playerDictNames[nextDict++]; */
/* XP_ASSERT( !!name ); */
/* mainParams.dicts.dicts[ii] = */
/* linux_dictionary_make( MPPARM(mainParams.mpool) */
/* &mainParams, name, mainParams.useMmap ); */
/* } */
/* } */
/* if ( nextDict < nPlayerDicts ) { */
/* usage( argv[0], " --player-dict used more times than there are " */
/* "local players" ); */
/* } */
}
=======
if ( 0 < mainParams.info.serverInfo.nRemotePlayers if ( 0 < mainParams.info.serverInfo.nRemotePlayers
&& SERVER_STANDALONE == mainParams.gi.serverRole ) { && SERVER_STANDALONE == mainParams.pgi.serverRole ) {
mainParams.needsNewGame = XP_TRUE; mainParams.needsNewGame = XP_TRUE;
} }
@ -2313,22 +2254,21 @@ main( int argc, char** argv )
given. It's an error to give too many, or not to give enough if given. It's an error to give too many, or not to give enough if
there's no game-dict */ there's no game-dict */
if ( 0 < nPlayerDicts ) { if ( 0 < nPlayerDicts ) {
XP_U16 nextDict = 0; /* XP_U16 nextDict = 0; */
for ( ii = 0; ii < mainParams.gi.nPlayers; ++ii ) { /* for ( ii = 0; ii < mainParams.gi.nPlayers; ++ii ) { */
if ( mainParams.gi.players[ii].isLocal ) { /* if ( mainParams.gi.players[ii].isLocal ) { */
const XP_UCHAR* name = mainParams.playerDictNames[nextDict++]; /* const XP_UCHAR* name = mainParams.playerDictNames[nextDict++]; */
XP_ASSERT( !!name ); /* XP_ASSERT( !!name ); */
mainParams.dicts.dicts[ii] = /* mainParams.dicts.dicts[ii] = */
linux_dictionary_make( MPPARM(mainParams.util->mpool) /* linux_dictionary_make( MPPARM(mainParams.util->mpool) */
&mainParams, name, mainParams.useMmap ); /* &mainParams, name, mainParams.useMmap ); */
} /* } */
} /* } */
if ( nextDict < nPlayerDicts ) { /* if ( nextDict < nPlayerDicts ) { */
usage( argv[0], " --player-dict used more times than there are " /* usage( argv[0], " --player-dict used more times than there are " */
"local players" ); /* "local players" ); */
} /* } */
} }
>>>>>>> android_branch
/* if ( !isServer ) { */ /* if ( !isServer ) { */
/* if ( mainParams.info.serverInfo.nRemotePlayers > 0 ) { */ /* if ( mainParams.info.serverInfo.nRemotePlayers > 0 ) { */
@ -2336,17 +2276,11 @@ main( int argc, char** argv )
/* } */ /* } */
/* } */ /* } */
#ifdef XWFEATURE_WALKDICT #ifdef XWFEATURE_WALKDICT
<<<<<<< HEAD
if ( !!testDicts ) {
walk_dict_test_all( mainParams.mpool, &mainParams, testDicts, testPrefixes, testMinMax );
exit( 0 );
}
=======
if ( !!testDicts ) { if ( !!testDicts ) {
walk_dict_test_all( &mainParams, testDicts, testPrefixes, testMinMax ); walk_dict_test_all( MPPARM(mainParams.mpool) &mainParams, testDicts,
testPrefixes, testMinMax );
exit( 0 ); exit( 0 );
} }
>>>>>>> android_branch
#endif #endif
if ( 0 ) { if ( 0 ) {
#ifdef XWFEATURE_RELAY #ifdef XWFEATURE_RELAY
@ -2409,19 +2343,7 @@ main( int argc, char** argv )
/* mainParams.util->vtable->m_util_makeStreamFromAddr = */ /* mainParams.util->vtable->m_util_makeStreamFromAddr = */
/* linux_util_makeStreamFromAddr; */ /* linux_util_makeStreamFromAddr; */
<<<<<<< HEAD // mainParams.util->gameInfo = &mainParams.pgi;
// mainParams.util->gameInfo = &mainParams.pgi;
=======
mainParams.util->gameInfo = &mainParams.gi;
linux_util_vt_init( MPPARM(mainParams.util->mpool) mainParams.util );
#ifndef XWFEATURE_STANDALONE_ONLY
mainParams.util->vtable->m_util_informMissing = linux_util_informMissing;
mainParams.util->vtable->m_util_addrChange = linux_util_addrChange;
mainParams.util->vtable->m_util_setIsServer = linux_util_setIsServer;
#endif
>>>>>>> android_branch
srandom( seed ); /* init linux random number generator */ srandom( seed ); /* init linux random number generator */
XP_LOGF( "seeded srandom with %d", seed ); XP_LOGF( "seeded srandom with %d", seed );
@ -2443,17 +2365,10 @@ main( int argc, char** argv )
mainParams.serverRole = SERVER_ISCLIENT; mainParams.serverRole = SERVER_ISCLIENT;
} }
<<<<<<< HEAD
if ( mainParams.needsNewGame ) {
gi_disposePlayerInfo( MPPARM(mainParams.mpool) &mainParams.pgi );
gi_initPlayerInfo( MPPARM(mainParams.mpool) &mainParams.pgi, NULL );
}
=======
if ( mainParams.needsNewGame ) { if ( mainParams.needsNewGame ) {
gi_initPlayerInfo( MPPARM(mainParams.util->mpool) gi_disposePlayerInfo( MPPARM(mainParams.mpool) &mainParams.pgi );
&mainParams.gi, NULL ); gi_initPlayerInfo( MPPARM(mainParams.mpool) &mainParams.pgi, NULL );
} }
>>>>>>> android_branch
/* curses doesn't have newgame dialog */ /* curses doesn't have newgame dialog */
if ( useCurses && !mainParams.needsNewGame ) { if ( useCurses && !mainParams.needsNewGame ) {
@ -2462,31 +2377,15 @@ main( int argc, char** argv )
#endif #endif
} else if ( !useCurses ) { } else if ( !useCurses ) {
#if defined PLATFORM_GTK #if defined PLATFORM_GTK
<<<<<<< HEAD gtk_init( &argc, &argv );
gtk_init( &argc, &argv ); gtkmain( &mainParams );
gtkmain( &mainParams );
=======
gtkmain( &mainParams, argc, argv );
>>>>>>> android_branch
#endif #endif
} else { } else {
usage( argv[0], "rtfm" ); usage( argv[0], "rtfm" );
} }
<<<<<<< HEAD freeParams( &mainParams );
freeParams( &mainParams );
=======
vtmgr_destroy( MPPARM(mainParams.util->mpool) mainParams.vtMgr );
linux_util_vt_destroy( mainParams.util );
mpool_destroy( mainParams.util->mpool );
free( mainParams.util );
result = 0;
} }
>>>>>>> android_branch
XP_LOGF( "%s exiting main", argv[0] ); XP_LOGF( "%s exiting main", argv[0] );
return result; return result;

4
xwords4/relay/xwrelay.cpp
View file

@ -1104,7 +1104,7 @@ handleProxyMsgs( int sock, const AddrInfo* addr, const unsigned char* bufp,
if ( getNetShort( &bufp, end, &len ) ) { if ( getNetShort( &bufp, end, &len ) ) {
if ( handlePutMessage( scr, hid, addr, len, &bufp, end ) ) { if ( handlePutMessage( scr, hid, addr, len, &bufp, end ) ) {
continue; continue;
} }
} }
break; break;
} }
@ -1196,7 +1196,7 @@ proxy_thread_proc( UdpThreadClosure* utc )
int olen = 0; /* return a 0-length message */ int olen = 0; /* return a 0-length message */
write( socket, &olen, sizeof(olen) ); write( socket, &olen, sizeof(olen) );
break; /* PRX_DEVICE_GONE */ break; /* PRX_DEVICE_GONE */
} }
default: default:
logf( XW_LOGERROR, "unexpected command %d", __func__, cmd ); logf( XW_LOGERROR, "unexpected command %d", __func__, cmd );
break; break;