diff --git a/palm/palmdraw.c b/palm/palmdraw.c index 985e15f45..3a38bcc7f 100644 --- a/palm/palmdraw.c +++ b/palm/palmdraw.c @@ -1,6 +1,6 @@ /* -*-mode: C; fill-column: 77; c-basic-offset: 4; compile-command: "make ARCH=68K_ONLY MEMDEBUG=TRUE";-*- */ /* - * Copyright 1999 - 2001 by Eric House (xwords@eehouse.org). All rights reserved. + * Copyright 1999 - 2006 by Eric House (xwords@eehouse.org). All rights reserved. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -136,30 +136,6 @@ bitmapInRect( PalmDrawCtx* dctx, Int16 resID, const XP_Rect* rectP ) drawBitmapAt( (DrawCtx*)dctx, resID, left, top ); } /* bitmapInRect */ -#ifdef KEYBOARD_NAV -#ifdef XWFEATURE_FIVEWAY -static void -drawFocusRect( PalmDrawCtx* dctx, const XP_Rect* rect ) -{ - XP_Rect r; - XP_U16 i; - IndexedColorType oldColor; - - oldColor = WinSetForeColor( dctx->drawingPrefs->drawColors[COLOR_CURSOR] ); - r = *rect; - - insetRect( &r, 1 ); - for ( i = 0; i < 6; ++i ) { - insetRect( &r, 1 ); - WinDrawRectangleFrame(rectangleFrame, (RectangleType*)&r ); - } - (void)WinSetForeColor( oldColor ); -} -#else -# define drawFocusRect( a, b ) -#endif -#endif - # define BMP_WIDTH 16 # define BMP_HT 16 @@ -295,13 +271,29 @@ palm_clr_draw_boardBegin( DrawCtx* p_dctx, const DictionaryCtxt* dict, static void palm_draw_objFinished( DrawCtx* p_dctx, BoardObjectType typ, - const XP_Rect* rect, DrawFocusState dfs ) + const XP_Rect* rect, DrawFocusState dfs ) { PalmDrawCtx* dctx = (PalmDrawCtx*)p_dctx; #ifdef XWFEATURE_FIVEWAY PalmAppGlobals* globals = dctx->globals; if ( globals->hasFiveWay && (dfs == DFS_TOP) && (typ == OBJ_BOARD) ) { - drawFocusRect( dctx, rect ); + XP_Rect r; + XP_U16 i; + IndexedColorType oldColor; + + oldColor + = WinSetForeColor( dctx->drawingPrefs->drawColors[COLOR_CURSOR] ); + + r.left = rect->left + 1; + r.top = rect->top + 1; + r.width = rect->width - 1; + r.height = rect->height - 1; + + for ( i = 0; i < 6; ++i ) { + insetRect( &r, 1 ); + WinDrawRectangleFrame(rectangleFrame, (RectangleType*)&r ); + } + (void)WinSetForeColor( oldColor ); } #endif diff --git a/palm/palmmain.c b/palm/palmmain.c index ecdc3febb..80bb64f09 100644 --- a/palm/palmmain.c +++ b/palm/palmmain.c @@ -1729,6 +1729,13 @@ drawFormButtons( PalmAppGlobals* globals ) pair += 3; } } + +#ifdef XWFEATURE_FIVEWAY + if ( globals->hasFiveWay ) { + drawFocusRingOnGadget( XW_MAIN_DONE_BUTTON_ID, + XW_MAIN_HIDE_BUTTON_ID ); + } +#endif } /* drawFormButtons */ static void diff --git a/palm/xwords4defines.h b/palm/xwords4defines.h index 35ee308d6..30f89c50b 100644 --- a/palm/xwords4defines.h +++ b/palm/xwords4defines.h @@ -425,7 +425,7 @@ #ifdef XWFEATURE_BLUETOOTH # define XW_PALM_VERSION_STRING "4.3a4" #else -# define XW_PALM_VERSION_STRING "4.2b1" +# define XW_PALM_VERSION_STRING "4.2b2" #endif #define CUR_PREFS_VERS 0x0405