From 045383f7dd742e4cf44a9c5ed56085d64c3b0297 Mon Sep 17 00:00:00 2001 From: ehouse Date: Sat, 13 Nov 2004 05:20:07 +0000 Subject: [PATCH] pass globals to palm_dictionary_make; handle five-way up/down in ask dialog scrolling --- xwords4/palm/palmmain.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/xwords4/palm/palmmain.c b/xwords4/palm/palmmain.c index 813f21fd8..0120e3ba3 100644 --- a/xwords4/palm/palmmain.c +++ b/xwords4/palm/palmmain.c @@ -576,8 +576,8 @@ loadCurrentGame( PalmAppGlobals* globals, XP_U16 gIndex, if ( hasDict ) { XP_UCHAR* name = stringFromStream( MPPARM(globals->mpool) recStream ); - dict = palm_dictionary_make( MPPARM(globals->mpool) name, - globals->dictList ); + dict = palm_dictionary_make( MPPARM(globals->mpool) globals, + name, globals->dictList ); success = dict != NULL; if ( !success ) { @@ -1854,7 +1854,7 @@ initAndStartBoard( PalmAppGlobals* globals, XP_Bool newGame ) if ( !dict ) { XP_ASSERT( !!newDictName ); - dict = palm_dictionary_make( MPPARM(globals->mpool) + dict = palm_dictionary_make( MPPARM(globals->mpool) globals, copyString( MEMPOOL newDictName ), globals->dictList ); XP_ASSERT( !!dict ); @@ -2729,9 +2729,11 @@ handleScrollInAsk( EventPtr event ) case keyDownEvent: switch ( event->data.keyDown.chr ) { case pageUpChr: + case vchrRockerUp: direction = winUp; break; case pageDownChr: + case vchrRockerDown: direction = winDown; break; default: @@ -3363,7 +3365,9 @@ palm_util_getCurSeconds( XW_UtilCtxt* uc ) static DictionaryCtxt* palm_util_makeEmptyDict( XW_UtilCtxt* uc ) { - DictionaryCtxt* result = palm_dictionary_make( MPPARM(uc->mpool) NULL, NULL ); + PalmAppGlobals* globals = (PalmAppGlobals*)uc->closure; + DictionaryCtxt* result = palm_dictionary_make( MPPARM(uc->mpool) + globals, NULL, NULL ); XP_ASSERT( !!result ); return result; } /* palm_util_makeEmptyDict */