mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-04 23:02:02 +01:00
move BoardDims into jni/
This commit is contained in:
parent
69285d46a9
commit
26eff37c6b
5 changed files with 53 additions and 5 deletions
|
@ -32,9 +32,10 @@ import android.graphics.drawable.BitmapDrawable;
|
||||||
import android.graphics.drawable.Drawable;
|
import android.graphics.drawable.Drawable;
|
||||||
import android.os.Handler;
|
import android.os.Handler;
|
||||||
|
|
||||||
|
import org.eehouse.android.xw4.jni.BoardDims;
|
||||||
|
import org.eehouse.android.xw4.jni.CommonPrefs;
|
||||||
import org.eehouse.android.xw4.jni.DrawCtx;
|
import org.eehouse.android.xw4.jni.DrawCtx;
|
||||||
import org.eehouse.android.xw4.jni.DrawScoreInfo;
|
import org.eehouse.android.xw4.jni.DrawScoreInfo;
|
||||||
import org.eehouse.android.xw4.jni.CommonPrefs;
|
|
||||||
import org.eehouse.android.xw4.jni.JNIThread;
|
import org.eehouse.android.xw4.jni.JNIThread;
|
||||||
import org.eehouse.android.xw4.jni.XwJNI;
|
import org.eehouse.android.xw4.jni.XwJNI;
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,48 @@
|
||||||
|
/* -*- compile-command: "cd ../../../../../../; ant debug install"; -*- */
|
||||||
|
/*
|
||||||
|
* Copyright 2009-2013 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 as
|
||||||
|
* published by the Free Software Foundation; either version 2 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful, but
|
||||||
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.eehouse.android.xw4.jni;
|
||||||
|
|
||||||
|
|
||||||
|
// Why does this have to be its own class...
|
||||||
|
public class BoardDims {
|
||||||
|
public int left, top;
|
||||||
|
public int width, height; // of the bitmap
|
||||||
|
public int scoreWidth, scoreHt;
|
||||||
|
public int boardWidth, boardHt;
|
||||||
|
public int trayTop, trayHt;
|
||||||
|
public int cellSize, maxCellSize;
|
||||||
|
public int timerWidth;
|
||||||
|
|
||||||
|
// public String toString()
|
||||||
|
// {
|
||||||
|
// return "width: " + width
|
||||||
|
// + " height: " + height
|
||||||
|
// + " left: " + left
|
||||||
|
// + " top: " + top
|
||||||
|
// + " scoreHt: " + scoreHt
|
||||||
|
// + " scoreWidth: " + scoreWidth
|
||||||
|
// + " boardHt: " + boardHt
|
||||||
|
// + " trayTop: " + trayTop
|
||||||
|
// + " trayHt: " + trayHt
|
||||||
|
// + " cellSize: " + cellSize
|
||||||
|
// + " maxCellSize: " + maxCellSize;
|
||||||
|
// }
|
||||||
|
}
|
|
@ -32,7 +32,6 @@ import java.util.Arrays;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.concurrent.LinkedBlockingQueue;
|
import java.util.concurrent.LinkedBlockingQueue;
|
||||||
|
|
||||||
import org.eehouse.android.xw4.BoardDims;
|
|
||||||
import org.eehouse.android.xw4.ConnStatusHandler;
|
import org.eehouse.android.xw4.ConnStatusHandler;
|
||||||
import org.eehouse.android.xw4.DBUtils;
|
import org.eehouse.android.xw4.DBUtils;
|
||||||
import org.eehouse.android.xw4.DbgUtils;
|
import org.eehouse.android.xw4.DbgUtils;
|
||||||
|
@ -352,7 +351,7 @@ public class JNIThread extends Thread {
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CMD_SETDRAW:
|
case CMD_SETDRAW:
|
||||||
XwJNI.board_setDraw( m_jniGamePtr, (DrawCtx)args[0] );
|
XwJNI.board_setDraw( m_jniGamePtr, (DrawCtx)args[0] ); // here
|
||||||
XwJNI.board_invalAll( m_jniGamePtr );
|
XwJNI.board_invalAll( m_jniGamePtr );
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
package org.eehouse.android.xw4.jni;
|
package org.eehouse.android.xw4.jni;
|
||||||
|
|
||||||
import android.graphics.Rect;
|
import android.graphics.Rect;
|
||||||
import org.eehouse.android.xw4.BoardDims;
|
import org.eehouse.android.xw4.jni.BoardDims;
|
||||||
|
|
||||||
public interface SyncedDraw {
|
public interface SyncedDraw {
|
||||||
void doJNIDraw();
|
void doJNIDraw();
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
package org.eehouse.android.xw4.jni;
|
package org.eehouse.android.xw4.jni;
|
||||||
|
|
||||||
import android.graphics.Rect;
|
import android.graphics.Rect;
|
||||||
import org.eehouse.android.xw4.BoardDims;
|
import org.eehouse.android.xw4.jni.BoardDims;
|
||||||
|
|
||||||
// Collection of native methods
|
// Collection of native methods
|
||||||
public class XwJNI {
|
public class XwJNI {
|
||||||
|
|
Loading…
Reference in a new issue