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

Merge branch 'android_branch' into android_invite

Browse source
This commit is contained in:
eehouse@eehouse.org 2011-07-20 19:12:51 -07:00 committed by Andy2
commit d742202b79
2 changed files with 39 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java
View file

@ -129,46 +129,7 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
public BoardView( Context context, AttributeSet attrs )
{
super( context, attrs );
init( context );
}
public boolean onTouchEvent( MotionEvent event )
{
int action = event.getAction();
int xx = (int)event.getX() - m_left;
int yy = (int)event.getY() - m_top;
switch ( action ) {
case MotionEvent.ACTION_DOWN:
m_jniThread.handle( JNIThread.JNICmd.CMD_PEN_DOWN, xx, yy );
break;
case MotionEvent.ACTION_MOVE:
m_jniThread.handle( JNIThread.JNICmd.CMD_PEN_MOVE, xx, yy );
break;
case MotionEvent.ACTION_UP:
m_jniThread.handle( JNIThread.JNICmd.CMD_PEN_UP, xx, yy );
break;
default:
Utils.logf( "unknown action: " + action );
Utils.logf( event.toString() );
}
return true; // required to get subsequent events
}
// This will be called from the UI thread
@Override
protected void onDraw( Canvas canvas )
{
synchronized( this ) {
if ( layoutBoardOnce() ) {
canvas.drawBitmap( s_bitmap, m_left, m_top, m_drawPaint );
}
}
}
private void init( Context context )
{
m_context = context;
final float scale = getResources().getDisplayMetrics().density;
m_defaultFontHt = (int)(MIN_FONT_DIPS * scale + 0.5f);
@ -209,6 +170,41 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
m_viewHandler = new Handler();
}
public boolean onTouchEvent( MotionEvent event )
{
int action = event.getAction();
int xx = (int)event.getX() - m_left;
int yy = (int)event.getY() - m_top;
switch ( action ) {
case MotionEvent.ACTION_DOWN:
m_jniThread.handle( JNIThread.JNICmd.CMD_PEN_DOWN, xx, yy );
break;
case MotionEvent.ACTION_MOVE:
m_jniThread.handle( JNIThread.JNICmd.CMD_PEN_MOVE, xx, yy );
break;
case MotionEvent.ACTION_UP:
m_jniThread.handle( JNIThread.JNICmd.CMD_PEN_UP, xx, yy );
break;
default:
Utils.logf( "unknown action: " + action );
Utils.logf( event.toString() );
}
return true; // required to get subsequent events
}
// This will be called from the UI thread
@Override
protected void onDraw( Canvas canvas )
{
synchronized( this ) {
if ( layoutBoardOnce() ) {
canvas.drawBitmap( s_bitmap, m_left, m_top, m_drawPaint );
}
}
}
private BoardDims figureBoardDims( int width, int height,
CurGameInfo gi )
{
@ -285,6 +281,9 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
}
m_canvas = new Canvas( s_bitmap );
// Clear it
fillRect( new Rect( 0, 0, width, height ), WHITE );
// need to synchronize??
m_jniThread.handle( JNIThread.JNICmd.CMD_LAYOUT, dims );
m_jniThread.handle( JNIThread.JNICmd.CMD_DRAW );

14
xwords4/common/engine.c
View file

@ -298,7 +298,7 @@ cmpMoves( PossibleMove* m1, PossibleMove* m2 )
} /* cmpMoves */
#endif
#ifdef DEBUG
#if 0
static void
print_savedMoves( const EngineCtxt* engine, const char* label )
{
@ -398,8 +398,6 @@ normalizeIQ( EngineCtxt* engine, XP_U16 iq )
engine->nMovesToSave += XP_RANDOM() % count;
}
}
XP_LOGF( "%s: set nMovesToSave=%d (iq=%d; NUM_SAVED_ENGINE_MOVES=%d)",
__func__, engine->nMovesToSave, iq, NUM_SAVED_ENGINE_MOVES );
}
/* Return of XP_TRUE means that we ran to completion. XP_FALSE means we were
@ -1260,8 +1258,6 @@ set_search_limits( EngineCtxt* engine )
XP_MEMCPY( &engine->miData.lastSeenMove,
&engine->miData.savedMoves[srcIndx],
sizeof(engine->miData.lastSeenMove) );
XP_LOGF( "%s: saved limit move with score: %d", __func__,
engine->miData.lastSeenMove.score );
//engine->miData.lowestSavedScore = 0;
} else {
/* we're doing this for first time */
@ -1293,8 +1289,6 @@ init_move_cache( EngineCtxt* engine )
} else {
engine->miData.curCacheIndex = NUM_SAVED_ENGINE_MOVES;
}
XP_LOGF( "%s: set curCacheIndex to %d", __func__,
engine->miData.curCacheIndex );
}
static PossibleMove*
@ -1310,8 +1304,6 @@ next_from_cache( EngineCtxt* engine )
--engine->miData.curCacheIndex;
}
move = &engine->miData.savedMoves[engine->miData.curCacheIndex];
XP_LOGF( "%s: curCacheIndex now %d", __func__,
engine->miData.curCacheIndex );
}
return move;
}
@ -1321,9 +1313,6 @@ move_cache_empty( const EngineCtxt* engine )
{
XP_Bool empty;
const MoveIterationData* miData = &engine->miData;
XP_LOGF( "%s: usePrev: %d; curCacheIndex: %d; nInMoveCache: %d",
__func__, engine->usePrev, miData->curCacheIndex,
miData->nInMoveCache );
if ( 0 == miData->nInMoveCache ) {
empty = XP_TRUE;
@ -1332,7 +1321,6 @@ move_cache_empty( const EngineCtxt* engine )
} else {
empty = miData->curCacheIndex <= miData->bottom;
}
LOG_RETURNF( "%d", empty );
return empty;
}