Commit graph

47 commits

Author SHA1 Message Date
Eric House
938756a34f switch for loop to using C99-style variable declarations; no other change 2014-11-25 06:09:18 -08:00
Eric House
3fe3b1724a replace stacked tracking of env with explicit mapping from pthread to
env for that thread to fix occasional assertion failure that indicated
I was using the wrong env occasionally.  I'm not super confident in
this because I've seen the env for a thread change, but that could be
due to reuse of the thread id.
2014-10-22 06:58:42 -07:00
Eric House
878a16b3bc snapshot: android compiles, and works well enough to exchange moves
via relay!  Lots of changes, mostly around treating connTypes as a Set
inside the java world.  Jni to translate to that is a pain.
2014-10-16 06:45:24 -07:00
Eric House
fa3a2c1c5e don't crash if somehow a game gets opened without a dict 2014-09-30 21:20:47 -07:00
Eric House
9d9c822bb8 save, commented out, how to call the contstructor of a nested class -- in case I go back to doing things that way. 2014-03-09 14:23:24 -07:00
Eric House
339e784d7c fix compile warnings 2014-02-10 18:23:03 -08:00
Eric House
b29dcb1d2c add debug-only logging toward figuring out occasional bad-dict crash 2014-01-31 07:55:07 -08:00
Eric House
a26dced506 drawing tray tiles can fail, e.g. when font info not yet available, so
only clear bits when successful. Fixes problem where tray didn't get
drawn until tiles were somehow invalidated.
2013-11-07 07:29:54 -08:00
Eric House
3858893ab2 don't crash on null dctxt 2013-10-31 06:35:23 -07:00
Eric House
9d40930fff pass new param into java, and when it's not the player's turn draw
pending points with his color at half-intensity.
2013-05-31 07:40:42 -07:00
Eric House
d41c1a4ca8 add new param so pending text can be drawn differently when it's not
the player's turn.
2013-05-30 07:17:13 -07:00
Eric House
ee1df7eeb7 replace DeleteLocalRef calls with version that checks for NULL 2012-09-15 15:57:38 -07:00
Eric House
9b0436d1ee Make rem string measure function return boolean to indicate rect will
be invisible rather than setting width and height to 0.  No real
change beyond simplifying/speeding platform code.
2012-07-15 09:30:27 -07:00
Eric House
2e6b64a4e4 complete implementation of java part of one-pass scoreboard draw. Now
looks pretty much identical to what the old code draws except that
rather than having width allocated in proportion to requested size all
get the same width except the one whose score it is which gets 2x.
2012-07-01 17:24:50 -07:00
Eric House
2434d85684 don't pass the same player-1 data for every player 2012-07-01 16:01:01 -07:00
Eric House
89ffd972bf more work on single-pass scoreboard drawing. Now the jni stuff is
finished, but disabled via compile-time flag, and there's a
commented-out rudimentary implementation on the java side.
2012-07-01 10:04:10 -07:00
Eric House
c8e2dff962 start process of compiling with XWFEATURE_SCOREONEPASS enabled by
adding stubbed-out methods and making old methods conditionally
compiled.  No change in code.
2012-06-27 07:08:09 -07:00
Eric House
405cb23023 fix bug where current player's scoreboard would disappear if other
players' names were too long by giving all a the same proportion of
what they request and passing in the percent given in case draw
implementation wants to use it as a cue to truncate.
2012-06-15 06:26:40 -07:00
Eric House
edf13be4c8 I'm getting a crash on 2.1 in the simulator when calling
DeleteGlobalRef then NewGlobalRef on the same ref.  So use a temp to
reverse the order.  May fix reported crash as well.
2012-03-05 20:04:32 -08:00
Eric House
8590aae9b2 fix emacs compile-commands 2012-02-15 18:07:19 -08:00
Eric House
82b232cf74 use a macro instead of lots of repetitions of the package path to make
it easier to modify.
2012-02-13 22:13:23 -08:00
Eric House
a2b5274b6c on ICS CreateGlobalRef doesn't return the same value as is passed in.
So stop assuming it does!  Fixes multiple crashes on ICS and need to
be ported to android_branch.
2012-02-05 19:12:09 -08:00
Andy2
52d02f04dd pass tile value into drawCell(). Java code doesn't use it yet, but I
want to play with drawing cells tray-tile-style when they're big
enough.
2011-12-02 18:58:52 -08:00
Andy2
c5c0fbccae remove unused DrawFocusState params from jni interface 2011-10-04 19:03:27 -07:00
Andy2
3ec97d5c07 Turn "Turn done" into "Pass" when the pending score is 0. To do that
I had to pass the score into draw_trayBegin since
draw_drawPendingScore() isn't called until the first tile's placed.
Note: as long as I'm messinng with this menuitem it should be disabled
when it's not the player's turn.
2011-10-04 18:48:33 -07:00
Eric House
c01981bc8f Make miniwindow stuff compile-time optional. The goal's to use native
features where they look better or are easier to manage, e.g. Toasts
and dialogs on Android.
2011-08-29 20:36:01 -07:00
Andy2
ba026f761d get rid of unused parameter 2011-04-28 18:47:16 -07:00
Andy2
09100dcb2c track lang code of last dict sent and don't send repeats. 2011-04-28 18:41:39 -07:00
Andy2
6aa0d38c45 don't call through to java draw_dictChanged unless it's for the main
game dict.
2011-04-25 20:15:34 -07:00
Andy2
dc70db5ba4 catch up with API change 2011-04-11 06:16:25 -07:00
Andy2
55221c70b0 fix for new API 2011-04-03 21:51:51 -07:00
Andy2
ce64f79cdd add draw_boardBegin 2011-02-24 22:24:24 -08:00
Andy2
c2472c0cb5 don't call java code if rect width is 0. Fixes crash (but not design
problem) where first to connect in room specifies a timer and second
does not.  Second eventually gets message saying there's a timer but
has not layed out space in the board and java freaks out when later
asked to make a 0-width image.  This fix leaves the device not drawing
the timer until the game is reopened.  The better fix would trigger a
re-layout as soon as the change is made.
2010-11-07 14:03:24 -08:00
eehouse
4da3edabbb draw_scoreBegin now returns a boolean 2010-05-12 11:51:55 +00:00
eehouse
9d94f557e1 remove vertScrollBoard from java and stub it out in jni since
preformance is just as good without it.
2010-04-25 18:13:29 +00:00
eehouse
0ffc5c326f don't pass bitmaps into java draw code since they're no longer used. 2010-04-23 08:37:27 +00:00
eehouse
da2cfa5934 changes (commited earlier but now somehow missing) putting
scroll-related fields into a struct so vertical and horizontal can be
handled by the same code; add to board_zoom out params indicating
whether further zooming is possible.
2010-04-15 02:15:50 +00:00
eehouse
0d7b074b72 minimal changes to get zoomin/out working, which they do. But board
coords are off and probably other fixup is needed.
2010-04-08 04:16:16 +00:00
eehouse
5806aa0aca get rid of excess logging 2010-03-21 03:10:47 +00:00
eehouse
08d5139631 translate blank text from '_' to '?' 2010-03-08 06:11:30 +00:00
eehouse
7d0bd9d50c implement mini window, jni and java rendering. Works on emulator, but
may not work as well under fat fingers....
2010-02-27 18:04:33 +00:00
eehouse
de58f33b4c add game time to board and jni; clean up hide/show on check events. 2010-02-18 04:44:30 +00:00
eehouse
c6b28e9416 turned on -Wall and fixed errors/warnings it reported 2010-02-12 07:13:42 +00:00
eehouse
bd611bb6f4 implement dictChanged. And so that utf8 dicts could be opened without
their games being drawn (no BoardActivity around) break the two
android-only callbacks out of UtilCtxt and into a new JNIUtils
interface that then requires new handing in C.
2010-02-11 13:27:09 +00:00
eehouse
f7c8a2f384 Work when initialized with a null instance of DrawCtxt. (All calls
into java world come from java so no guard against that needed.)
2010-02-09 14:21:58 +00:00
eehouse
49402ed218 Get comms info (host name, etc.) from user and pass it through to the
send proc.  Along the way, write jni code to instantiate a new object
including setting enums.  *Now* I'm ready for networking....
2010-01-30 20:06:06 +00:00
eehouse
6dfac28b13 rearrange to work with newer version of ndk and sdk just installed 2010-01-30 03:18:01 +00:00
Renamed from xwords4/android/drawwrapper.c (Browse further)