Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-15 15:41:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

refactor

Browse source
This commit is contained in:
Eric House 2023-12-22 17:34:46 -08:00
parent 7275569842
commit f2c1f21da2
3 changed files with 14 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
xwords4/linux/cursesboard.c
View file

@ -1204,21 +1204,6 @@ curses_util_informWordsBlocked( XW_UtilCtxt* XP_UNUSED(uc), XWEnv XP_UNUSED(xwe)
XP_LOGFF( "(nBadWords=%d, dict=%s)", nBadWords, dictName );
}
#ifndef XWFEATURE_STANDALONE_ONLY
static XWStreamCtxt*
curses_util_makeStreamFromAddr(XW_UtilCtxt* uc, XWEnv xwe,
XP_PlayerAddr channelNo )
{
CursesBoardGlobals* globals = (CursesBoardGlobals*)uc->closure;
LaunchParams* params = globals->cGlobals.params;
XWStreamCtxt* stream = mem_stream_make( MPPARM(uc->mpool) params->vtMgr,
&globals->cGlobals, channelNo,
sendOnClose, xwe );
return stream;
} /* curses_util_makeStreamFromAddr */
#endif
#ifdef XWFEATURE_CHAT
static void
curses_util_showChat( XW_UtilCtxt* uc, XWEnv XP_UNUSED(xwe),
@ -1243,7 +1228,6 @@ setupCursesUtilCallbacks( CursesBoardGlobals* bGlobals, XW_UtilCtxt* util )
{
util->closure = bGlobals;
#define SET_PROC(NAM) util->vtable->m_util_##NAM = curses_util_##NAM
SET_PROC(makeStreamFromAddr);
SET_PROC(userError);
SET_PROC(notifyMove);
SET_PROC(notifyTrade);

17
xwords4/linux/gtkboard.c
View file

@ -1949,19 +1949,6 @@ gtk_util_getMQTTIDsFor( XW_UtilCtxt* uc, XWEnv xwe, XP_U16 nRelayIDs,
XP_USE( relayIDs );
}
#ifndef XWFEATURE_STANDALONE_ONLY
static XWStreamCtxt*
gtk_util_makeStreamFromAddr(XW_UtilCtxt* uc, XWEnv XP_UNUSED(xwe), XP_PlayerAddr channelNo )
{
GtkGameGlobals* globals = (GtkGameGlobals*)uc->closure;
XWStreamCtxt* stream = mem_stream_make( MEMPOOL
globals->cGlobals.params->vtMgr,
&globals->cGlobals, channelNo,
sendOnClose, NULL_XWE );
return stream;
} /* gtk_util_makeStreamFromAddr */
#ifdef XWFEATURE_CHAT
static void
gtk_util_showChat( XW_UtilCtxt* uc, XWEnv XP_UNUSED(xwe),
@ -1984,7 +1971,6 @@ gtk_util_showChat( XW_UtilCtxt* uc, XWEnv XP_UNUSED(xwe),
(void)gtkask( globals->window, buf, GTK_BUTTONS_OK, NULL );
}
#endif
#endif
#ifdef XWFEATURE_SEARCHLIMIT
static XP_Bool
@ -2268,9 +2254,6 @@ setupGtkUtilCallbacks( GtkGameGlobals* globals, XW_UtilCtxt* util )
SET_PROC(remSelected);
SET_PROC(getMQTTIDsFor);
SET_PROC(timerSelected);
#ifndef XWFEATURE_STANDALONE_ONLY
SET_PROC(makeStreamFromAddr);
#endif
#ifdef XWFEATURE_CHAT
SET_PROC(showChat);
#endif

15
xwords4/linux/linuxmain.c
View file

@ -2346,7 +2346,19 @@ linux_util_requestTime( XW_UtilCtxt* uc, XWEnv XP_UNUSED(xwe) )
{
CommonGlobals* cGlobals = (CommonGlobals*)uc->closure;
cGlobals->idleID = g_idle_add( idle_func, cGlobals );
} /* gtk_util_requestTime */
} /* linux_util_requestTime */
static XWStreamCtxt*
linux_util_makeStreamFromAddr( XW_UtilCtxt* uc, XWEnv xwe, XP_PlayerAddr channelNo )
{
CommonGlobals* cGlobals = (CommonGlobals*)uc->closure;
LaunchParams* params = cGlobals->params;
XWStreamCtxt* stream = mem_stream_make( MPPARM(uc->mpool) params->vtMgr,
cGlobals, channelNo,
sendOnClose, xwe );
return stream;
}
void
setupLinuxUtilCallbacks( XW_UtilCtxt* util )
@ -2357,6 +2369,7 @@ setupLinuxUtilCallbacks( XW_UtilCtxt* util )
SET_PROC(setTimer);
SET_PROC(clearTimer);
SET_PROC(requestTime);
SET_PROC(makeStreamFromAddr);
#undef SET_PROC
}