Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-07 05:24:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
4131 commits 21 branches 243 tags 33 MiB
Commit graph

4101 commits

Author SHA1 Message Date
Andy2
7e0f025d9e remove logging 2010-12-17 06:51:56 -08:00
Andy2
3336b39d6d add (wordcount) to subst title to make meaning more clear 2010-12-16 20:29:48 -08:00
Andy2
ea85512c4f put word count into list of dicts for substitution. Done by adding 
actual count then stripping it back off to form the dict name again.
 2010-12-16 20:24:04 -08:00
Andy2
0059f92626 use medium sized text for empty view 2010-12-16 18:50:15 -08:00
Andy2
693909ec67 add an empty view along side list view; all setEmptyView to install it 
to be shown when list is empty.
 2010-12-16 18:47:25 -08:00
Andy2
740060f531 remove logging 2010-12-16 18:45:46 -08:00
eehouse@eehouse.org
f0c31956d2 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2010-12-16 06:41:30 -08:00
Andy2
95a6982851 use new overridden method 2010-12-16 06:38:47 -08:00
Andy2
993e66da99 add newbie info on launch of dicts activity (and override method so 
don't have to pass null)
 2010-12-16 06:37:05 -08:00
Andy2
6cd22f6461 add newbie info on launch of dicts activity 2010-12-16 06:36:25 -08:00
Andy2
16933d14c1 fix list item layout to have variable height so it doesn't clip dict 
listings that wrap to a second line -- e.g. the Spanish_FAA ones.
 2010-12-16 06:24:47 -08:00
Andy2
647443c03e reintroduce BroadcastReceiver listening for connectivity going up and 
down.  When network's down, return -1 from send proc so that comms
timing can retry.  This works on both cellphone on carrier network
(with airplane mode as the test for loss/gain of network) and on
emulator (with death/restart of relay as the test since I don't know
how to kill the iface itself).  A quick test on phone using wifi this
morning suggested it didn't work, that into/out of airplane mode did
not result in notifications getting set.  Need to test that, and back
this out if can't be fixed since I can't break wifi.
 2010-12-15 18:39:25 -08:00
Eric House
a663b2deae Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2010-12-13 22:08:11 -08:00
Eric House
442b3983cf highlight during draw where possible because doing it after isn't 
possible with wide chars -- meaning I haven't figured out how yet.
ncurses documentation is well hidden....
 2010-12-13 22:07:25 -08:00
Andy2
d1605c4493 fix: convert to utf8 and replace grep that didn't work (presuambly 
because ranges have different meanings in utf-8) with one that does.
 2010-12-13 20:39:04 -08:00
Andy2
d78584fddf remove obsolete, pre-utf8 files 2010-12-13 20:09:26 -08:00
Andy2
bb0a79914b add conversion from ISO88591 since the default dict's in that format. 2010-12-13 20:09:09 -08:00
Andy2
dc807c948a use sed instead of tr since as with Slovak a letter was getting 
dropped.  Same one in fact.
 2010-12-13 19:58:37 -08:00
Andy2
cd3ff71efb notify comms layer when unable to establish connection. This allows 
comms logic to retry and fixes failure on device to detect when
network comes up after being down when game was opened.
 2010-12-13 18:30:22 -08:00
Andy2
299c84bb2b use sed rather than tr to uppercase letters. tr was dropping the Á 
letter for some reason.  The sed feature I'm using is a gnu extension
but has the advantage of working.  Should probably do this for all
languages and in the info files.
 2010-12-13 18:16:22 -08:00
Andy2
23a4a7ef64 get rid of unused/stubbed out method 2010-12-13 06:37:26 -08:00
Eric House
2807ee2ce0 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2010-12-12 20:50:35 -08:00
Eric House
894afdc0cb take words up to 15 letters long. This makes no difference with any 
dict I've tried as there just aren't any words over 7 letters long
made up of only a-f.
 2010-12-12 20:02:28 -08:00
Eric House
e8e0b25fad go back to old dict -- correcting a change I didn't mean to check in. 2010-12-12 20:01:33 -08:00
eehouse@eehouse.org
9140c8b39a Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2010-12-10 05:43:31 -08:00
Eric House
9c5b2c9f4f add for current French list 2010-12-09 21:22:37 -08:00
Eric House
98456dd652 fix to build dicts, wince/android format by default 2010-12-09 21:22:14 -08:00
Eric House
6b58c9031f script to build html page for downloading dicts 2010-12-09 21:21:41 -08:00
Andy2
183d920eb0 update changelog for beta 20 2010-12-09 07:41:43 -08:00
Andy2
1fbdd62372 up version num/strings 2010-12-09 07:21:56 -08:00
Andy2
c4fa9cb707 exit loop rather than trying to use key again after cancelling it. 
Fixes CancelledKeyException raised when launching networked game in
airplane mode.
 2010-12-09 06:58:55 -08:00
Andy2
d5d81fea5b don't return dialog when msgID is 0. This should fix occasional crash 
where OS wants to restore a dialog but the message ID has gotten
cleared -- via a mechanism I'm not quite clear on.
 2010-12-08 18:52:08 -08:00
Andy2
a1c96b5601 change default dict download url so new set can coexist with old and 
get picked up only by new release that can handle it.
 2010-12-08 18:47:21 -08:00
Andy2
65ea075102 when downloading new dict inval the info cache to it'll get reloaded 
-- in case we're overwriting one with the same name.
 2010-12-08 18:46:25 -08:00
Andy2
1b40d1d47b make method public to be used outside 2010-12-08 18:45:31 -08:00
Andy2
5534939407 add inval() to prevent stale data when new dict downloaded over top of 
old.
 2010-12-08 18:44:59 -08:00
Andy2
c83e4cc7a3 all places where dict lang is displayed can also display word count 2010-12-08 05:51:26 -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
Eric House
efe6d6d95d Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2010-12-07 20:47:19 -08:00
Eric House
b65338b643 script for use on relay host 2010-12-07 20:46:02 -08:00
Andy2
3987749079 log calls to set-not-again. I'm getting crashes and that may help 
track it down.  Remove this later.
 2010-12-07 18:57:38 -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
57bfe4c943 Revert "switch from nio to regular old io, with separate reader and writer" 
This reverts commit b23de9a958.
 2010-12-07 18:12:35 -08:00
eehouse@eehouse.org
b389478350 Revert "register for notification of network going up and down; start using" 
This reverts commit 77fe3952da.
 2010-12-07 18:12:02 -08:00
Eric House
eb22322e8d change title until we have column headers 2010-12-06 21:08:38 -08:00
Eric House
2a0151baf7 add BasEnglish dictionary. 2010-12-06 21:08:15 -08:00
Eric House
4ac4b37619 Merge remote branch 'maidu/android_branch' into dawg_fixup 2010-12-06 21:05:41 -08:00
Andy2
77fe3952da register for notification of network going up and down; start using 
that information to connect and not.  There seems to be no way to get
notified when a socket's underlying transport goes down (might not
even want to) so this will be the best way to have the arrows go red
when the device goes into airplane mode.
 2010-12-06 20:19:17 -08:00
eehouse@eehouse.org
fcd179f6b7 Merge remote branch 'origin/android_branch' into dawg_fixup 2010-12-06 18:50:13 -08:00
Andy2
39b40a9a3d build with a header giving word count 2010-12-06 18:31:12 -08:00
Andy2
74fc103e9d opt for the long form of annotated name (includes word count) 2010-12-06 18:28:00 -08:00
Andy2
ad829b74f7 cache DictInfo rather than just lang code; add method that formats 
name with lang and count.  Ideally the dict display would be a table,
but it's not trivial to switch from a list to scrolling table.
 2010-12-06 18:27:00 -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
e4999acc98 add dict_getWordCount() 2010-12-06 18:24:31 -08:00
Andy2
ff9e03ef4b read rather than just skipping word count 2010-12-06 07:30:28 -08:00
Andy2
91c04d3267 switch to new format (with header giving word count) 2010-12-06 07:26:47 -08:00
Andy2
12508b7cd5 cleanup stderr output 2010-12-06 07:23:22 -08:00
Andy2
0072112b5a fix syntax for including newheader so only one gets included. Fixes 
bug building multiple dicts where headers would accumulate.
 2010-12-06 07:23:05 -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
Eric House
eff2324950 fix compile command 2010-12-05 19:30:00 -08:00
Eric House
bef1e125bf ignore .pdb files 2010-12-05 19:29:15 -08:00
Andy2
b23de9a958 switch from nio to regular old io, with separate reader and writer 
threads.  Greatly simplifies things, but only tested for the simplest
case, and I know it won't correctly reconnect when relay goes down.
But folks recommend against nio, and I'd like to see if I'll get
notifications in the form of blocking socket calls returning or
raising exceptions when the network goes down, something that isn't
happenening with nio.
 2010-12-03 18:48:14 -08:00
Andy2
fda21e8d15 save room and player names if leaving simple config dialog via the 
advanced config button (but still drop if back button hit.)
 2010-12-03 06:44:34 -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
eehouse@eehouse.org
ddaa368af3 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2010-12-02 22:38:16 -08:00
Andy2
984a5d6154 Fix yet again what shouldn't have been checked in. 2010-12-02 22:37:21 -08:00
Eric House
9fd4229384 pass host to rq too 2010-12-02 22:34:59 -08:00
Eric House
328fe7d6dc Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2010-12-02 22:31:34 -08:00
Eric House
d1244da284 script encapsulating sql query that's useful to run (with 'watch') along with discon_ok2.sh 2010-12-02 22:29:36 -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
eehouse@eehouse.org
c4a4a39438 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2010-12-02 05:56:26 -08:00
Eric House
ae9dbd1e5c create mtimes array rather than mtimes timestamp 2010-12-01 21:09:25 -08:00
Eric House
4bd5553596 track mtime per host rather than per game -- make it an array in the db. 2010-12-01 21:08:22 -08:00
Andy2
2e956e2f6e debug is not supposed to be checked in turned on 2010-12-01 18:13:55 -08:00
Andy2
e89feb62d8 second part of manual merge of unicode_branch's dawg/ directory into 
this one.  This adds the directories and their files created inside
dawg.
 2010-11-30 18:38:05 -08:00
Andy2
79990bc7b1 first set of changes formed by applyinig diff of android_branch's 
dawg/ directory against unicode_branch's.  The two branches seem to
have to common ancestor -- probably didn't survive translation from
svn -- so this is the best I can do.

This checkin is all the files that were modified by the patch plus a
couple of simple additions.  Next I'll be adding directories that the
patch created.  It also reintroduced a bunch of .cvsignore files; I
won't check those in.
 2010-11-30 18:35:11 -08:00
Andy2
78be732c64 use min of score ht and cell width for network status icon. Fixes 
problem on 600x800 devices where the icon overlaps the board.
 2010-11-30 18:21:28 -08:00
Andy2
a5c36f37a4 new strings for dict substitution 2010-11-30 06:37:23 -08:00
Andy2
d086dad34e Since you can't add/remove buttons in onCreateDialog(), add a new one 
to use when there are other dicts available in the same langauge as
the missing one that offers to substitute, and another dialog
presenting a list of same-language dicts.  Then substitute the one
tapped.
 2010-11-30 06:37:01 -08:00
Andy2
3a9eb72db3 add static methods to count and list dicts in a given langauge. 2010-11-30 06:34:57 -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
b4fb57de9c move thread inside so it can be started and stopped. And exit the 
thread on failure to connect, allowing comms' timer to control when we
retry.  This fixes problem where would try multiple times/second to
connect when relay was down.  Now we try every 15 seconds (per comms,
which can as well back-off), and shortly after the relay comes back up
connect successfully.
 2010-11-24 18:14:34 -08:00
Andy2
8623c569e7 move game data from separate files into a BLOB column in the existing 
summaries db table, using the existing SNAPSHOT column rather than
adding a new one and upping the version.  Includes utility fired at
game-start to convert existing games that seems to work.  Also
improved a few queries and updates to -- I think -- use the API
better.
 2010-11-24 17:22:46 -08:00
Andy2
be35d875b2 move game data from separate files into a BLOB column in the existing 
summaries db table, using the existing SNAPSHOT column rather than
adding a new one and upping the version.  Includes utility fired at
game-start to convert existing games that seems to work.  Also
improved a few queries and updates to -- I think -- use the API
better.
 2010-11-24 17:22:04 -08:00
Andy2
7c96048ba2 add, but comment out because it requires user permission, code to 
notice when cellular data becomes available and notify relay of dead
games then.  Must be a way to notice a network interface cellular or
not without permission since I already have permission to use it.
 2010-11-23 19:01:32 -08:00
Andy2
c3f43dd26c when deleting all games don't inform relay until after the last one so 
a single connection does it.
 2010-11-23 18:28:05 -08:00
Andy2
5bf87b3bea add function to invoke rq once for all the relayIDs in the set of 
devices making up a game.  Actually using it make the script fail for
some reason and so it's commented out, but it helped to debug the
relay.
 2010-11-23 18:12:11 -08:00
Andy2
0bbf7272aa don't create thread if there are no obits in the db -- makes it 
cheaper to call when there may be nothing to do.
 2010-11-23 18:10:51 -08:00
Andy2
7c8622392d send the list of saved deleted relayID/seed pairs off to the relay and 
remove them from db when relay reports success.  TODO: relay always
reports success even if some are malformed and it's aborted parsing.
 2010-11-23 17:56:17 -08:00
Andy2
1720fbbd50 fix parsing of relay ids by replacing separating \n with \0. 2010-11-23 17:46:16 -08:00
Andy2
111c59dd30 toward having game deletion get reported even if network isn't live at 
the moment: create new "obits" table and put dead game info in it.
Change constant for current table name to be less generic.
 2010-11-23 06:44:59 -08:00
Andy2
2127394260 don't allow resignations below a certain point -- which happens to fix 
divide-by-zero error.
 2010-11-22 20:44:28 -08:00
Andy2
daecc807c1 don't init nPerDevice, and deal with it not being inited. 2010-11-22 20:43:37 -08:00
Andy2
eebf5f1252 remove the big dictionary. Ideally I'll figure out how to gracefully 
allow to switch without downloading before the next beta.
 2010-11-22 18:24:37 -08:00
Andy2
983906810c set dropdown view resource on public rooms spinner -- fixes problem 
where it was drawing super-small.
 2010-11-22 07:39:18 -08:00
Andy2
3ee3af8881 init crosshairs correctly so 0th column and row aren't drawn short. 2010-11-22 07:04:51 -08:00
Andy2
edab239060 add one more change 2010-11-21 20:12:45 -08:00
Andy2
ead21206e0 up version to 5 not 6 since prev beta was at 4. 2010-11-21 20:12:34 -08:00
Andy2
7d164f2389 complete list of changes 2010-11-20 21:19:56 -08:00