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

type name change only

Browse source
This commit is contained in:
ehouse 2007-05-26 14:14:01 +00:00
parent e891a26756
commit 5878ea6018
9 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/util.h
View file

@ -1,6 +1,6 @@
/* -*-mode: C; fill-column: 78; c-basic-offset: 4; -*- */ /* -*-mode: C; fill-column: 78; c-basic-offset: 4; -*- */
/* /*
* Copyright 1997 - 2000 by Eric House (xwords@eehouse.org). All rights reserved. * Copyright 1997 - 2007 by Eric House (xwords@eehouse.org). All rights reserved.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -88,7 +88,7 @@ typedef struct BadWordInfo {
XP_UCHAR* words[MAX_TRAY_TILES+1]; /* can form in both directions */ XP_UCHAR* words[MAX_TRAY_TILES+1]; /* can form in both directions */
} BadWordInfo; } BadWordInfo;
typedef void (*TimerProc)( void* closure, XWTimerReason why ); typedef void (*XWTimerProc)( void* closure, XWTimerReason why );
/* Platform-specific utility functions that need to be /* Platform-specific utility functions that need to be
*/ */
@ -129,7 +129,7 @@ typedef struct UtilVtable {
XP_Bool (*m_util_engineProgressCallback)( XW_UtilCtxt* uc ); XP_Bool (*m_util_engineProgressCallback)( XW_UtilCtxt* uc );
void (*m_util_setTimer)( XW_UtilCtxt* uc, XWTimerReason why, XP_U16 when, void (*m_util_setTimer)( XW_UtilCtxt* uc, XWTimerReason why, XP_U16 when,
TimerProc proc, void* closure ); XWTimerProc proc, void* closure );
void (*m_util_requestTime)( XW_UtilCtxt* uc ); void (*m_util_requestTime)( XW_UtilCtxt* uc );

4
linux/cursesmain.c
View file

@ -1,6 +1,6 @@
/* -*-mode: C; fill-column: 78; c-basic-offset: 4; compile-command: "make MEMDEBUG=TRUE"; -*- */ /* -*-mode: C; fill-column: 78; c-basic-offset: 4; compile-command: "make MEMDEBUG=TRUE"; -*- */
/* /*
* Copyright 2000-2006 by Eric House (xwords@eehouse.org). All rights * Copyright 2000-2007 by Eric House (xwords@eehouse.org). All rights
* reserved. * reserved.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -231,7 +231,7 @@ curses_util_engineProgressCallback( XW_UtilCtxt* XP_UNUSED(uc) )
static void static void
curses_util_setTimer( XW_UtilCtxt* uc, XWTimerReason why, XP_U16 when, curses_util_setTimer( XW_UtilCtxt* uc, XWTimerReason why, XP_U16 when,
TimerProc proc, void* closure ) XWTimerProc proc, void* closure )
{ {
CursesAppGlobals* globals = (CursesAppGlobals*)uc->closure; CursesAppGlobals* globals = (CursesAppGlobals*)uc->closure;

4
linux/gtkmain.c
View file

@ -1,6 +1,6 @@
/* -*-mode: C; fill-column: 78; c-basic-offset: 4; compile-command: "make MEMDEBUG=TRUE"; -*- */ /* -*-mode: C; fill-column: 78; c-basic-offset: 4; compile-command: "make MEMDEBUG=TRUE"; -*- */
/* /*
* Copyright 2000-2003 by Eric House (xwords@eehouse.org). All rights reserved. * Copyright 2000-2007 by Eric House (xwords@eehouse.org). All rights reserved.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -1216,7 +1216,7 @@ heartbeat_timer_func( gpointer data )
static void static void
gtk_util_setTimer( XW_UtilCtxt* uc, XWTimerReason why, gtk_util_setTimer( XW_UtilCtxt* uc, XWTimerReason why,
XP_U16 XP_UNUSED_RELAY(when), XP_U16 XP_UNUSED_RELAY(when),
TimerProc proc, void* closure ) XWTimerProc proc, void* closure )
{ {
GtkAppGlobals* globals = (GtkAppGlobals*)uc->closure; GtkAppGlobals* globals = (GtkAppGlobals*)uc->closure;
guint newSrc; guint newSrc;

5
linux/linuxmain.c
View file

@ -1,6 +1,7 @@
/* -*-mode: C; fill-column: 78; c-basic-offset: 4; compile-command: "make MEMDEBUG=TRUE"; -*- */ /* -*-mode: C; fill-column: 78; c-basic-offset: 4; compile-command: "make MEMDEBUG=TRUE"; -*- */
/* /*
* Copyright 2000 by Eric House (xwords@eehouse.org). All rights reserved. * Copyright 2000-2007 by Eric House (xwords@eehouse.org). All rights
* reserved.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -532,7 +533,7 @@ linux_util_makeStreamFromAddr( XW_UtilCtxt* uctx, XP_U16 channelNo )
void void
linuxFireTimer( CommonGlobals* cGlobals, XWTimerReason why ) linuxFireTimer( CommonGlobals* cGlobals, XWTimerReason why )
{ {
TimerProc proc = cGlobals->timerProcs[why]; XWTimerProc proc = cGlobals->timerProcs[why];
void* closure = cGlobals->timerClosures[why]; void* closure = cGlobals->timerClosures[why];
cGlobals->timerProcs[why] = NULL; cGlobals->timerProcs[why] = NULL;

5
linux/main.h
View file

@ -1,6 +1,7 @@
/* -*-mode: C; fill-column: 78; c-basic-offset: 4; -*- */ /* -*-mode: C; fill-column: 78; c-basic-offset: 4; -*- */
/* /*
* Copyright 2001 by Eric House (xwords@eehouse.org). All rights reserved. * Copyright 2001-2007 by Eric House (xwords@eehouse.org). All rights
* reserved.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -114,7 +115,7 @@ struct CommonGlobals {
/* Used only for bluetooth case */ /* Used only for bluetooth case */
struct LinBtStuff* btStuff; struct LinBtStuff* btStuff;
TimerProc timerProcs[NUM_TIMERS_PLUS_ONE]; XWTimerProc timerProcs[NUM_TIMERS_PLUS_ONE];
void* timerClosures[NUM_TIMERS_PLUS_ONE]; void* timerClosures[NUM_TIMERS_PLUS_ONE];
MPSLOT MPSLOT

8
palm/palmmain.c
View file

@ -116,7 +116,7 @@ static XP_Bool palm_util_hiliteCell( XW_UtilCtxt* uc, XP_U16 col,
XP_U16 row ); XP_U16 row );
static XP_Bool palm_util_engineProgressCallback( XW_UtilCtxt* uc ); static XP_Bool palm_util_engineProgressCallback( XW_UtilCtxt* uc );
static void palm_util_setTimer( XW_UtilCtxt* uc, XWTimerReason why, XP_U16 when, static void palm_util_setTimer( XW_UtilCtxt* uc, XWTimerReason why, XP_U16 when,
TimerProc proc, void* closure ); XWTimerProc proc, void* closure );
static XP_U32 palm_util_getCurSeconds( XW_UtilCtxt* uc ); static XP_U32 palm_util_getCurSeconds( XW_UtilCtxt* uc );
static void palm_util_requestTime( XW_UtilCtxt* uc ); static void palm_util_requestTime( XW_UtilCtxt* uc );
static DictionaryCtxt* palm_util_makeEmptyDict( XW_UtilCtxt* uc ); static DictionaryCtxt* palm_util_makeEmptyDict( XW_UtilCtxt* uc );
@ -1543,7 +1543,7 @@ destroy_on_close( XWStreamCtxt* p_stream )
static void static void
palmFireTimer( PalmAppGlobals* globals, XWTimerReason why ) palmFireTimer( PalmAppGlobals* globals, XWTimerReason why )
{ {
TimerProc proc = globals->timerProcs[why]; XWTimerProc proc = globals->timerProcs[why];
void* closure = globals->timerClosures[why]; void* closure = globals->timerClosures[why];
XP_ASSERT( TimGetTicks() >= globals->timerFireAt[why] ); XP_ASSERT( TimGetTicks() >= globals->timerFireAt[why] );
globals->timerProcs[why] = NULL; globals->timerProcs[why] = NULL;
@ -3769,8 +3769,8 @@ palm_util_engineProgressCallback( XW_UtilCtxt* uc )
static void static void
palm_util_setTimer( XW_UtilCtxt* uc, XWTimerReason why, palm_util_setTimer( XW_UtilCtxt* uc, XWTimerReason why,
XP_U16 XP_UNUSED_IR(secsFromNow), XP_U16 secsFromNow,
TimerProc proc, void* closure ) XWTimerProc proc, void* closure )
{ {
PalmAppGlobals* globals = (PalmAppGlobals*)uc->closure; PalmAppGlobals* globals = (PalmAppGlobals*)uc->closure;
XP_U32 now = TimGetTicks(); XP_U32 now = TimGetTicks();

2
palm/palmmain.h
View file

@ -324,7 +324,7 @@ struct PalmAppGlobals {
struct ConnsDlgState* connState; struct ConnsDlgState* connState;
TimerProc timerProcs[NUM_TIMERS_PLUS_ONE]; XWTimerProc timerProcs[NUM_TIMERS_PLUS_ONE];
void* timerClosures[NUM_TIMERS_PLUS_ONE]; void* timerClosures[NUM_TIMERS_PLUS_ONE];
XP_U32 timerFireAt[NUM_TIMERS_PLUS_ONE]; XP_U32 timerFireAt[NUM_TIMERS_PLUS_ONE];

6
wince/cemain.c
View file

@ -109,7 +109,7 @@ 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, XP_U16 when, static void ce_util_setTimer( XW_UtilCtxt* uc, XWTimerReason why, XP_U16 when,
TimerProc proc, void* closure); XWTimerProc 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 );
@ -1776,7 +1776,7 @@ handleScroll( CEAppGlobals* globals, XP_S16 pos, /* only valid for THUMB* */
static void static void
ceFireTimer( CEAppGlobals* globals, XWTimerReason why ) ceFireTimer( CEAppGlobals* globals, XWTimerReason why )
{ {
TimerProc proc; XWTimerProc proc;
void* closure; void* closure;
proc = globals->timerProcs[why]; proc = globals->timerProcs[why];
@ -2727,7 +2727,7 @@ ce_util_engineProgressCallback( XW_UtilCtxt* XP_UNUSED(uc) )
static void static void
ce_util_setTimer( XW_UtilCtxt* uc, XWTimerReason why, ce_util_setTimer( XW_UtilCtxt* uc, XWTimerReason why,
XP_U16 XP_UNUSED_RELAY(when), XP_U16 XP_UNUSED_RELAY(when),
TimerProc proc, void* closure) XWTimerProc proc, void* closure)
{ {
CEAppGlobals* globals = (CEAppGlobals*)uc->closure; CEAppGlobals* globals = (CEAppGlobals*)uc->closure;
XP_U32 timerID; XP_U32 timerID;

2
wince/cemain.h
View file

@ -84,7 +84,7 @@ typedef struct CEAppGlobals {
wchar_t* lastDefaultDir; wchar_t* lastDefaultDir;
XP_U32 timerIDs[NUM_TIMERS_PLUS_ONE]; XP_U32 timerIDs[NUM_TIMERS_PLUS_ONE];
TimerProc timerProcs[NUM_TIMERS_PLUS_ONE]; XWTimerProc timerProcs[NUM_TIMERS_PLUS_ONE];
void* timerClosures[NUM_TIMERS_PLUS_ONE]; void* timerClosures[NUM_TIMERS_PLUS_ONE];
XP_U16 flags; /* bits defined below */ XP_U16 flags; /* bits defined below */