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

hide focus when pen used, but remember where it was (don't set to

Browse source 
OBJ_NONE) so can replace it when focus keys used again.
This commit is contained in:
ehouse 2008-11-22 16:37:29 +00:00
parent e1cf1573b0
commit 239227ada3
5 changed files with 55 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
common/board.c
View file

@ -167,9 +167,9 @@ board_make( MPFORMAL ModelCtxt* model, ServerCtxt* server, DrawCtx* draw,
#ifdef KEYBOARD_NAV
{
/* set up some useful initial values */
XP_U16 i;
for ( i = 0; i < MAX_NUM_PLAYERS; ++i ) {
PerTurnInfo* pti = result->pti + i;
XP_U16 ii;
for ( ii = 0; ii < MAX_NUM_PLAYERS; ++ii ) {
PerTurnInfo* pti = result->pti + ii;
pti->trayCursorLoc = 1;
pti->bdCursor.col = 5;
pti->bdCursor.row = 7;
@ -1266,17 +1266,11 @@ setTrayVisState( BoardCtxt* board, XW_TrayVisState newState )
board->trayVisState = newState;
invalSelTradeWindow( board );
invalFocusOwner( board ); /* must be done before and after rect
recalculated */
(void)invalFocusOwner( board ); /* must be done before and after rect
recalculated */
figureBoardRect( board ); /* comes before setYOffset since that
uses rects to calc scroll */
/* This is sometimes the wrong thing to do, and seems not to be
needed at all. */
/* if ( (board->focussed == OBJ_TRAY) && board->focusHasDived ) { */
/* board->focusHasDived = XP_FALSE; */
/* } */
invalFocusOwner( board );
(void)invalFocusOwner( board );
if ( board->boardObscuresTray ) {
if ( nowHidden && !trayOnTop(board) ) {
@ -1921,8 +1915,7 @@ board_handlePenDown( BoardCtxt* board, XP_U16 x, XP_U16 y, XP_Bool* handled )
#ifdef KEYBOARD_NAV
/* clear focus as soon as pen touches board */
result = invalFocusOwner( board );
board->focussed = OBJ_NONE;
board->focusHasDived = XP_FALSE;
board->hideFocus = XP_TRUE;
if ( board->boardObscuresTray ) {
figureBoardRect( board );
}
@ -2241,9 +2234,9 @@ handleFocusKeyUp( BoardCtxt* board, XP_Key key, XP_Bool preflightOnly,
}
if ( up ) {
if ( !preflightOnly ) {
invalFocusOwner( board );
(void)invalFocusOwner( board );
board->focusHasDived = XP_FALSE;
invalFocusOwner( board );
(void)invalFocusOwner( board );
}
} else {
*pHandled = redraw;
@ -2271,6 +2264,17 @@ board_handleKeyRepeat( BoardCtxt* board, XP_Key key, XP_Bool* handled )
}
return draw;
}
static XP_Bool
unhideFocus( BoardCtxt* board )
{
XP_Bool changing = board->hideFocus;
if ( changing ) {
board->hideFocus = XP_FALSE;
(void)invalFocusOwner( board );
}
return changing;
}
#endif /* KEYBOARD_NAV */
#ifdef KEY_SUPPORT
@ -2318,7 +2322,12 @@ board_handleKeyUp( BoardCtxt* board, XP_Key key, XP_Bool* pHandled )
case XP_CURSOR_KEY_ALTLEFT:
case XP_CURSOR_KEY_RIGHT:
case XP_CURSOR_KEY_ALTRIGHT:
redraw = handleFocusKeyUp( board, key, XP_FALSE, &handled );
/* If focus is hidden, all we do is show it */
if ( unhideFocus( board ) ) {
redraw = handled = XP_TRUE;
} else {
redraw = handleFocusKeyUp( board, key, XP_FALSE, &handled );
}
break;
#endif
@ -2330,26 +2339,34 @@ board_handleKeyUp( BoardCtxt* board, XP_Key key, XP_Bool* pHandled )
#ifdef KEYBOARD_NAV
case XP_RAISEFOCUS_KEY:
if ( board->focussed != OBJ_NONE && board->focusHasDived ) {
invalFocusOwner( board );
if ( unhideFocus( board ) ) {
/* do nothing */
} else if ( board->focussed != OBJ_NONE && board->focusHasDived ) {
(void)invalFocusOwner( board );
board->focusHasDived = XP_FALSE;
invalFocusOwner( board );
handled = redraw = XP_TRUE;
(void)invalFocusOwner( board );
} else {
break; /* skip setting handled */
}
handled = redraw = XP_TRUE;
break;
case XP_RETURN_KEY:
if ( board->focusHasDived ) {
XP_U16 x, y;
if ( focusToCoords( board, &x, &y ) ) {
redraw = handlePenUpInternal( board, x, y, XP_FALSE );
if ( unhideFocus( board ) ) {
handled = XP_TRUE;
} else if ( board->focussed != OBJ_NONE ) {
if ( board->focusHasDived ) {
XP_U16 xx, yy;
if ( focusToCoords( board, &xx, &yy ) ) {
redraw = handlePenUpInternal( board, xx, yy, XP_FALSE );
handled = XP_TRUE;
}
} else {
(void)invalFocusOwner( board );
board->focusHasDived = XP_TRUE;
redraw = invalFocusOwner( board );
handled = XP_TRUE;
}
} else if ( board->focussed != OBJ_NONE ) {
redraw = invalFocusOwner( board );
board->focusHasDived = XP_TRUE;
redraw = invalFocusOwner( board );
handled = XP_TRUE;
}
break;
#endif

8
common/boarddrw.c
View file

@ -420,7 +420,7 @@ DrawFocusState
dfsFor( BoardCtxt* board, BoardObjectType obj )
{
DrawFocusState dfs;
if ( board->focussed == obj ) {
if ( (board->focussed == obj) && !board->hideFocus ) {
if ( board->focusHasDived ) {
dfs = DFS_DIVED;
} else {
@ -437,7 +437,7 @@ cellFocused( const BoardCtxt* board, XP_U16 col, XP_U16 row )
{
XP_Bool focussed = XP_FALSE;
if ( board->focussed == OBJ_BOARD ) {
if ( (board->focussed == OBJ_BOARD) && !board->hideFocus ) {
if ( board->focusHasDived ) {
if ( (col == board->selInfo->bdCursor.col)
&& (row == board->selInfo->bdCursor.row) ) {
@ -501,7 +501,9 @@ scrollIfCan( BoardCtxt* board )
XP_S16 dist;
#ifdef PERIMETER_FOCUS
if ( (board->focussed == OBJ_BOARD) && !board->focusHasDived ) {
if ( (board->focussed == OBJ_BOARD)
&& !board->focusHasDived
&& !board->hideFocus ) {
invalOldPerimeter( board );
}
#endif

1
common/boardp.h
View file

@ -169,6 +169,7 @@ struct BoardCtxt {
#ifdef KEYBOARD_NAV
XP_Bool focusHasDived;
XP_Bool hideFocus; /* not saved */
XP_Rect remRect; /* on scoreboard */
#endif

2
common/scorebdp.c
View file

@ -71,7 +71,7 @@ drawScoreBoard( BoardCtxt* board )
XP_Bool remFocussed = XP_FALSE;
XP_S16 cursorIndex = -1;
if ( board->focussed == OBJ_SCORE ) {
if ( (board->focussed == OBJ_SCORE) && !board->hideFocus ) {
focusAll = !board->focusHasDived;
if ( !focusAll ) {
cursorIndex = board->scoreCursorLoc;

2
common/tray.c
View file

@ -136,7 +136,7 @@ drawTray( BoardCtxt* board )
XP_Bool cursorOnDivider = XP_FALSE;
#ifdef KEYBOARD_NAV
XP_S16 cursorTile = pti->trayCursorLoc;
if ( board->focussed == OBJ_TRAY ) {
if ( (board->focussed == OBJ_TRAY) && !board->hideFocus ) {
cursorOnDivider = pti->dividerLoc == cursorTile;
if ( board->focusHasDived ) {
if ( !cursorOnDivider ) {