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
bf67a88c5a
expect the array of dicts passed to include the game dict (as part of
...
changes to always have a game dict and to have player dicts only when
they're different.)
2011-04-25 20:16:38 -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
c814226a08
get rid of gi.dictName: don't pass it across the jni boundary
2011-04-21 18:29:37 -07:00
eehouse@eehouse.org
5a21aea2e5
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2011-04-13 06:58:58 -07:00
Eric House
baedbdff2c
remove logging
2011-04-12 22:17:56 -07:00
Andy2
002bb40a09
report counts/values using language rather than dictionary name. To
...
support that, pass lang name from java into jni.
2011-04-11 18:55:42 -07:00
Andy2
3fb368692c
dammit -- proofread those checkins!
2011-04-11 06:52:07 -07:00
Andy2
c6cd60deef
Save and restore per-player dicts; load games that have 'em correctly.
...
Robots default to BasEnglish dict and humans to CollegeEng. Add new
per-game default for robot dict. Still need to deal with language
changes and non-English case in general.
2011-04-11 06:42:17 -07:00
Andy2
092dfdd590
not supposed to be checked in with debugging on
2011-04-11 06:33:31 -07:00
Andy2
dc70db5ba4
catch up with API change
2011-04-11 06:16:25 -07:00
Andy2
97d54c86eb
snapshot: track dictName per player in addition to per game. Not yet
...
used yet; need to pass into jni next.
2011-04-08 06:50:08 -07:00
Eric House
c77d3039cc
add XP_FREEP. Should be no change in behavior.
2011-04-07 18:07:45 -07:00
Andy2
55221c70b0
fix for new API
2011-04-03 21:51:51 -07:00
Andy2
3b7b4802a9
add ability to specify, track and use separate dictionaries for each
...
player. Works for gtk client. Compiles for Android but there's no UI
yet to specify more than one dict. Management of dupicate dicts
without duplicating memory -- refcounting -- will be up to the
platforms.
2011-04-01 19:57:10 -07:00
Andy2
d9bb5197d4
Add two new menus to be available only when in trade mode. Hide and
...
show them and another group depending on whether trading at the time.
To make that work, replace the individual calls made to dis/enable
toolbar buttons with a single jin call that takes a struct full of
booleans and make that struct available in BoardActivity where menus
are hidden/shown. Remove the individual calls from the jin interface.
2011-03-10 18:13:56 -08:00
Andy2
ce64f79cdd
add draw_boardBegin
2011-02-24 22:24:24 -08:00
Andy2
5afb7aadff
add dict_getTileValue
2011-02-24 22:23:57 -08:00
Andy2
f382f17d20
make game_receiveMessage return even if server doesn't do anything
...
with it -- since caller will use the return value to decide whether to
save state.
2011-02-24 17:33:10 -08:00
Andy2
f956df853d
return "" rather than null when there's no java class backing util --
...
common code is less likely to crash.
2011-02-09 06:17:38 -08:00
Andy2
c587a11ee2
Add turn and isrobot/islocal flags to summaries DB, and use to
...
background in green the player whose turn it is provided that player's
local.
2011-02-04 06:20:40 -08:00
Andy2
c2be642302
add game_getGi to fetch into java world any changes to the gi in the
...
jni world.
2011-02-01 18:53:29 -08:00
Andy2
383206f5dc
move bonus squares into jni since they're constant rather than e.g. in
...
an editable resource.
2011-02-01 18:52:29 -08:00
Andy2
977feada82
use a reference to a byte array in the java heap (locking down the
...
object) rather than allocating a new array in the C heap -- for the
DAWG data of a dictionary. This can use up to 5% of the java heap for
huge dictionaries, but I'm hoping it fixes a problem reported by a
user of the large German dictionary that seems to involve allocation.
If I'm reading correctly, as long as I stay within 16M (24M or more on
newer devices) I'm sure to get my memory in the java world while it's
less a sure thing in the JNI world (where in addition linux's
aggressive overallocation is used, meaning I'll fail when I try to
swap in memory on write rather than get back NULL from malloc.)
2011-01-31 18:56:20 -08:00
Andy2
d2ddc5cee7
turn off tile selection for android
2011-01-12 19:01:04 -08:00
Andy2
6495bd321f
fix to compile with robotiq changes
2011-01-10 06:57:10 -08:00
Andy2
ff6fb7070e
Android market reports a few crashes going out-of-bounds on array of
...
bad words. Add an assertion on the only path that seems likely to be
causing that.
2010-12-17 18:57:43 -08:00
Andy2
53de4eab9b
correctly detect empty dict and set top ptr to null. Fixes crash
...
using empty dicts.
2010-12-17 18:54:27 -08:00
eehouse@eehouse.org
64bcb8bb2b
Revert "replace call to rand() with android_only function that reads two bytes"
...
This reverts commit 1653b9f6e9
.
2010-12-08 05:38:41 -08:00
Andy2
4a12f7a96f
Revert "in attempt to work around non-random rand() in jni world, call back"
...
This reverts commit 99c92e779d
.
Conflicts:
xwords4/android/XWords4/jni/utilwrapper.c
2010-12-07 18:43:53 -08:00
eehouse@eehouse.org
fcd179f6b7
Merge remote branch 'origin/android_branch' into dawg_fixup
2010-12-06 18:50:13 -08:00
Andy2
f50e6b3f1b
turn dict_getLangCode into dict_getInfo, adding a struct that contains
...
lang code and new word count.
2010-12-06 18:25:23 -08:00
Andy2
ff9e03ef4b
read rather than just skipping word count
2010-12-06 07:30:28 -08:00
Andy2
e2bb50ef62
skip new header if present
2010-12-06 07:22:07 -08:00
Eric House
c4cdc24b78
initial changes to add a header to xwd format so that stuff like
...
number of words can be included. Changed to build dicts and linux to
open them. Android still needs to learn. Also, some of the tools in
dawg/ need to be fixed to read old-format (pre-utf8) .xwd files.
2010-12-05 19:33:10 -08:00
Andy2
426f990156
fix infinite loop creating networked game: util_rand() can't call into
...
java in some cases so needs to fall back to returning rand().
2010-12-03 06:43:40 -08:00
Andy2
984a5d6154
Fix yet again what shouldn't have been checked in.
2010-12-02 22:37:21 -08:00
Andy2
99c92e779d
in attempt to work around non-random rand() in jni world, call back
...
into the java world by making it a util_ctxt function. Do same on
linux to test. We'll see how it is -- and can back this commit out if
there's no improvement.
2010-12-02 19:02:36 -08:00
Andy2
2e956e2f6e
debug is not supposed to be checked in turned on
2010-12-01 18:13:55 -08:00
Andy2
1653b9f6e9
replace call to rand() with android_only function that reads two bytes
...
from /dev/urandom. rand() has been returning pretty crappy numbers
resulting in lots of clustering of tiles in trays. Let's see if this
is any better.
2010-11-29 17:12:12 -08:00
Andy2
71059e6dff
remove nPlayers from game_summarize
2010-11-19 18:23:34 -08:00
Andy2
82876bda06
add seed and fetch it in jni
2010-11-08 17:23:16 -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
Andy2
f36b253ae7
add number of players to GameSummary. Changes DB but it's already
...
changed since last beta so I'm not upping the version.
2010-11-06 18:24:44 -07:00
Andy2
b115ce14ed
add devOrder (= hostID) to params passed on connect. Fix to pass new
...
param from jni; use object to pass params into UI thread since there
are now too many for handler.
2010-10-29 06:34:39 -07:00
Andy2
4cd15a9c6a
Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy
...
Conflicts:
xwords4/common/comms.c
2010-10-29 05:27:07 -07:00
Andy2
645a042481
add room name to callback used when device connects: fix jni to compile
2010-10-28 18:46:28 -07:00
Andy2
ddeb744ff7
init room name to empty string
2010-10-28 18:43:06 -07:00
Eric House
4ae58342da
test, don't assert: comms can be null
2010-10-28 05:45:56 -07:00
Eric House
eba5b77494
add comms_isConnected; public room variables default to false
2010-10-27 20:50:11 -07:00
Andy2
99dbbb443c
add comms_canChat, which knows better than java code what state a
...
connected game is in, and call it to determine whether to show the
chat icon.
2010-10-21 19:14:10 -07:00
Andy2
cb4092bb39
make relayID a String rather than a byte[]; log result of pending
...
messages query to confirm working.
2010-10-06 05:21:19 -07:00
Eric House
b3c7cb3711
start on sending chat messages. Doesn't even compile -- committing to get onto another machine.
2010-10-04 05:38:05 -07:00
Eric House
1e13e92deb
support for receiving and displaying chat messages. Compiles but not tested.
2010-10-03 18:32:39 -07:00
Andy2
4ea9ff8226
add server_reset and util_setIsServer to jni
2010-09-24 18:45:42 -07:00
Andy2
b742c7dbb7
add new booleans to relay address record around public rooms
2010-09-03 06:38:46 -07:00
Andy2
c6c1a93de5
copy new dictLang field java<->c
2010-09-01 06:51:09 -07:00
Andy2
cf6d8efb29
new jni method to get lang code. Takes a dict's raw bytes and builds
...
a dict object just to fetch the code, which is pretty inefficient, so
caching should be added later on the java side.
2010-08-25 06:33:16 -07:00
Andy2
a34ccb424f
device now passes list of "relayID"s, consisting of connName plus
...
device id, to relay, one for each stored game that's communicating via
the relay. Relay parses out each relayID. Next relay can use these
to look up whether messages are available and reply with that, and
device can put up a notification.
2010-08-22 12:16:57 -07:00
Andy2
51d759569a
call srand with current time (attempting to fix what may be duplicate
...
seeds on relay, possible if rand() always starts with same sequence on
different devices in new process); add commented-out logging util_rand
implementation.
2010-07-29 06:53:06 -07:00
Andy2
fb8692fb9f
add preference for allowPeek
2010-07-17 07:06:33 -07:00
Andy2
2bf3cbd7e2
turn on CROSSHAIRS -- somehow lost during merge.
2010-07-16 19:18:55 -07:00
Eric House
546ddf33ae
add util_turnChanged
2010-07-10 17:05:17 -07:00
Andy2
f848473c1a
turn off KEYBOARD_NAV
2010-07-09 06:51:34 -07:00
Andy2
6b9b97231a
fix to compile with KEYBOARD_NAV undefined
2010-07-09 06:49:32 -07:00
Andy2
1c218513f1
define SHOW_PROGRESS: when blanks present search takes too long not to
...
show some sort of progress indicator
2010-07-08 07:04:40 -07:00
Andy2
7595b36037
add engineStopping and engineStarting (stubbed out so far)
2010-07-08 07:03:56 -07:00
Andy2
40323b03d2
board_canFlip -> board_visTileCount
2010-07-08 06:38:51 -07:00
Andy2
af2d2c71b5
add board_canHint to jni
2010-07-07 18:47:22 -07:00
Andy2
07940099ed
add new param to board_requestHint
2010-07-07 06:49:36 -07:00
Andy2
2c2e0b9029
export to jni and use new functions for redoing pending tiles and
...
testing whether undo/redo is possible.
2010-07-03 11:51:27 -07:00
Andy2
6946cbc499
export board_canShuffle via jni
2010-07-01 18:56:18 -07:00
Andy2
2f59836fc4
export board_canFlip
2010-07-01 06:37:22 -07:00
Andy2
1c910d5169
turn off debugging so device builds can be from unmodified source.
2010-06-26 12:40:04 -07:00
Andy2
1866c5ccab
add toolbar at bottom to test spacing
2010-06-25 08:14:18 -07:00
Andy2
adfb4d7a6a
bug: wasn't passing changed prefs to server, only to board. So rather
...
than export server_prefsChanged via jni replace board_prefsChanged
with a new method that calls both.
2010-06-17 18:51:10 -07:00
Eric House
34ecac303a
make optional and then turn off feature whereby tap in empty part of
...
tray undoes current move. It's too easy to hit this on a capacitive
display.
2010-06-06 13:32:12 -07:00
eehouse
9f797afe73
export comms_resetSame through jni
2010-06-05 03:39:38 +00:00
eehouse
a80d874e9d
change api for board_zoom and change callers. No effect on java and
...
no behavior change.
2010-06-05 03:39:06 +00:00
eehouse
c7bedc297c
include new param to board_zoom
2010-06-02 04:58:53 +00:00
eehouse
24c1527232
fix yOffsetChanged to follow new API, but still leave commented out;
...
set game file name from resource, and make visible in board title and
as part of games list entries.
2010-05-12 11:56:01 +00:00
eehouse
4da3edabbb
draw_scoreBegin now returns a boolean
2010-05-12 11:51:55 +00:00
eehouse
671461f4d4
extend getSummary() to include array of current scores; add util to set an object
...
field and remove dead code
2010-05-05 04:11:08 +00:00
eehouse
d143c47aa1
fill new GameSummary fields
2010-05-01 02:49:08 +00:00
eehouse
e9f1bbd37d
param name change
2010-05-01 02:47:47 +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
5d31c18658
copy dict name into dict struct so e.g. Counts and Values works
2010-04-23 08:36:20 +00:00
eehouse
8067e82332
pass dict name into jni along with its bytes
2010-04-23 08:35:38 +00:00
eehouse
c2c463171c
fix dict_splitFaces to work for utf8 -- by calling into existing java
...
code. Fixes multi-device play with Catalan dict.
2010-04-22 04:56:48 +00:00
eehouse
94d3f7483c
Since we're not using bitmaps any more remove the code to parse and
...
convert them.
2010-04-22 04:56:14 +00:00
eehouse
fbe46c1284
pass boolean isUTF8 in from jni, and if false create InputStreamReader
...
to decode ISO8859_1 rather than utf-8. Fixes problem with Ñ in old
Spanish dicts. Should fix all pre-utf8-format dicts, actually.
2010-04-20 02:38:42 +00:00
eehouse
d1e8b95843
add assert that would have helped
2010-04-17 04:15:20 +00:00
eehouse
d66e74a301
turn off logging for release
2010-04-15 03:35:33 +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
477899e6aa
add debug-only source file
2010-04-13 03:22:08 +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
6bd818a10f
set drag threshold to 1; 3 is just wrong on android
2010-04-08 04:13:59 +00:00
eehouse
812262e41d
add basic framework to collect metadata prior to saving open game
...
(e.g. number of moves) and display it in game list. What to save and
how to display it still not finalized but it works.
2010-04-08 04:09:50 +00:00