Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-30 08:34:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

util_setTimer changes

Browse source
This commit is contained in:
ehouse 2005-06-23 14:09:20 +00:00
parent 3054637842
commit 2fbfeee378
2 changed files with 37 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
xwords4/wince/cemain.c
View file

@ -92,7 +92,8 @@ static void ce_util_notifyGameOver( XW_UtilCtxt* uc );
static XP_Bool ce_util_hiliteCell( XW_UtilCtxt* uc, XP_U16 col, static XP_Bool ce_util_hiliteCell( XW_UtilCtxt* uc, XP_U16 col,
XP_U16 row ); XP_U16 row );
static XP_Bool ce_util_engineProgressCallback( XW_UtilCtxt* uc ); static XP_Bool ce_util_engineProgressCallback( XW_UtilCtxt* uc );
static void ce_util_setTimer( XW_UtilCtxt* uc, XWTimerReason why ); static void ce_util_setTimer( XW_UtilCtxt* uc, XWTimerReason why, XP_U16 when,
TimerProc proc, void* closure);
static void ce_util_requestTime( XW_UtilCtxt* uc ); static void ce_util_requestTime( XW_UtilCtxt* uc );
static XP_U32 ce_util_getCurSeconds( XW_UtilCtxt* uc ); static XP_U32 ce_util_getCurSeconds( XW_UtilCtxt* uc );
static DictionaryCtxt* ce_util_makeEmptyDict( XW_UtilCtxt* uc ); static DictionaryCtxt* ce_util_makeEmptyDict( XW_UtilCtxt* uc );
@ -1435,6 +1436,14 @@ debug_saveCurState( CEAppGlobals* globals )
# define debug_saveCurState(g) # define debug_saveCurState(g)
#endif #endif
static void
ceFireTimer( CEAppGlobals* globals, XWTimerReason why )
{
TimerProc proc = globals->timerProcs[why-1];
void* closure = globals->timerClosures[why-1];
(*proc)( closure, why );
}
LRESULT CALLBACK LRESULT CALLBACK
WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{ {
@ -1651,11 +1660,14 @@ WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
case WM_TIMER: case WM_TIMER:
why = (XWTimerReason)wParam; why = (XWTimerReason)wParam;
if ( why == TIMER_PENDOWN || why == TIMER_TIMERTICK ) { if ( why == TIMER_PENDOWN || why == TIMER_TIMERTICK || why == TIMER_HEARTBEAT ) {
board_timerFired( globals->game.board, why ); XP_ASSERT( why < TIMER_NUM_PLUS_ONE );
/* they otherwise repeat.... */
XP_ASSERT( why <= N_TIMER_TYPES ); /* Kill since they otherwise repeat, but kill before firing
as fired proc may set another. */
(void)KillTimer( hWnd, globals->timerIDs[why-1] ); (void)KillTimer( hWnd, globals->timerIDs[why-1] );
ceFireTimer( globals, why );
} }
break; break;
@ -2125,25 +2137,36 @@ ce_util_engineProgressCallback( XW_UtilCtxt* uc )
} /* ce_util_engineProgressCallback */ } /* ce_util_engineProgressCallback */
static void static void
ce_util_setTimer( XW_UtilCtxt* uc, XWTimerReason why ) ce_util_setTimer( XW_UtilCtxt* uc, XWTimerReason why, XP_U16 when,
TimerProc proc, void* closure)
{ {
CEAppGlobals* globals = (CEAppGlobals*)uc->closure; CEAppGlobals* globals = (CEAppGlobals*)uc->closure;
XP_U32 timerID; XP_U32 timerID;
XP_U32 howLong; XP_U32 howLong;
if ( why == TIMER_PENDOWN ) { XP_ASSERT( why < TIMER_NUM_PLUS_ONE );
globals->timerProcs[why-1] = proc;
globals->timerClosures[why-1] = closure;
switch ( why ) {
case TIMER_PENDOWN:
howLong = 400; howLong = 400;
} else if ( why == TIMER_TIMERTICK ) { break;
case TIMER_TIMERTICK:
howLong = 1000; /* 1 second */ howLong = 1000; /* 1 second */
} else { break;
#ifndef XWFEATURE_STANDALONE_ONLY
case TIMER_HEARTBEAT:
howLong = when * 1000;
break;
#endif
default:
XP_ASSERT(0); XP_ASSERT(0);
return; return;
} }
timerID = SetTimer( globals->hWnd, why, howLong, NULL); timerID = SetTimer( globals->hWnd, why, howLong, NULL);
XP_ASSERT( why <= N_TIMER_TYPES );
globals->timerIDs[why-1] = timerID; globals->timerIDs[why-1] = timerID;
} /* ce_util_setTimer */ } /* ce_util_setTimer */
static void static void

5
xwords4/wince/cemain.h
View file

@ -55,7 +55,6 @@ typedef struct CEAppPrefs {
} CEAppPrefs; } CEAppPrefs;
#define NUM_BUTTONS 4 #define NUM_BUTTONS 4
#define N_TIMER_TYPES 2
typedef struct CEAppGlobals { typedef struct CEAppGlobals {
HINSTANCE hInst; HINSTANCE hInst;
@ -76,7 +75,9 @@ typedef struct CEAppGlobals {
XP_U16* bonusInfo; XP_U16* bonusInfo;
wchar_t* lastDefaultDir; wchar_t* lastDefaultDir;
XP_U32 timerIDs[N_TIMER_TYPES]; XP_U32 timerIDs[TIMER_NUM_PLUS_ONE - 1];
TimerProc timerProcs[TIMER_NUM_PLUS_ONE - 1];
void* timerClosures[TIMER_NUM_PLUS_ONE - 1];
#ifdef CEFEATURE_CANSCROLL #ifdef CEFEATURE_CANSCROLL
XP_U16 nHiddenRows; XP_U16 nHiddenRows;