Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-28 09:58:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

When alt key pressed cursor can move onto occupied squares it normally skips.

Browse source
This commit is contained in:
ehouse 2006-11-22 13:49:14 +00:00
parent e86d4764c4
commit c754d73770
3 changed files with 49 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
common/board.c
View file

@ -2735,8 +2735,8 @@ advanceArrow( BoardCtxt* board )
static XP_Bool
figureNextLoc( BoardCtxt* board, XP_Key cursorKey,
XP_Bool inclPending, XP_U16* colP, XP_U16* rowP,
XP_Bool* pUp )
XP_Bool inclPending, XP_Bool forceFirst,
XP_U16* colP, XP_U16* rowP, XP_Bool* pUp )
{
XP_S16 max;
XP_S16* useWhat;
@ -2795,7 +2795,8 @@ figureNextLoc( BoardCtxt* board, XP_Key cursorKey,
}
result = XP_TRUE;
*useWhat += incr;
if ( !cellOccupied( board, *colP, *rowP, inclPending ) ) {
if ( forceFirst || !cellOccupied( board,
*colP, *rowP, inclPending ) ) {
break;
}
}
@ -2812,7 +2813,8 @@ board_moveArrow( BoardCtxt* board, XP_Key cursorKey )
setArrowVisible( board, XP_TRUE );
(void)getArrow( board, &col, &row );
changed = figureNextLoc( board, cursorKey, XP_TRUE, &col, &row, NULL );
changed = figureNextLoc( board, cursorKey, XP_TRUE, XP_FALSE,
&col, &row, NULL );
if ( changed ) {
(void)setArrow( board, col, row );
}
@ -2820,6 +2822,27 @@ board_moveArrow( BoardCtxt* board, XP_Key cursorKey )
} /* board_moveArrow */
#ifdef KEYBOARD_NAV
static XP_Key
stripAlt( XP_Key key, XP_Bool* wasAlt )
{
XP_Bool alt = XP_FALSE;
switch ( key ) {
case XP_CURSOR_KEY_ALTDOWN:
case XP_CURSOR_KEY_ALTRIGHT:
case XP_CURSOR_KEY_ALTUP:
case XP_CURSOR_KEY_ALTLEFT:
alt = XP_TRUE;
--key;
default:
break;
}
if ( !!wasAlt ) {
*wasAlt = alt;
}
return key;
} /* stripAlt */
static XP_Bool
board_moveCursor( BoardCtxt* board, XP_Key cursorKey, XP_Bool* up )
{
@ -2828,7 +2851,11 @@ board_moveCursor( BoardCtxt* board, XP_Key cursorKey, XP_Bool* up )
XP_U16 row = loc.row;
XP_Bool changed;
changed = figureNextLoc( board, cursorKey, XP_FALSE, &col, &row, up );
XP_Bool altSet;
cursorKey = stripAlt( cursorKey, &altSet );
changed = figureNextLoc( board, cursorKey, XP_FALSE, altSet,
&col, &row, up );
if ( changed ) {
invalCell( board, loc.col, loc.row );
invalCell( board, col, row );

15
linux/cursesmain.c
View file

@ -407,6 +407,17 @@ handleAltRight( CursesAppGlobals* globals )
return handleFocusKey( globals, XP_CURSOR_KEY_ALTRIGHT );
}
static XP_Bool
handleAltUp( CursesAppGlobals* globals )
{
return handleFocusKey( globals, XP_CURSOR_KEY_ALTUP );
}
static XP_Bool
handleAltDown( CursesAppGlobals* globals )
{
return handleFocusKey( globals, XP_CURSOR_KEY_ALTDOWN );
}
static XP_Bool
handleFlip( CursesAppGlobals* globals )
@ -554,6 +565,10 @@ handleDown( CursesAppGlobals* globals )
#endif
MenuList boardMenuList[] = {
{ handleAltLeft, "Force left", "{", '{' },
{ handleAltRight, "Force right", "}", '}' },
{ handleAltUp, "Force up", "_", '_' },
{ handleAltDown, "Force down", "+", '+' },
{ NULL, NULL, NULL, '\0'}
};

4
palm/palmmain.c
View file

@ -2545,10 +2545,10 @@ mainViewHandleEvent( EventPtr event )
xpkey = altOn ? XP_CURSOR_KEY_ALTRIGHT : XP_CURSOR_KEY_RIGHT;
break;
case vchrRockerUp:
xpkey = XP_CURSOR_KEY_UP;
xpkey = altOn ? XP_CURSOR_KEY_ALTUP : XP_CURSOR_KEY_UP;
break;
case vchrRockerDown:
xpkey = XP_CURSOR_KEY_DOWN;
xpkey = altOn ? XP_CURSOR_KEY_ALTDOWN : XP_CURSOR_KEY_DOWN;
break;
case chrSpace:
xpkey = XP_RAISEFOCUS_KEY;