Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-03 23:04:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
5411 commits 21 branches 243 tags 33 MiB
Commit graph

5347 commits

Author SHA1 Message Date
Eric House
a2319a8073 experimental additions, mostly compile-time disable-able, so prune 
dict by wordlen.
 2011-11-03 21:25:51 -07:00
Andy2
948def8223 replace burried launch-dict-browser menuitem with toolbar button and 
newbie hint.
 2011-11-03 18:14:01 -07:00
Andy2
8db6b0bddd wrap toolbar in a HorizontalScrollView. Comes into action when all 
buttons are enabled.
 2011-11-03 17:24:56 -07:00
Andy2
1de9f806e9 test dict_countWords() 2011-11-03 06:19:07 -07:00
Andy2
627410250f reuse existing code in dict_countWords() 2011-11-03 06:18:53 -07:00
Andy2
4f29f51253 turn dict iter feature on for linux for good 2011-11-03 06:18:15 -07:00
Andy2
d19858d6bb add (buried) menuitem to launch dict browser from game. Required 
adding method to get current player from BoardView.
 2011-11-03 05:51:38 -07:00
Andy2
6e58963231 sign up to handle keyboard/orientation changes for dict browser 2011-11-03 05:32:36 -07:00
Andy2
eace89000b save text size rather than figure each time 2011-11-03 05:20:38 -07:00
Andy2
a5498ee33a fix find to return position rather than boolean 2011-11-03 05:20:11 -07:00
Andy2
56fc73e78a don't go straight from tap on dict word to browser: add bool so that 
even if there's only one lookup URL it'll be listed and user can
quickly cancel.
 2011-11-02 18:48:13 -07:00
Andy2
c222f08252 catch up with API changes. 2011-11-02 18:46:06 -07:00
eehouse@eehouse.org
ae118e78a3 Merge branch 'android_branch' into android_browsedict 2011-11-02 18:32:26 -07:00
Andy2
5c995af38c stop changing formats between internal and external structs 
(iterators); use internal format all the time for speed.  Update linux
test code for new API.
 2011-11-02 18:32:00 -07:00
Andy2
7231bd4be3 make dict entries text size bigger 2011-11-02 05:18:10 -07:00
Andy2
8704acfbf1 launch dict browser from tap on dict rather than contextual menu on it. 2011-11-02 05:06:53 -07:00
Andy2
050a68ce42 use XP_REALLOC now that it's fixes 2011-11-02 05:04:31 -07:00
eehouse@eehouse.org
04b8c09128 Merge branch 'android_branch' into android_browsedict 2011-11-02 04:39:51 -07:00
Andy2
ab4ccb1a22 use realloc for testing 2011-11-02 04:39:12 -07:00
Andy2
38867b2875 fix bug in debug free following debug realloc to smaller size 2011-11-02 04:38:39 -07:00
Andy2
eb2b139e48 add some consts and better test for null index data 2011-11-01 18:47:20 -07:00
Andy2
b822f573d6 use getStartsWith() to implement search; add dict name and word count to 
title; change text of menu item that launches dict browser from
Details to Browse
 2011-11-01 18:45:41 -07:00
Andy2
9f2158f094 add dict_getStartsWith to jni 2011-11-01 18:43:36 -07:00
Andy2
482aca5cfb fix crash due to bad allocation of indexing data space. First cut 
used XP_REALLOC, but that turns out to be broken, at least on android.
Haven't really used it before...
 2011-11-01 18:33:29 -07:00
Andy2
5827127ceb add some consts and better test for null index data 2011-11-01 18:18:06 -07:00
Andy2
fc4a5c31f4 silence picky compiler 2011-10-31 21:11:52 -07:00
Andy2
11b7ed1e8e fix to compile with new dictiter files 2011-10-31 21:11:22 -07:00
Andy2
3b04cb542c silence picky compiler 2011-10-31 21:11:10 -07:00
eehouse@eehouse.org
45de6c734b Merge branch 'android_branch' into android_browsedict 2011-10-31 21:06:04 -07:00
Andy2
0d4404d43b add dict_getStartsWith(), and code to test it. Lots of cleanup and 
bugfixing of dictiter code as well.
 2011-10-31 21:05:34 -07:00
Andy2
88f556356c dict_tileForString -> dict_tilesForString 2011-10-31 20:56:48 -07:00
Andy2
69b1b4da27 break dict iteration stuff out into new files. No code change 
otherwise.
 2011-10-31 18:30:55 -07:00
Andy2
3c53da46ce fix to compile with changed API. Crashes, but want to fix up API in 
other branch before debugging here....
 2011-10-31 18:22:33 -07:00
eehouse@eehouse.org
24d95675c7 Merge branch 'android_branch' into android_browsedict 2011-10-31 07:03:34 -07:00
eehouse@eehouse.org
916d817ef2 Merge remote branch 'origin/android_branch' into android_branch 2011-10-31 07:02:30 -07:00
eehouse@eehouse.org
ff3a8d4179 Merge branch 'android_branch' into android_browsedict 2011-10-31 06:38:16 -07:00
Andy2
1d34c26ebc remove unneeded parama 2011-10-31 06:37:53 -07:00
Andy2
dc58d123d5 combine params into single struct 2011-10-31 06:34:21 -07:00
Eric House
491c9d06d6 reverse sense of option to mmap dicts by default 2011-10-29 20:31:47 -07:00
Andy2
7d1e9c7638 Merge branch 'android_branch' into android_browsedict 
Conflicts:
	xwords4/android/XWords4/jni/Android.mk
	xwords4/android/XWords4/res/values/strings.xml
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
 2011-10-28 22:27:22 -07:00
Andy2
8f3c4f6426 add config option to enable face-up tile picking 2011-10-28 22:24:47 -07:00
Andy2
8d228ae190 turn on face-up tile picking for Android (though there's no prefs UI 
to enable it for a game yet).  In common code, break pick tile utils
method in two, one for blank and the other for tray tiles.  In java,
implement dialog for picking the tiles.  Works, though is a bit clumsy
to have the dialog come and go after every pick.  Better would be a
dialog that stays up and accumulates picks -- but it'd have to know to
reduce the set of tile choices as letters are chosen.  This'll do for
now.
 2011-10-28 22:15:56 -07:00
Andy2
390e7558b0 Merge branch 'android_branch' into android_browsedict 
Conflicts:
	xwords4/common/dictnry.c
 2011-10-28 21:00:01 -07:00
Eric House
f6ff3e85c6 Merge remote branch 'origin/android_branch' into android_branch 
Conflicts:
	xwords4/common/dictnry.c
	xwords4/common/dictnry.h
	xwords4/linux/linuxmain.c
 2011-10-28 20:54:55 -07:00
Eric House
71450b02b3 use indexing (and add binary search) to double speed of getNthWord 2011-10-28 20:27:16 -07:00
Eric House
ff89ffb168 add missing backup button to fully test tile picking 2011-10-28 20:23:59 -07:00
Andy2
4df13f5617 fix missing dict language 2011-10-28 06:39:47 -07:00
Andy2
b490618c8e silence warning with cast 2011-10-28 06:34:59 -07:00
Eric House
84044fa9ee move lookup dialog into superclass so can be used from dict browser. 2011-10-27 21:10:35 -07:00
Eric House
308720186d get all word-click events and print contents -- setting up for lookup 2011-10-27 18:43:28 -07:00
Eric House
1741021c3c add search field and button. Not yet wired to do anything. 2011-10-27 18:26:48 -07:00
Eric House
ed055b83c6 export index from jni and use for fastscrolling. Works, but is a bit slow still. 2011-10-27 07:01:57 -07:00
Eric House
5282246dd6 use <cr> and previx separator, not terminator, so java-side split() doesn't end list with empty str. 2011-10-27 07:00:57 -07:00
Eric House
4818a2919d Merge branch 'android_branch' into android_browsedict 2011-10-26 22:25:54 -07:00
Eric House
42d1a48a1d don't include indices for prefixes that don't exist. 2011-10-26 22:25:21 -07:00
Eric House
412a58f6b9 make dict_makeIndex work for depth > 1. 2011-10-26 22:20:21 -07:00
Eric House
f2c4e39cd4 add dict_makeIndex(). Works, but only for depth==1 so far (A, not AA or AAA). 2011-10-26 07:10:50 -07:00
Andy2
92f692510f outline for fastscroll with thumb. Will need jin support mapping 
indices <-> first letters, e.g. BB to whatever the index is of the
first word starting with BB.
 2011-10-25 19:33:55 -07:00
Andy2
a7ce5a43de fix so count comes from dict; combine two jni methods into one; fix 
crash in destructor.  Now an entire dict can be scrolled through if
you have the patience.
 2011-10-25 18:36:12 -07:00
eehouse@eehouse.org
57487aaf3e Merge branch 'android_branch' into android_browsedict 2011-10-25 06:49:32 -07:00
Andy2
b62fe13c97 move dict iterator test into separate function and add test for 
dict_getNthWord().  Still ifdef'd out.
 2011-10-25 06:48:59 -07:00
Andy2
fc973079dc add first cut at dict_getNthWord. Works. Is slow. 2011-10-25 06:48:16 -07:00
Andy2
74cf751729 use existing dict iteration APIs to implement jni that adequately 
displays a dict.  But I don't have a getNth in C to implement the one
I've added in java; need to add that, and caching, to speed it up.
 2011-10-24 20:15:52 -07:00
eehouse@eehouse.org
a75aa88c58 Merge branch 'android_branch' into android_browsedict 2011-10-24 18:27:33 -07:00
Andy2
ac214236c4 add code to walk dict backwards as well, and test code that 
succesfully walks huge dicts in both directions turning out the same
list of words either way.  Still compile-time disabled.
 2011-10-24 18:27:16 -07:00
Andy2
b08f9770cf add dictionary browser. For now it just adds items to the list that 
give the position so I can get a feel for how it works.  Will use this
to figure out the right API for a dictionary iterator.
 2011-10-23 19:35:15 -07:00
Andy2
c237717de5 dict_getInfo returns false if the dict doesn't parse so can be used to 
test validity of downloaded dict.  Internally (in jni), add lots of
checks that format is correct and we don't run off end of ptr walking
truncated dict.
 2011-10-23 14:21:57 -07:00
Andy2
7c7cd82e0a add code to iterate over words in a dict. Works on Linux (iterating 
forward only) but disabled at compile time.  Idea's to have a dict
browser.  There was some simple refactoring in common code Android
uses, and that tests fine.
 2011-10-21 18:51:33 -07:00
Andy2
201c32e4db add support for download directory as a place where we look for dicts 
and to/from which dicts can be moved.  Right now it's just
/sdcard/download.  Dunno if that's universal.  There seems not to be
API except in newer SDK versions for finding it.
 2011-10-20 20:22:36 -07:00
Andy2
4eee7f8aa7 Pass selected tiles into new util function, and from there into java 
world, so confirming query can include them.
 2011-10-19 18:34:26 -07:00
Andy2
f41d3c27e6 Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/common/server.c
 2011-10-19 06:23:16 -07:00
Andy2
d63f6961d4 fix log comment to correctly identify site. 2011-10-18 21:29:59 -07:00
Andy2
c2a7a5c347 fix crash: don't destroy stream if for some reason it's null. Not 
sure how that happens, but it does.
 2011-10-18 21:29:40 -07:00
Andy2
90b0a4e46f if words stream is null, don't pass into java code (where current impl 
will get a NPE)
 2011-10-18 21:28:50 -07:00
Andy2
652b7e703a Remove difference between debug- and non-debug stream format. 2011-10-18 21:27:28 -07:00
Andy2
b31e829414 Remove file-format differences between debug and non-debug versions. 
Fix curses to compile non-debug.
 2011-10-18 18:52:37 -07:00
eehouse@eehouse.org
b8adbd94c1 Merge branch 'android_branch' into send_in_background 2011-10-18 06:47:38 -07:00
Andy2
028c416587 don't disable player listing when game is in play and locked; allow 
users to see info about players and change dict.
 2011-10-18 06:46:46 -07:00
Andy2
71fabdac95 add changelist change 2011-10-18 06:35:26 -07:00
Andy2
214debca47 up strings for beta 37 2011-10-18 06:16:15 -07:00
Andy2
ff82c20b2c fix brokenness (black-on-black text in lookup dialog) on 2.2 and 
beyond by copying in layout for built-in list items and hard-coding
white text color.  This is risky/fragile but I can't find another fix.
 2011-10-17 21:33:11 -07:00
Andy2
dc84cfcb97 cleanup/reformat. No code change. 2011-10-17 20:27:51 -07:00
Andy2
235259ef45 a bit more tuning of model_listWordsThrough()... 2011-10-17 18:26:04 -07:00
Andy2
3b7532aba8 improve stack_redo() to return the redone move, and use that to avoid 
making a copy of the move stack in model_listWordsThrough()
 2011-10-17 18:16:19 -07:00
Andy2
9109396ae9 in model_listWordsThrough, only undo as much as needed to find the 
move tile that places a tile on the cell we're interested in.
 2011-10-17 06:48:59 -07:00
Andy2
8062a027e7 cleanup: NULL's a legal value now. 2011-10-17 06:48:13 -07:00
Andy2
b02e0eb9cf actually list words: makes a better test. 2011-10-17 06:47:49 -07:00
Andy2
29eec38821 remove unused strings 2011-10-16 17:59:00 -07:00
eehouse@eehouse.org
5afb0ae145 Merge branch 'android_branch' into send_in_background 2011-10-14 22:34:29 -07:00
Andy2
6793742f0f remove option to list all words played in a single lookup dialog, and 
supporting code in the jni/common C.
 2011-10-14 22:32:30 -07:00
Eric House
46392da205 Fix crash when password dialog comes up second time: don't be cute and 
reuse custom views as they remember their parent and that needs to be
cleared.  Just recreate each time and let gc() do its job.
 2011-10-14 19:07:19 -07:00
Eric House
851b2d296f Should have gone with last checkin: delete of file due to renaming. 2011-10-14 19:05:07 -07:00
Eric House
e848b150b5 rename LookupActivity->LookupView since it's not an Activity any more. 2011-10-14 18:45:47 -07:00
Eric House
0b54b190b6 make lookup dialog a mere dialog rather than an activity to fix 
too-slow transitions to and from it.  Works by keeping code in
separate custom view and not setting buttons or anything else on the
dialog.
 2011-10-14 18:39:39 -07:00
Andy2
0e6b4d749f When pen held on committed tile on board, cons up list of all words 
played that include that tile and pass to new util_cellSquareHeld()
method.  In java implementation of that method, use existing lookup
activity code to display list of words.  Enabled on the C side by a
compile-time flag in case it has problems.  Right now the time spent
saving a game before launching the lookup activity, and reloading it
after, is pretty apparent, but that's in emulator which is slow.
 2011-10-13 19:14:08 -07:00
Andy2
7449923328 log tiles left in pool -- makes progress of automated/test games 
easier to follow.
 2011-10-13 19:10:13 -07:00
Andy2
01459285d5 show dict as comment beside player name in players list. And since 
dicts change when language does, put language choice above players
list.
 2011-10-12 18:37:31 -07:00
Andy2
0dfa69b1b2 implement pen timer with timeout, not idle. 2011-10-11 19:38:26 -07:00
Eric House
861a24dfeb Merge branch 'android_branch' into send_in_background 2011-10-10 22:42:28 -07:00
Eric House
f86b0dfcc5 fix to compile on x86 (with newer compiler that doesn't like unused variables) 2011-10-10 22:42:02 -07:00
Eric House
eb60bfade7 fix to compile on x86 (with newer compiler that doesn't like unused variables) 2011-10-10 22:40:05 -07:00
Andy2
9551f29335 up strings for beta 36. I'm skipping b35 rather than try to move the tag. 2011-10-10 22:30:38 -07:00
Andy2
4bb61401bd fix crash: src and dest stream params were reversed. 2011-10-10 22:24:44 -07:00
eehouse@eehouse.org
99707e4029 Merge branch 'android_branch' into send_in_background 2011-10-10 18:31:30 -07:00
Andy2
92a2fb1a1f attach newbie info to the lookup button 2011-10-10 18:24:06 -07:00
Andy2
cdf57d3bb7 cleanup 2011-10-10 06:53:46 -07:00
Andy2
d5ca5bbd0d remove misplaced assert: in network games illegal words may well 
arrive.
 2011-10-10 06:48:07 -07:00
Andy2
c3ba50c905 up strings for beta 35 2011-10-07 18:59:32 -07:00
Andy2
03543c17ea fix NPE I got once, presumably when activity shutting down. 2011-10-07 18:59:17 -07:00
Andy2
febf32040e don't kill xwords; it'll exit when it's done 2011-10-07 18:51:27 -07:00
Andy2
da5da3dd89 wait for connection rather than asserting immediate success so can be 
started before server.
 2011-10-07 18:50:37 -07:00
eehouse@eehouse.org
8712918e73 Merge branch 'android_branch' into send_in_background 2011-10-07 05:49:52 -07:00
Andy2
f03699f701 add newbie warning/request for languages with only google as 
word-lookup site.
 2011-10-06 19:03:07 -07:00
Andy2
f084661ec3 Never meant to check in having lookup menuitem at top level. 2011-10-06 18:47:08 -07:00
Andy2
152a9175c6 use dialog theme for lookups -- just works now, though didn't at first. 2011-10-06 18:44:59 -07:00
Andy2
a129f353f5 fix assertion by skipping states only when applicable, and running in 
a loop so works in either direction.  Cleanup -- this is done.
 2011-10-06 18:44:24 -07:00
Andy2
0a474804ce fix to work with bundling, i.e. by removing configChanges entry in 
AndroidManifest.xml and changing orientation.
 2011-10-06 18:25:17 -07:00
Andy2
d8c1e3822b fix problems with skipping singleton words and URLs; replace window 
title with TextView.
 2011-10-06 17:47:00 -07:00
eehouse@eehouse.org
6bf8d5abeb Merge branch 'android_branch' into send_in_background 2011-10-06 06:51:05 -07:00
Andy2
a9b467c903 make adapter based on static array static 2011-10-06 06:31:04 -07:00
Andy2
e292056b9c add new activity (with layout) to replace dialogs for word lookup. 
Lots of code moved there from BoardActivity.
 2011-10-06 06:26:46 -07:00
eehouse@eehouse.org
471a9d988d Merge branch 'android_branch' into send_in_background 2011-10-05 07:10:52 -07:00
Andy2
aaf0ba34e4 add a couple of French word lookup URLs. 2011-10-05 06:55:25 -07:00
Andy2
90f11abc37 add to game state passed into java world whether it's the cur selected 
player's turn, and use that to enable/disable Pass/Turn done button.
 2011-10-05 06:36:01 -07:00
Andy2
179560867f for symmetry, remove default menu title from res file and set in code 
either way.
 2011-10-05 06:14:48 -07:00
Andy2
c5c0fbccae remove unused DrawFocusState params from jni interface 2011-10-04 19:03:27 -07:00
Andy2
dc20b04a4c remove unused param (on the C/jni side) 2011-10-04 18:54:53 -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
eehouse@eehouse.org
82615f409b Merge branch 'android_branch' into send_in_background 2011-10-04 06:49:19 -07:00
Andy2
f4b8b2806e remove unused parameter 2011-10-04 06:48:53 -07:00
Andy2
5dd21a16ea don't crash if words stream is null, as it will be when turn's a pass. 2011-10-04 06:45:16 -07:00
Andy2
c04f981442 fix new word-list reporting to work for networked games too: create 
and save a second stream parallel to the existing one reporting the
move scoring.  Requires bump in stream version.
 2011-10-04 06:44:29 -07:00
Andy2
3cf1d07df3 optimization: set up word-tracking invariants on init rather than each 
time used
 2011-10-04 06:21:02 -07:00
Andy2
5773466fb6 prevent lookup dialogs from coming up before button pressed by not 
assigning m_words too early.
 2011-10-04 06:19:06 -07:00
eehouse@eehouse.org
fe1bfead87 Merge branch 'two_phase_lookup' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2011-10-03 06:46:24 -07:00
Andy2
072516655e Use words list passed into informMove rather than query when user 
presses button.  Include word in button text when there's only one.
 2011-10-03 06:43:20 -07:00
Andy2
35e4c21f17 add util_informMove to jni. Use it, but not to advantage yet. 2011-10-02 16:42:10 -07:00
Andy2
77b9fa11a5 improving lookup words experience: replace 
util_userQuery(QUERY_ROBOT_MOVE) with new util_informMove(), into
which the number of words formed and the words themselves are passed.
The process of consing up the score explanation was already passing
over the model, so storing the words is very little effort, and will
save a call back into the model where the user actually wants to do
the lookup.
 2011-10-02 16:21:09 -07:00
Andy2
8650c997e0 nuke noisy logging -- that stuff works now. 2011-09-30 18:34:31 -07:00
Andy2
38adeb9160 improve script to be more patient but exit after there stop being 
messages -- which usually means the games finished.  With this and
previous changes the background stuff works most of the time.  Now to
debug why it's not all of the time.
 2011-09-30 18:22:25 -07:00
Andy2
dee826c6b1 hide script log directories 2011-09-30 18:20:41 -07:00
Andy2
28e5c39845 get rid of stringstream where it wasn't working (maybe because of user 
error -- whatever); fix error check to avoid false conclusion that
query didn't work so that update of num bytes sent in background works.
 2011-09-30 18:20:28 -07:00
Andy2
22382b3a19 reduce logging some more 2011-09-30 18:11:08 -07:00
Andy2
d9e97d2f32 reduce logging 2011-09-30 18:10:22 -07:00
Andy2
9bc36cd431 not an error when wait fails 2011-09-30 06:51:48 -07:00
Andy2
2af4888098 unlink socket file before trying to bind to it 2011-09-30 06:51:24 -07:00
eehouse@eehouse.org
554e497593 Merge branch 'send_in_background' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into send_in_background 2011-09-30 06:39:23 -07:00
Andy2
6553546642 cleanup; add logging for debugging background packets stuff. 2011-09-30 06:36:56 -07:00
Andy2
cb6a16f8f8 add ability to connect on nbs socket and use as destination for 
messages fetched from relay, and to receive replies on same socket for
forwarding to relay.
 2011-09-30 06:34:09 -07:00
Andy2
c992c65015 changes to support automated testing of background messages sends: new 
param gives name of Unix domain socket to be used to accept connection
that passes in messages from relay and receives messages to be sent
back.  Works once but needs debugging....
 2011-09-30 06:32:21 -07:00
Andy2
c952ebd8e6 cleanup 2011-09-30 06:29:14 -07:00
Andy2
9c586efb02 new script for testing this branch's changes: replying to 
messages delivered in the background.
 2011-09-30 05:43:24 -07:00
Andy2
4a49db5c2a initialize variable 2011-09-30 05:42:44 -07:00
Andy2
8e0e8d911e fix compile errors 2011-09-26 18:12:16 -07:00
Eric House
26ba812aff cleanup 2011-09-22 17:31:57 -07:00
Eric House
f0c3e2c5f0 Merge branch 'android_branch' into send_in_background 2011-09-22 17:22:01 -07:00
Eric House
8a5667f011 add missing language codes 2011-09-22 17:16:27 -07:00
Andy2
b7691d2997 Merge branch 'android_branch' into two_phase_lookup 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java
 2011-09-22 06:53:45 -07:00
Andy2
fcdbed0920 fix to work with changed C api 2011-09-22 06:49:34 -07:00
Andy2
35a0a3a291 passing pool into word-listing code a mistake as it put tiles back 
when undoing and so the pool grew each time.  Fix, and remove server
API as it's unneeded.
 2011-09-22 06:41:48 -07:00
Andy2
d000c430b9 thought there was an internal problem with pool and wrote debug-only 
code to check.  There wasn't, and it's unused, but no point writing it
again.
 2011-09-22 06:40:44 -07:00
Andy2
b10453bd25 cleanup 2011-09-22 06:14:22 -07:00
Andy2
e887d0a116 make word lookup two-stage, first a dialog to pick the word then 
another to pick the URL.  Hacky code takes us back to the first after
the second is dismissed while only showing either if there's a choice
to be made.  Also add menu item to lookup all words in the game --
useful for testing when robot refuses to play multiple words but maybe
also worth shipping.
 2011-09-21 19:04:33 -07:00
Andy2
c44a884184 try another item layout -- need to fix the background instead. 2011-09-21 05:47:12 -07:00
Andy2
617de4eb7e make lookup dialog two-part, with list of lang-supporting URLs at top 
and words at bottom.  You choose a URL/site, then tap a word, and
repeat until you're done.
 2011-09-20 19:01:37 -07:00
Andy2
92614370ce Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/common/comms.c
 2011-09-20 06:21:54 -07:00
Andy2
11d44ba72a use glib mainloop by default 2011-09-20 06:14:11 -07:00
Andy2
7e0252713c changes to use glib main loop were incomplete, didn't include timers. 
Fix that.  Now discon_ok2.sh test works with the USE_GLIBLOOP turned
on.
 2011-09-19 18:28:19 -07:00
Andy2
c2e2bdf3c5 listen on stdin always -- not sure how the condition got added -- and 
don't register for OUTbound events when listening -- stdin gets one
and I don't want to sign up to handle it.
 2011-09-19 17:56:20 -07:00
Andy2
97334faa95 switch to lookup url that can include language, and include it when 
French or German in use.  Disable button if I don't know how to look a
word up.  Later will want to have multiple URLs available, falling
back to googling for the word if I don't know about an online
dictionary.
 2011-09-19 07:53:29 -07:00
Andy2
d7a04f87e6 add custom view for wordlist dialog so it doesn't get dismissed the 
first time you pick a word -- now all can be looked up if desired.
 2011-09-19 06:45:15 -07:00
Andy2
ea3e015a8f use server_listWordsPlayed to implement lookup button: get list from 
jni, and when it calls back with it launch the browser directly if
there's only one, otherwise put up a choice list.  Currently the list
dismisses after launching the browser once: need to fix that, probably
with a custom View.  And need to deal with non-English games, and
maybe add other choices for lookup than dictionary.com.
 2011-09-18 19:10:12 -07:00
Andy2
dced47e202 export server_listWordsPlayed via jni. 2011-09-18 19:06:23 -07:00
Andy2
43e8bd7879 formatting only 2011-09-18 19:05:29 -07:00
Andy2
26ce5a119a in model_getWordsPlayed, make '\n' a separator rather than a 
terminator.  Makes it easier to split in the Java world without
getting an extra empty word.
 2011-09-18 19:05:00 -07:00
Andy2
9eacdb3856 add server_listWordsPlayed, and implement via function in model.c that 
uses existing stack and undo features to run a WordNotifierInfo over
some number of scoring passes to gather the words seen.  Seems to work
as tested from gtk version.  Now need to try from android....
 2011-09-18 17:20:01 -07:00
Andy2
63893b8a0d add stream_getPtr() and use to remove a couple of allocs, including 
one per message sent.
 2011-09-18 16:54:36 -07:00
Andy2
b579bb0bca first step in implementing lookup of words: add button and browser 
launch to single website for hard-coded word.
 2011-09-16 06:44:25 -07:00
Andy2
131bb561bc cache reference to prefs 2011-09-15 18:59:39 -07:00
Andy2
6bd72a54bf rename php scripts so their URLs are a bit more helpful when the user 
has to see them, as happens when invitation is send via SMS.
 2011-09-15 18:52:15 -07:00
Eric House
35b2ae0f42 remove dead strings. Move app-name to common_rsrc.xml since it's not 
translated.
 2011-09-15 18:08:00 -07:00
Eric House
df82578d5a add a ton of comments -- I think I'm done. No changes to any string here. 2011-09-15 18:07:07 -07:00
Eric House
a676b5beb0 comment out dead code referencing strings 2011-09-15 18:06:12 -07:00
Eric House
ced5da45a5 remove unused string ref 2011-09-15 18:05:45 -07:00
Andy2
8cb49ad8a3 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 
Conflicts:
	xwords4/android/scripts/strings_check.sh
 2011-09-14 06:51:10 -07:00
eehouse@eehouse.org
98c2617613 Merge branch 'android_branch' into send_in_background 2011-09-14 06:47:12 -07:00
Andy2
25f7c72994 add some comments and rearrange 2011-09-14 06:46:52 -07:00
Andy2
d69bbfed97 copy over from french_xlation branch 2011-09-14 06:39:23 -07:00
Andy2
c3f9fc6f7b remove unused strings 2011-09-14 06:13:32 -07:00
Andy2
2ee4ec12d5 toward merge with french_xlation: remove unused and move debugging 
strings.
 2011-09-14 05:50:55 -07:00
Andy2
5eb6ba2637 remove echoing 2011-09-14 05:45:32 -07:00
Andy2
1167ebe15e script for printing file per branch or revision -- like svn cat 2011-09-14 05:37:48 -07:00
Andy2
45bf34fdc1 just copy it over from french_xlation branch -- screw history 2011-09-13 19:01:16 -07:00
Andy2
b6cfdbbb37 print strings as single lines for easy comparison 
Conflicts:

	xwords4/android/scripts/strings_check.sh
 2011-09-13 18:59:14 -07:00
Andy2
7edf615b40 add comment noting that this release breaks old games configure not to 
use English.  (Specifically, they've been played in English until now
and played letters will be reinterpreted in the right language for the
first time.)
 2011-09-13 18:33:30 -07:00
Eric House
0bd9500033 add options to be used comparing across branches 2011-09-12 22:09:11 -07:00
Andy2
9f6391ba34 cache the most recently loaded game's byte[] data. Saves about 2/3 of 
the reads from the DB.
 2011-09-12 19:52:18 -07:00
Andy2
99498a8568 use static HashMap to track what language views are open and closed. 
As long as I'm not reloaded user choice will be preserved.  Good
enough.
 2011-09-12 19:00:13 -07:00
Andy2
72d769910b expand children after a delete (to be consistent, though it'd be 
better to rememeber state)
 2011-09-12 18:37:04 -07:00
Andy2
f8f06a7768 raise same error when try to commit exchange out-of-turn is raised for 
out-of-turn move attempt -- and don't exit exchange mode.
 2011-09-12 18:33:33 -07:00
Andy2
68c85ec176 use new class to inval list of dicts when SD card inserted or ejected. 2011-09-12 18:29:18 -07:00
Andy2
14608d2deb listen for SD card events via BroadcastReceiver registered in 
AndroidManifest rather than created programatically: only with this
can I get EJECT events to work.  Replacement class has static
register/unregister methods which DictsActivity uses.
 2011-09-12 18:28:43 -07:00
Andy2
8c0657f1cd add showf for Toast-based debugging 2011-09-12 18:22:37 -07:00
Andy2
e709ea730c only exit exchange mode if user confirms trade 2011-09-09 21:30:40 -07:00
Andy2
c9c498786e add to game state whether any tiles selected. Use that to disable 
'commit exchange' button when there's nothing to commit, and get rid
of error message used when committing nothing since it's now
impossible (on Android).
 2011-09-09 19:04:25 -07:00
Andy2
66fb5f87fb don't exit trade mode if no tiles selected; fix warning string to match. 2011-09-09 18:40:19 -07:00
Andy2
201db9415c sort tiles after trade too 2011-09-09 18:32:04 -07:00
Andy2
ec6108501d draw timer in full color even in exchange mode 2011-09-09 18:23:19 -07:00
Andy2
06571d0478 up constants and update changes list for new release 2011-09-09 18:17:28 -07:00
Andy2
1d612288d4 add optional param to confirmation dialogs to allow positive button 
other than Ok; add "Delete" and "Reset" for game and dict actions.
 2011-09-09 06:50:00 -07:00
eehouse@eehouse.org
eb0e41e978 Merge branch 'android_branch' into send_in_background 2011-09-08 21:38:50 -07:00
Andy2
fda3207b78 fix inability to tell whether a dict being deleted is in use: add to 
summaries DB list of dicts in the game and a method that queries that.
Pick delete-confirmation message based on the language of dict,
whether there are others in the same language, and whether games are
using that language or that dict.
 2011-09-08 21:36:15 -07:00
Andy2
528db479b5 bunch of changes whose original purpose was to allow me to deal 
correctly with having the same dict stored in more than one place.
Added DictAndLoc with members name and loc to support this, and used
in a bunch of places in place of mere strings, including
DictsActivity.  Also removed code warning when you're deleting a dict
that's not the last in its lang, which incorrectly warned that the
dict was in use when in fact I can't tell that.  The warning "might be
in use" sounds dumb so it's gone for now.
 2011-09-08 19:10:06 -07:00
Andy2
2aa5447301 remove some logging 2011-09-08 19:03:08 -07:00
Eric House
84931f34ff Merge branch 'android_branch' into send_in_background 2011-09-07 21:44:36 -07:00
Andy2
ce8104f679 move dict-related methods from GameUtils.java to new DictUtils.java 2011-09-06 07:18:45 -07:00
Andy2
d82193ff05 don't overwrite m_gi on resuming activity as it may contain 
local/pending changes.  Fixes bug where you change language, then
choose "download more..." from a player's dict choice spinner and find
on returning to GameConfig that the language has reverted.
 2011-09-03 22:19:10 -07:00
Andy2
eab067fe32 use autocaps for default player names pref 2011-09-03 21:54:25 -07:00
Andy2
1af358b269 move code to unpack players list into same file as the code packing 
it; add boolean, now always passed as false, to code printing names
for game config list of players to include the dictionary.  It's
useful for debugging, and I think it'd make a good optional setting,
but nobody else thinks so.  Once it's checked in the change can go if
I'm not using it.
 2011-09-03 21:05:08 -07:00
Andy2
a3566bc063 Fix bug: the CurGameInfo instance being used to generate the list of 
dicts passed when opening a game was based on defaults, not read in
from the game data.  Oops.  So now it's a two-step process: open the
data, read in the game info, generate list of dicts from that, and
open full game with list of dicts.  (TODO: optimize by caching game
data across multiple reads.)
 2011-09-03 20:31:03 -07:00
Andy2
8087153b73 log name of dict being set -- as an easy way to confirm that the right 
dicts are getting passed to the jin.
 2011-09-03 20:19:51 -07:00
Andy2
471199ba2f cleanup -- no code change beyond ordering and renaming. 2011-09-03 19:41:36 -07:00
Andy2
9956bc417d fix bugs: chosen dict was being pulled by index from non-sorted 
version of the list user saw when choosing the index. Fix is to use
same list. Cancel after selecting dict didn't work as the selection
listener had already copied the selected dict name over.  Now the
listener leaves that for the Ok button's onclick listener.
 2011-09-03 19:38:52 -07:00
Andy2
3fd0bb056a when there's no move made yet to display after score entry held say 
so.
 2011-09-02 19:24:42 -07:00
Andy2
e4b952222a unify two ways of saving words encountered during scoring, removing 
one and changing the site that used it to use the other.  Not visible
outside of common, but should make it easier to harvest a list of all
words for one move or the entire game.
 2011-09-02 19:11:04 -07:00
Andy2
2f91b8ed3d remove unused strings 2011-09-02 18:37:58 -07:00
Andy2
da475347a5 get rid of unused constants 2011-09-02 18:36:26 -07:00
Andy2
2d2f3e23fd change signature of util_playerScoreHeld(): pass player num rather 
than formatted text. Client code can use new
model_getPlayersLastScore() or whatever else it wants to build text to
show the user.
 2011-09-02 18:36:03 -07:00
Andy2
b6a4621617 trivial optimization 2011-09-02 18:34:07 -07:00
Andy2
42950c38bd export model_getPlayersLastScore() 2011-09-02 18:33:34 -07:00
Andy2
99679357a8 Exit trade mode on "commit" even if no tiles selected (in keeping with 
error message on Android); don't block trade if pending tiles are on
board; instead undo them. There's redo now so there's no need to
confirm, no data loss.
 2011-09-02 06:48:06 -07:00
Andy2
dadf41ad2e add "cancel trade" menu item 2011-09-02 06:38:30 -07:00
Andy2
c2150bc9ed get rid of util_setInTrade() 2011-09-02 06:14:29 -07:00
Andy2
9cf7e6ca18 get rid of util_setInTrade() 2011-09-01 19:53:03 -07:00
Andy2
5d08b6b3cd don't make scoreboard entries translucent during trade if option to 
change which player is shown is enabled.
 2011-09-01 19:52:36 -07:00
Andy2
e94524958f get rid of util_setInTrade(); fix passing of selBits when trading 
(broken with prev checkin.)
 2011-09-01 19:51:26 -07:00
Andy2
437e4e21ac There are buttons not menu items for exiting exchange mode so 
reference them in newbie text.  And get rid of string for toast
exiting the mode since we don't show it.
 2011-09-01 18:54:27 -07:00
Andy2
934daab6c8 don't need util_setInTrade. There's already code passing the result 
of game_getState() in after every draw() call and it has an inTrade
ivar.  Use that.
 2011-09-01 18:53:38 -07:00
Andy2
9a60bcf265 draw the X at 7x7 transluscent if in trade mode. 2011-09-01 18:52:21 -07:00
Andy2
8e45dcd720 exit trade mode only in the case where we're asking user to confirm, 
and do it before server can call callback that changes selPlayer so
it'll actually work.
 2011-09-01 18:50:09 -07:00
eehouse@eehouse.org
b6e5327b1a Merge branch 'android_branch' into send_in_background 2011-08-31 06:46:42 -07:00
Andy2
671877cbca implement new util_ methods in jni and java; remove old miniwindow 
stuff.  In java, respond to util_playerScoreHeld() and
util_bonusSquareHeld() by putting up toasts with existing strings.
For util_setInTrade(), fix exchange mode. Add two buttons at bottom
that replace toolbar (and corresponding buttons on menu). Redraw
scoreboard and board with high transparency to make it clear they're
disabled.  Still to do: deal with case where ability to switch which
player's tray is visible is enabled.
 2011-08-31 06:37:33 -07:00
Andy2
9c60a5c05b make sure util_setInTrade() gets called every time internal state 
changes, including on creation/load from stream.
 2011-08-31 06:33:36 -07:00
Eric House
cfa4c96d22 just for grins: japanese dict-building files. There are too many kana 
for the current format so this can only be for demos, but I might as
well record it.
 2011-08-29 20:42:27 -07:00
Eric House
8c811c3d5a Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2011-08-29 20:36:53 -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
Eric House
3b719f54de add compile-time option to use glib main loop (instead of select()) 
with ncurses.  The goals to make it easier to include watch on pipes
for incoming messages to better model Android -- and to be a bit more
modern.  Works for one run of test script but needs more testing to be
turned on.
 2011-08-29 20:24:15 -07:00
eehouse@eehouse.org
867b9118c1 Merge branch 'android_branch' into send_in_background 2011-08-28 17:27:46 -07:00
Andy2
45421e8f86 add a bit of space between players column and column to right so 
numbers don't run together.
 2011-08-28 15:44:23 -07:00
Andy2
5bc63edeb6 replace Runnable passed to showNotAgainDlgThen() with callbackID, same 
scheme as the rest of DlgDelegate.  I'm still using a single ivar for
all dialogs, meaning they can't stack, but except for duplicate
showNotAgainDlgThen calls (where the message can be ignored) it
doesn't seem to be happening.  Asserts are still in place to tell me
if I'm wrong.
 2011-08-28 15:38:52 -07:00
Andy2
656110841f cleanup after review of recent changes: remove logging etc. didn't 
mean to check in.
 2011-08-25 18:48:41 -07:00
Andy2
0a2255a8fe add two recent changes 2011-08-25 18:26:49 -07:00
Andy2
632acfd171 Oops: add new pref color to list restored. 2011-08-25 18:26:34 -07:00
Andy2
5acc2205be add pref to edit color used to draw bonus hints on cells 2011-08-25 18:13:42 -07:00
Andy2
79acccc6bf record, commented out, attempt to send NBS message. sendDataMessage() 
crashes internally, and googling finds lots of reports/questions and
no answers.  It appears NBS is broken on Android, at least for CDMA.
Might want to revisit on a newer OS version that the 2.1 I'm running
now.
 2011-08-25 06:52:12 -07:00
Andy2
711f12fa9e It's ok to cache listeners but only with the instance whose ivars they 
reference: revert prev change but make cache vars non-static.
 2011-08-25 05:49:09 -07:00
eehouse@eehouse.org
e592ea8559 Merge branch 'android_branch' into send_in_background 2011-08-24 22:44:40 -07:00
Andy2
3416ae59a7 use a constant for the DISMISS button. And don't use static 
listeners.  They wind up getting called with mixed DlgDelegate.this
values, including one belonging to an Activity that's long-since
stopped and so the wrong ids are getting passed back.
 2011-08-24 22:43:54 -07:00
Andy2
5aeac29787 Pass 0 to dlgButtonClicked() for dismiss, as -1 is the value of a 
button!  Also assert the heck out of callbackIds to see if Android is
guaranteeing that no two dialogs can be up at once.  I'm counting on
that, and need to know if it's not true.
 2011-08-24 21:44:10 -07:00
Andy2
1cd1a849e6 don't put dismiss listeners on every damn dialog! They replace rather 
than chaining.
 2011-08-24 21:41:35 -07:00
Andy2
5769ae6a31 cleanup: there are two listeners created over and over; better to 
store in a class static and reuse.
 2011-08-24 18:51:47 -07:00
Andy2
4ac84dde23 change sig of DlgDelegate's dlgButtonClicked() method to include id of 
button rather than just boolean.  Add onDismissListener so can tell if
whole thing was backed-out of (since that's a different choice from
the two buttons "text" and "html" used in one case.)  Fix compile
error that slipped by earlier: frequent clean builds required with
java.
 2011-08-24 18:22:21 -07:00
Andy2
50c692024b fix crashes when reloading (rare unless android:configChanges removed 
from AndroidManifest.xml). Problem was that managed dialogs are
recreated between onStart() and onResume() yet onResume() was where
ivars (specifically m_gi) were set.  Can't just set them in onStart()
because then I'd want to save state them in onStop() which isn't
guaranteed to be called.  So create a function loadGame() and call it
from both, using a flag to prevent its running twice (which flag is
cleared in onPause())
 2011-08-24 18:18:17 -07:00
eehouse@eehouse.org
147687890f Merge branch 'android_branch' into send_in_background 2011-08-24 06:52:51 -07:00
Andy2
3a2af96c24 use new callback-replaced-by-id mechanism to query for html/text 
choice.
 2011-08-24 06:51:00 -07:00
Andy2
f88697fd3f complete conversion of showConfirmThen, removing old methods and 
adding second param to buttonClicked() callback indicating which
button was cancelled.
 2011-08-24 06:14:42 -07:00
Andy2
7d0cbcf07f use new showConfirmThen scheme 2011-08-24 06:12:57 -07:00
Andy2
85c38e831f cleanup: null's same as empty onClick handler 2011-08-24 05:40:13 -07:00
Andy2
fbb467af80 convert some more callbacks to ints passed back: GamesList done. 2011-08-23 20:25:59 -07:00
Andy2
05607a15b9 toward a bundleable DlgDelegate: add new interface to replace 
OnClickListerners passed on, have clients of DlgDelegate implement it,
and convert one dialog to use it.  Will eventually remove old code.
 2011-08-23 19:50:01 -07:00
Andy2
0d85a67700 verify that bundle saving works in DlgDelegate and fix one 
disappearing message.  Still need solution for callbacks passed in.
 2011-08-23 19:18:45 -07:00
Andy2
7a235ed6b6 put onPrepareDialog() back -- it's required to use DlgDelegate dialogs. 2011-08-23 18:51:48 -07:00
Andy2
7da5b24e0f rewrite DictsActivity to not crash when un- and re-loaded: make 
dialogs depend only on bundleable ivars -- ints and strings, not Views
-- and bundle them.  Don't use onPrepareDialog, only onCreateDialog,
and so call removeDialog() every time one's dismissed.  Do some
refactoring to support this.
 2011-08-23 18:41:19 -07:00
Andy2
84e61f3b3f remove no-op line 2011-08-22 18:43:42 -07:00
Andy2
953909d0f0 remove logging 2011-08-22 18:40:44 -07:00
Andy2
3537161d3b add change 2011-08-22 18:40:30 -07:00
Andy2
3296cad731 pass bundle into DlgDelegate so state can be saved and restored. Not 
doing anything with it yet because any scheme to survive
OS-restoration has to deal with the Runnables I'm saving that can't be
bundled.  Work in progress....
 2011-08-22 18:10:22 -07:00
Andy2
7e6daa5797 move role out of players column to where it can be a full line long, 
preventing it from increasing the size of the item by line-wrapping.
For now it's outside the View that gets hidden, but that may need to
change.
 2011-08-22 07:05:33 -07:00
Andy2
d7a515ca97 display three states of relay connectedness in games list items: 
configured, connected but waiting for players, and game-in-play.
 2011-08-22 07:03:46 -07:00
Andy2
1ee0dfdd6d set wordlist spinner prompt and include language 2011-08-21 22:13:18 -07:00
Eric House
cf6d868bd3 use separate strings for window title and spinner prompt 2011-08-21 18:17:21 -07:00
eehouse@eehouse.org
3cdd4c1c9b Merge branch 'android_branch' into send_in_background 2011-08-21 15:04:25 -07:00
Andy2
aeafb9cefa Tweak language for moving wordlists to more clearly refer to storage 
locations.
 2011-08-21 15:03:41 -07:00
Andy2
bbb73bb2e9 somehow dict deletion got broken (because wasn't adding file 
extention); fix.
 2011-08-21 15:02:42 -07:00
Andy2
d1b6bc16cf add the standalone/network icons from GamesList display to the new 
games dialog so users get some association going.
 2011-08-21 14:30:00 -07:00
Andy2
04834c910b more dictionary->wordlist terminology change: debug-only preference 
and download URL.
 2011-08-21 14:27:50 -07:00
Andy2
9612b28b1f use goto to avoid having multiple returns. No behavior change. 2011-08-21 14:20:59 -07:00
Andy2
a17ff20db7 clean up background check pref wording to Chris's suggestions 2011-08-21 13:52:51 -07:00
eehouse@eehouse.org
d7d5d85ec2 Merge branch 'android_branch' into send_in_background 2011-08-21 12:20:25 -07:00
Andy2
c0dae019d5 use same context menu header, including wordlist name, as for game 
list items.
 2011-08-21 12:19:58 -07:00
Andy2
5c8afa06ce version string and changelog for beta 33 2011-08-21 12:07:45 -07:00
Andy2
56fd01a05b oops -- missing semicolon. 2011-08-21 12:07:21 -07:00
Andy2
c38e3593fb replace hard-coded placeholder names for optional top-line of games 
list item display with real "aa vs. bb vs..." consed up in
GameSummary, and set field to singleline so doesn't wrap when names
get too long.
 2011-08-21 11:39:38 -07:00
Andy2
c41af221b7 fix non-debug compile warning 2011-08-21 11:33:23 -07:00
Andy2
47bdec4eda pass context into GameSummary constructor rather than into methods 
that need it.  No behavior change.
 2011-08-20 21:51:57 -07:00
Andy2
28c78a0a6a dictionary->wordlist 2011-08-20 14:16:38 -07:00
Andy2
eb00984563 Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java
 2011-08-20 12:44:17 -07:00
Andy2
659c054696 add new class that listens for SDCard mounted event (could be 
generalized for multiple events and map them to multiple notification
callbacks), and use it from DictsActivity to redraw the list when the
SD card comes back online.  While the default android behavior works
for the unmount case (relaunches DictsActivity which correctly draws
only those dicts still available) it needs this change to redraw after
the available set grows.
 2011-08-20 11:59:32 -07:00
Andy2
6ca60438a1 no need for onClick listener when onDismiss listener does the same thing 2011-08-19 18:54:21 -07:00
Andy2
8f60ca5af3 Need to show dict-gone-missing dialog when umount from GameConfig too, 
so: change loadMakeGame() to return gamePtr rather than take one in,
and to return 0 when any dict no available.  Move dict-gone-missing
dialog into DlgDelegate.  Remove DlgDelegate always adding onDismiss
listener that removes the dialog, and instead add one to the
dict-gone-missing dialog that, like the onClick handler, calls
finish() on the activity.
 2011-08-19 18:52:55 -07:00
Andy2
fd4e627628 when sd card is umounted, android sends a message to apps. I can't 
figure out how to get that so I ignore it and am killed then
relaunched if I have a dict file open on the SD.  On relauch, don't
crash.  Instead, check if any dicts used by the game is unreachable
and put up an alert with only one choice: Close game.  Thought about
using the missing-dicts stuff from GamesList, but this is a special
case that should be seen only when user umounts while a BoardActivity
instance is frontmost.
 2011-08-18 07:54:00 -07:00
Andy2
7a1346e530 add assert to catch bad dict earlier 2011-08-18 07:49:40 -07:00
Andy2
455cb9a4c4 Include possibility of umounted sd card in missing dict 
explanation. Name of game too.  Use single-selectable list and
Substitute button instead of expecting user to tap once to select
(which confused me.)
 2011-08-18 06:26:43 -07:00
Andy2
0c29a4c1ca fix NPE when sd card unmounted 2011-08-17 20:11:30 -07:00
Andy2
58be931558 remove messages after sending them if they appear to have been sent 
successfully.
 2011-08-17 19:52:55 -07:00
Andy2
8e6812780d call feedMessages even if there are no messages, and call 
comms_resendAll() from feedMessages.  The combination means that all
networked games get a chance to resend dropped packets periodically
which should help prevent stalls.
 2011-08-17 19:51:20 -07:00
Andy2
08789c4097 call server_do() up to five times to allow some extra work to get 
done.  Required if a host is also a robot.
 2011-08-17 19:48:55 -07:00
Andy2
b9be2b45f4 sendMsg needs to report success if no-conn send works. 2011-08-17 18:41:45 -07:00
Andy2
2c26fc03e3 Track messages sent via proxy and credit nsent (accumulator) if 
successful.  Previously messages sent via proxy were not counted.
 2011-08-17 18:09:10 -07:00
Andy2
b511b4c455 add new RecordSent to take list of msg ids -- and use stringstream 
instead of static buffer and snprintf in one case.  May make sense
elsewhere too.
 2011-08-17 18:07:21 -07:00
Andy2
8148c7699a don't loop forever on server_do(). It's broken w.r.t. guaranteeing 
that it can always change state.
 2011-08-17 06:52:04 -07:00
Eric House
c2c673e932 improve testing of proxy delete by saving up a number of relayIDs and 
sending with multiple -d flags to rq.
 2011-08-16 19:44:37 -07:00
Andy2
30145deba7 add new proxy message handler for no-conn message, and feed into 
existing store-and-forward system.  With this checkin a robot-vs-robot
game plays for quite a few moves without either game every loaded into
the foreground (via a BoardActivity instance on Android), with all
moves transmitted as a result of relay checks.  One of the games
refuses to open later, however, and there are certainly other bugs.
And I'm not sure what happens when a message sent no-conn (without a
cookie ID) is received in the foreground.  But this is progress.
 2011-08-16 19:41:33 -07:00
Andy2
7ab8c6eca4 re-factor sending code so essentially same message (without cookieID 
that implies a connection) is sent and received by no-conn code.  Use
flags to determine if comms can support no-conn sending without making
up the message only to have it fail to send.
 2011-08-16 19:36:23 -07:00
Andy2
2dcfb2193c complete the process of sending messages generated in response to 
messages passed in in background: send them.  Requires new method
implementing new protocol against proxy.
 2011-08-16 19:33:24 -07:00
Andy2
066cef0306 using new send-noconn proc is too expensive if it's only going to fail 
(return false) so add new iface comms can call once to get flags to
tell it whether to use that proc.  One implementation of
TransportProcs returns one flag; the other, the other.
 2011-08-16 19:31:08 -07:00
Andy2
dfab747504 make server_do() take a new param to allow caller to call it until 
there's nothing more to do (without the assumption it's driven from an
event queue.)
 2011-08-16 19:28:59 -07:00
Andy2
11f6d96be9 get 'svn' out of the version string variable 2011-08-16 19:26:53 -07:00
Andy2
dc693e4d6a too much logging 2011-08-16 19:20:39 -07:00
Andy2
f61748369a fix non-debug compile warning 2011-08-16 19:17:47 -07:00
eehouse@eehouse.org
be4ec00e55 Merge branch 'android_branch' into send_in_background 2011-08-15 18:28:35 -07:00
Andy2
dc273c7162 fix proxy msg handling to process more than one relayID per message. 
Formerly all but the first were dropped.
 2011-08-15 18:27:00 -07:00
Andy2
6f22cbd8c9 rename class and pass in from higher so send can be done in the right 
place.
 2011-08-11 06:49:44 -07:00
Andy2
985f254660 more refactoring -- limit NetUtils method to network stuff as much as 
possible.
 2011-08-11 06:40:13 -07:00
Andy2
008c70957a refactor -- no behavior change 2011-08-11 06:29:21 -07:00
Andy2
c2ae80cf37 pass the stubbed-out procs into the jni. Now background-generated 
packets are getting into the java world.  Next: get 'em to the relay.
 2011-08-10 21:28:12 -07:00
Andy2
ea05c34d8f add the alternative send proc to the java transportprocs interface, 
and call through to it from the jni.  Add another implemenation of the
interface and pass that when opening games in the background.
 2011-08-10 21:06:05 -07:00
Andy2
f6bf91de36 make overridden methods have params in same order (though some are 
missing).
 2011-08-10 20:49:41 -07:00
Andy2
e88af19e0a toward the ability to send replies to messages received in background 
without user having to open the game, which will e.g. allow a host to
assign tiles, or a robot to move, without the phone's owner noticing
there's a message.  This is on a branch because it may never work.
 2011-08-10 18:28:34 -07:00
Andy2
e2ef25ae90 add pref for choosing what goes in parens along with the game name 
(where <language> was before.)  opponent name still needs to not be
hard-coded; the rest works.
 2011-08-09 19:26:59 -07:00
Andy2
ceb2d1ac63 fix indenting -- white space only. 2011-08-09 06:48:10 -07:00
Andy2
c67e92ea2c log sends for a while. I want to fix the occasional stall. 2011-08-09 06:44:09 -07:00
Andy2
8adb925cca only load and pass in dict as byte[] when path isn't available 
(i.e. when it's a builtin), and use mmap in that case.  Works!  Still
need to try a speed test.
 2011-08-08 20:27:42 -07:00
Andy2
35f059e14c remove logging 2011-08-08 20:21:55 -07:00
Andy2
755d3e5bb2 as first step in using mmap for dictionaries instead of passing byte 
arrays into the jni, pass the full file paths in in addition to the
byte arrays.  This isn't possible with the built-in dicts, but does
work for the downloaded ones (which are usually larger).  This checkin
does the mmap and uses memcmp to verify that the bytes are the same as
passed in.  Next step is to not pass the bytes when the path will do
and to actually use the mmap'd ptr.
 2011-08-08 19:41:45 -07:00
Andy2
ab64d57f5c adapt a couple of icons as placeholders for standalone and networked 
games.  Every games-list item now has an icon.  The networked game
icon is replaced by the sync icon when there's new information.
 2011-08-08 18:56:19 -07:00
Andy2
d08eacc4c0 comment: reminder of possible icon for archiving 2011-08-08 18:53:58 -07:00
Andy2
556b78baad remove logging 2011-08-07 20:22:33 -07:00
Andy2
4345fc1543 fix failure of renamegame feature when orientation changes while 
dialog is up.  I'm making two fixes, either of which is enough: saving
the rowid across teardown of the activity; and changing the manifest
to not tear down the activity.  The reason for the latter is that the
teardown is unnecessary and wasteful.  The former's just safer coding.
 2011-08-07 20:22:11 -07:00
Andy2
f8715feea6 update version and changelog for b32 2011-08-06 23:08:42 -07:00
Andy2
6f7279a6b0 fix crash that happens whenever orientation changes while there's a 
dialog up in DictsActivity.  (There are still problems updating the
UI, e.g.  indicating the current loc of a moved dict.)
 2011-08-06 23:03:11 -07:00
Andy2
fd61c0af02 'final' not needed 2011-08-06 22:30:48 -07:00
Andy2
c47189e81f fix crasher introduced with eeac03d40f: 
update delegate's dialog id constants.
 2011-08-06 21:30:38 -07:00
Andy2
b20584b74e fix bug moving dicts: location wasn't getting updated when the move 
was successful and so subsequent moves reported wrong location.
 2011-08-06 20:06:21 -07:00
Andy2
fc650ef317 fix assertion failure reported by google when unable to create 
directory on SD card.  Just return null and carry on as if SD card not
writable.
 2011-08-06 20:05:30 -07:00
Andy2
ed832f9545 update database from any version, not just two adjoining. 2011-08-06 19:26:36 -07:00
Andy2
011b283566 tweak copy dialog to suggest using new-from. 2011-08-06 16:18:32 -07:00
Andy2
719fd314a5 move net msg icon outside of hideable part of game list item layout so 
it remains visible when not expanded.  Otherwise people won't see that
something happened to a closed game.
 2011-08-06 16:03:38 -07:00
Andy2
eeac03d40f query user for html vs text before creating new networked game so it 
isn't left sitting if [s]he cancels.
 2011-08-06 15:49:55 -07:00
Andy2
66a673c478 make the game name green when it's somebody's turn and player names 
are hidden.
 2011-08-06 15:46:49 -07:00