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

5580 commits

Author SHA1 Message Date
Eric House
26109f926b implement BT's "configure first" to create a BT game without any other 
device being involved.  Useful for testing of config.  Might be the
basis for getting games going with non-default settings but I'm not
sure how to get them all set up with the same gameID so they'll
connect.
 2012-01-31 18:52:18 -08:00
Eric House
b4b7609894 include hwAddr as well as device name in bt section of address 2012-01-31 18:48:59 -08:00
Eric House
af2fcc76e0 consider it an error if no dicts found for language. With this change 
I can install a game for which there's no dict and when user opens it
he'll get an opportunity to download one.  Might be better to refuse
to install it....
 2012-01-31 18:47:38 -08:00
Eric House
5c8488af1b string and layout needed for edb39ac77d 2012-01-31 18:45:00 -08:00
Eric House
6326e45892 make btAddr a string rather than array of bytes. 2012-01-31 18:43:26 -08:00
Eric House
edb39ac77d remove assumptions that non-standalone==relay. BT games now 
configurable (though no BT-specific settings are exposed).
 2012-01-31 18:28:49 -08:00
Eric House
e91c0daf65 check for null obj before calling through its vtable 2012-01-31 06:44:54 -08:00
Eric House
579e8b7dfd send language and player counts with invitations. Works as long as 
the recipient has a dict in the lang; otherwise crashes on that device.
 2012-01-30 20:41:50 -08:00
Eric House
6978ba06f1 kick off scan immediately if have no devices to present 2012-01-30 19:39:45 -08:00
Eric House
82529c738e add start/stopProgress methods and push to DlgDelegate so can be used 
from other Activities.  Use while sending game info as well as scanning.
 2012-01-30 19:33:56 -08:00
Eric House
cd8ace6c9f queue isn't meant to be static 2012-01-30 19:32:56 -08:00
Eric House
144db5628f Merge branch 'android_branch' into android_bt 2012-01-30 18:47:10 -08:00
Eric House
0b197bf12e include DbgUtils to make debug changes easier. No code change. 2012-01-30 18:46:51 -08:00
Eric House
ad5b42121b revert recently-added typo 2012-01-30 18:39:11 -08:00
Eric House
b4f9553579 install into devices too 2012-01-30 18:38:43 -08:00
Eric House
06d8df4fb5 remove dead file 2012-01-30 06:39:54 -08:00
Eric House
094d08e903 Get play via BT working!!! Replace BTConnection with BTService to make 
keeping the listener/sender threads going much easier.  Create new
message sink to dispatch incoming messages, and start passing return
addresses into comms (not required before when relay was only
transport as it has no return addresses.)
 2012-01-30 06:39:18 -08:00
Eric House
3f03232008 include jni log messages too 2012-01-30 06:34:15 -08:00
Eric House
786cb4dc55 replaces BTConnection (and uses a lot of its code) 2012-01-30 06:26:48 -08:00
Eric House
edaef7f0a4 add new column 2012-01-26 23:02:56 -08:00
Eric House
698dac890f combine bt receivers, and start listening when ACL connected. Less 
reliable but means I don't have to powercycle BT every time I install.
 2012-01-26 07:14:43 -08:00
Eric House
bc351d1675 add ok button to dialog listing paired devices, make them selectable, 
and don't dismiss/invite until the ok button's tapped.
 2012-01-26 06:54:55 -08:00
Eric House
6bfd6e74e6 Merge branch 'android_branch' into android_bt 2012-01-26 06:24:18 -08:00
Eric House
9f2ec43617 move ProgressDialog into NewGameActivity where it belongs. 2012-01-26 06:23:46 -08:00
Eric House
adf49dffd7 init/take down thread local storage in constructor/destructor rather 
than as static initializer (and then leaking on shutdown.)
 2012-01-26 05:48:10 -08:00
Eric House
866aeb2387 change relay connect message format to include client version (meaning 
of which is TBD).  When a new-version client connects, store the value
it's passed. At first this will let me track how quickly people
upgrade.  Later I can use it to let different clients have different
formats to their messages e.g. to proxy.
 2012-01-26 05:43:54 -08:00
Eric House
af26ebfff9 fix usage hint 2012-01-26 05:40:22 -08:00
Eric House
da9f206f86 fix scan. 2012-01-25 18:56:40 -08:00
Eric House
5ca35254cc pass messages to BT and send them -- they're received on the other 
side but not yet acted on.  Combine several send threads into one so
that all bt socket operations will be in the same thread and can't
coincide.  (Rescan is broken.)
 2012-01-25 18:32:07 -08:00
Eric House
8959dc09a2 add -g option that filters for xw4 2012-01-25 18:28:25 -08:00
Eric House
0934f83106 add gameID to params passed to comms' sendproc, including passing 
through to java layer.
 2012-01-25 18:27:37 -08:00
Eric House
813e31ada8 fix crash by checking for null socket (meaning unable to open 
connection to relay)
 2012-01-25 18:09:26 -08:00
Eric House
74efac3dd9 include bt name of host in client games, but not of client[s] in host 
games.  This allows clients to pass host name for use in addressing
when their initial message is sent.
 2012-01-24 06:53:50 -08:00
Eric House
ac6ecfa845 copy bt_hostName as part of address 2012-01-24 06:51:40 -08:00
Eric House
a543bfa639 send new gameID so it actually arrives. Games are being created on 
both ends with the same gameID.
 2012-01-24 06:28:55 -08:00
Eric House
b954ef0643 revert recently-added typo 2012-01-24 06:21:43 -08:00
Eric House
4e1e5ab303 script to make it easier to run two or more logcat sessions 2012-01-24 06:21:12 -08:00
Eric House
c425686589 lots of changes. Respond to new-bt-game button by posting a list of 
known paired-with-Crosswords devices and sending invite to the one
selected.  Includes rescan button with infinite progress indicator
(that sometimes works).  Recipient saves new game with the gameID
passed.  Then sender does too (but gameID doesn't seem to stick.)
Both games crash when you open them, but they're created.
 2012-01-23 20:52:04 -08:00
Eric House
f048980701 cleanup 2012-01-23 20:49:34 -08:00
Eric House
2c24441ff3 create BT game and display with BT icon using hard-coded defaults for 
now and no addressing.  Fails in assert when trying to send as BT
addressing isn't handled yet.
 2012-01-23 07:54:22 -08:00
Eric House
beef55e3ac formatting 2012-01-23 07:52:46 -08:00
Eric House
f42f9adad1 use listener to ensure that BT-related UI is enabled/disabled when 
power state changes.
 2012-01-23 06:37:54 -08:00
Eric House
eb214d4f69 Turn on BT in response to user tapping "turn on" button. Still to do: 
listen for BT turnoff/on that's independent of the button and
re-layout -- in case user does it himself while the NewGame Activity
is frontmost.
 2012-01-21 10:19:36 -08:00
Eric House
18b620732b fix missing buttons 2012-01-21 10:17:07 -08:00
Eric House
81e29482fe add buttons, text etc. still to be determined, to start BT games. Add 
text and unimplemented button to turn BT on if it's not there.
 2012-01-21 09:46:52 -08:00
Eric House
6d93fcfdd3 install into devices too 2012-01-21 08:50:12 -08:00
Eric House
adb5ce541d add room name to subject of invite 2012-01-20 17:35:50 -08:00
Eric House
548fb86734 Play around with getting notified when another device connects. I 
need an alternative to keeping a listening socket open in a thread
forever, as the OS will eventually shut me down if there's memory
pressure.
 2012-01-19 22:32:34 -08:00
Eric House
847f1199be add gameID to summary. The slot's already in the DB, though unused, 
so no version change required.
 2012-01-19 18:53:55 -08:00
Eric House
923d6a24bd use libuuid to prep BT UUID, now a string instead of an array of bytes 
for ease of use from java.  Since libbluetooth stupidly and
unrepentantly redefines uuid_t, add a new file/function to call
libuuid without having to pull its definitions into the bt code.  This
code compiles but is completely untested: I don't quite remember how
to play games via BT on Linux and at any rate will need an always-on
listener like the one I'm adding to the Android client.
 2012-01-19 18:52:33 -08:00
Eric House
a34921155f make gameID consistently 32 bits in C code. It's been stored as 16, 
so stream version must change.  Plan's to use it to address incoming
BT packets so a game needn't be open to receive.
 2012-01-19 18:47:53 -08:00
Eric House
5f77ef6e13 get uuid from C code so can ensure linux version has same. 2012-01-19 18:28:27 -08:00
Eric House
1f8be87acb put up Toast when ping succeeds with name of device[s] pinged. 2012-01-19 18:08:54 -08:00
Eric House
00d2bb2a56 add temporary ping menuitem, and implement by sending message to first 
device that's running our service.  Logs show messages being received.
 2012-01-19 06:42:08 -08:00
Eric House
0337b97b57 begin bluetooth work. Add new class that logs when BT comes on and 
goes off.  Sketch out always-on listening socket, but it's not called
yet.
 2012-01-18 18:30:53 -08:00
Eric House
8a66cd4c1f Address reports of crashes tapping wordlist button when device is 
having trouble making initial relay connection for a game (which I
can't reproduce) by disabling that button when there isn't a current
player.
 2012-01-17 18:58:45 -08:00
Eric House
00575c6d4e Don't assert when don't have expected connType (likely as result of 
race condition.  Just don't show the type in summary.  Likely fixes
once-seen assertion failure.
 2012-01-17 18:48:33 -08:00
Eric House
7a90f71d41 up version strings 2012-01-17 18:23:26 -08:00
Eric House
07e93971d3 makefile for latest CSW 2012-01-17 18:19:57 -08:00
Eric House
4a52ad4d0c cleanup: remove logging 2012-01-17 06:54:07 -08:00
Eric House
2a51f8d621 cleanup 2012-01-17 06:53:47 -08:00
Eric House
960dfc7825 draw alternating game lines in alternating colors 2012-01-16 12:13:35 -08:00
Eric House
edd1dd95dd Merge remote branch 'origin/android_branch' into android_branch 2012-01-13 07:54:40 -08:00
Eric House
546ec8a3f4 get non-printing column out of cols array to be treated separately. 2012-01-13 07:54:11 -08:00
Eric House
2902b38405 Merge remote-tracking branch 'origin/android_branch' into android_branch 
Conflicts:
	xwords4/relay/scripts/showgames.php
 2012-01-13 07:50:53 -08:00
Eric House
ca49078730 improve to print each game as multiple rows, one per device. 2012-01-12 19:17:38 -08:00
Eric House
8c52836f9d php file to display state of relay's DB. This is the first and rough cut. 2012-01-12 06:30:30 -08:00
Eric House
bd35f8363f cast enum to int inside switch to avoid new compiler error 2012-01-11 18:43:51 -08:00
Eric House
7de8a90df3 silence compiler warning. 2012-01-11 18:29:14 -08:00
Eric House
37b333001b outline of php script to print contents of games DB 2012-01-05 20:25:34 -08:00
Eric House
db78b986c9 I've seen index OOB exceptions from lookup code, so assert at likely 
entry point that null array isn't being passed.  This should probably
not ship.
 2012-01-05 17:19:58 -08:00
Eric House
1fc286ee95 show in collapsed summary if game is over 2012-01-05 17:18:07 -08:00
Eric House
1ae2879fb7 tweak logging 2012-01-04 18:35:21 -08:00
Eric House
5b9b531cb9 log one line before honoring logging-on preference. 2012-01-04 18:34:15 -08:00
Eric House
b8528145b3 explicitly store bool as int 2012-01-04 18:21:52 -08:00
Eric House
4a8a52a921 Merge remote branch 'origin/android_branch' into android_branch 2012-01-04 18:16:32 -08:00
Eric House
caa40fa023 store most recent IP address each device has come in on. Requires new 
column in db.  Not really used yet but interesting to watch....
 2012-01-04 18:14:12 -08:00
Eric House
72dd8f6b6a ignore debian build files 2012-01-04 18:11:29 -08:00
Eric House
32988413dd cleanup: remove unneeded private constructor and make statics private 2012-01-04 06:26:17 -08:00
Eric House
814e4dd088 cut some logging 2012-01-03 18:53:58 -08:00
Eric House
8e62cf10c7 script to uninstall 2012-01-03 18:53:42 -08:00
Eric House
03e6db5107 remove logging 2012-01-03 18:27:25 -08:00
Eric House
0e7fcf7b51 ignore new obj dir 2012-01-03 18:27:15 -08:00
Eric House
de269f1e3d up copyright for the new year 2012-01-03 06:20:23 -08:00
Eric House
a2c4114d0b fix uninitialized variable error 2012-01-02 18:25:01 -08:00
Eric House
1b395b637b use the full name 2012-01-02 18:17:29 -08:00
Eric House
6344db199a go with target==7 for consistency. 2012-01-02 18:15:43 -08:00
Eric House
d0999d1944 update build scripts to use newer NDK. 2012-01-02 18:11:36 -08:00
Andy2
9879f96729 cleanup -- no code change 2011-12-21 18:50:55 -08:00
Andy2
2a34cd1e05 remove second param from server_do() -- it doesn't work anyway. 2011-12-21 18:45:05 -08:00
Eric House
cb04eb8840 finally got the socket leak: use keepalive ioctl to detect sockets 
whose other ends have gone down without closing properly.
 2011-12-21 18:18:30 -08:00
eehouse@eehouse.org
d5d3ad2cb0 Merge branch 'android_branch' into send_in_background 2011-12-21 06:49:03 -08:00
Andy2
f475356c87 up strings for new release 2011-12-21 06:46:42 -08:00
eehouse@eehouse.org
abd6727b10 Merge branch 'android_branch' into send_in_background 2011-12-20 17:34:26 -08:00
Andy2
0e487a4a42 When creating game in response to new-from menuitem, juggle players if 
the juggle newgame preference is set.
 2011-12-20 17:31:13 -08:00
Andy2
3e42c68091 add randomly-generated inviteID to set of params transmitted with an 
invitation and stored in a summary.  On receipe of an invitation, if
the room/inviteID exists just drop it -- don't even bring app to the
foreground.  This is meant to stop people from getting lots of
games/warnings about dupes if they happen to trigger a refresh of the
negame.php page in their browsers.
 2011-12-20 17:29:05 -08:00
Andy2
9023806b5f cleanup: move instanceof/cast from use of vector elements to addition 
of elements to save memory and time.
 2011-12-20 17:24:38 -08:00
Andy2
f40174ea30 update to add new optional param -- invite ID 2011-12-20 17:14:21 -08:00
Andy2
6cc1a2d672 Add new column and up db version number. 2011-12-20 17:12:23 -08:00
Andy2
9a26ccf1c8 prevent long names from forcing linewrap 2011-12-20 17:10:41 -08:00
Andy2
8eaeb9c2d0 reword SMS invite so URL isn't split across messages (which makes it 
not recognized by recipient as a clickable URL).
 2011-12-18 16:23:14 -08:00
Andy2
431a01ef0a remove logging I didn't mean to check in 2011-12-18 15:55:54 -08:00
Andy2
d03fc77990 list changes for next release 2011-12-18 12:27:13 -08:00
Andy2
c2c2c7e766 NEW_TASK plus CLEAR_TOP is the magic combination -- says one set of 
docs.  Looks good so far.
 2011-12-18 12:23:00 -08:00
Andy2
dd8da6d312 tweak wording 2011-12-18 12:22:06 -08:00
Andy2
a86ffa39ba up strings for next beta 2011-12-16 20:59:40 -08:00
Andy2
0d6b5914b9 revert to standard launchMode to get proper from-Launcher behavior and 
specify a pair of flags when background-launching GamesList that
strips any stack it has and doesn't launch a new instance.  Seems to
fix the problems with launching from notifications and invite emails.
But then I've thought this fixed before.
 2011-12-16 19:02:20 -08:00
eehouse@eehouse.org
14bddb0e45 Merge branch 'android_branch' into send_in_background 2011-12-15 18:46:24 -08:00
Eric House
888b4f6701 fix undeclared variable. 2011-12-15 18:45:22 -08:00
Eric House
166d8f8c03 log number of sockets tracked -- it's climbing on server and I need to 
figure out why.  This and listening for POLLRDHUP are a start (but not
sufficient).
 2011-12-15 18:41:07 -08:00
Eric House
b04604595f change assertion to log -- fails very infrequently which is probably to be expected. 2011-12-15 18:37:20 -08:00
Eric House
af7398ce20 fix undeclared variable. 2011-12-15 18:36:47 -08:00
Andy2
2ff4338797 Move more oft-used button. Thanks JB. 2011-12-15 18:33:10 -08:00
Andy2
494652518a comment out dead code (entire class) 2011-12-15 07:44:16 -08:00
Andy2
f504c3688c reverse sense of test done on receiving invitation whether game 
already exists.  Unless I'm missing something I have it wrong.
 2011-12-14 20:09:57 -08:00
Andy2
420661bf9f put back the URL in parens. Not all email clients show the link otherwise. 2011-12-14 20:08:38 -08:00
Andy2
d6ce11b084 fix to compile with DEBUG off 2011-12-14 18:17:52 -08:00
Andy2
867d9d68b0 script to install onto multiple emulators 2011-12-14 18:17:37 -08:00
Andy2
5cd8694569 ignore dicts in main wince dir 2011-12-14 07:37:59 -08:00
Eric House
de59408cb0 Merge remote branch 'origin/android_branch' into android_branch 2011-12-13 21:34:58 -08:00
Eric House
1d0b554283 add debian/ files as generated by dh_make: no changes yet, so debuild 
builds an empty .deb.
 2011-12-13 18:57:19 -08:00
Andy2
0dfc1312ff set up intents to limit choices in sending invites to SMS and email, 
and recast choices offered users from text vs. html to SMS vs. email.
Revert recent change (88986b49d5) adding
visible URL to email as it doesn't seem to be needed now.  Will want
to keep an eye on that.
 2011-12-13 17:24:21 -08:00
Andy2
e5294f2393 add to commented out code 2011-12-12 19:09:50 -08:00
Andy2
fa39db7fc6 comment out file not being used now 2011-12-12 19:01:04 -08:00
Andy2
f07e1c5ea1 use same email address for both ways you can send to me, and rfc822 
instead of text type to prevent giving handler options that aren't
email clients.
 2011-12-12 19:00:30 -08:00
Andy2
fe98d4983c fix to compile for win32 with new APIs and to some extent to run 
(under WINE only).  Randomness is pretty screwed up -- typical initial
tray is all As.
 2011-12-12 18:53:40 -08:00
Andy2
3b13f047d7 fix to accept new dict format with 4-byte header 2011-12-12 18:51:49 -08:00
Andy2
88986b49d5 include visible URLs in parens since something about mailing seems to be 
breaking them inside <a> tags so there's something for a user to tap.
 2011-12-12 07:08:56 -08:00
eehouse@eehouse.org
9e979a9e7f Merge branch 'android_branch' into send_in_background 2011-12-08 20:59:24 -08:00
Eric House
7c9519f80f remove translations of translations of strings no longer there 2011-12-08 18:13:20 -08:00
Eric House
78672c01a3 there's room to spell out length 2011-12-08 18:12:10 -08:00
eehouse@eehouse.org
b2a3c444f3 Merge branch 'android_branch' into send_in_background 2011-12-07 19:09:36 -08:00
eehouse@eehouse.org
4581046954 Merge remote branch 'origin/android_branch' into android_branch 2011-12-07 19:07:37 -08:00
eehouse@eehouse.org
20fa54ba59 Merge branch 'android_branch' into send_in_background 2011-12-07 19:06:26 -08:00
Andy2
46efe15f4e up version and change notes for new release 2011-12-07 19:06:03 -08:00
Andy2
2992c33396 Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java
(conflicts were for formatting changes only)
 2011-12-07 18:46:59 -08:00
Andy2
0d4e839dba log an error and drop bad fwd packet rather than assert 2011-12-07 18:43:13 -08:00
Eric House
6cc3770cd1 script to trace history of one game in db by polling db and listing 
changes
 2011-12-07 18:37:28 -08:00
Andy2
2d7ac8e7b0 use SystemClock.elapsedRealtime() rather than 0 as initial fire time 
when setting background update timer.
 2011-12-07 18:33:26 -08:00
Andy2
c12f64cc03 save pendingMsgLevel flag as part of summary. This fixes reset games 
being displayed with the sync icon if they had it before the reset.
I'm not sure if not saving was an omission or if I've forgotten the
reason.  There *is* separate API for clearing the flags stored in that
variable but it requires a second DB write.
 2011-12-07 18:24:22 -08:00
Andy2
7b985fcbae fix formatting -- no code change 2011-12-07 06:16:11 -08:00
Andy2
17edc79aaf Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
 2011-12-06 19:56:10 -08:00
Andy2
ded7ffc6fe Attempting to fix occasional stalls of background proxy checker. It 
could be caused by the timer not running after an install, so always
launch it when the app is launched.  (There's no notification
available on [re]install.)  So that the check doesn't happen
immediately, which would be silly, make the initial wait same as
interval when not called in response to check-relay menu.
 2011-12-06 19:52:01 -08:00
Andy2
20446bcf32 for style points, don't return from middle of function. No behavior 
change.
 2011-12-06 19:49:41 -08:00
Andy2
5d01de4c0c found a better send email menu icon 2011-12-06 19:24:22 -08:00
Andy2
5d09c7bbed add git describe for version to email body 2011-12-06 19:19:50 -08:00
eehouse@eehouse.org
88b0535866 Merge remote branch 'origin/android_branch' into android_branch 2011-12-06 18:51:50 -08:00
Eric House
7015ae500b exit after showing usage 2011-12-06 18:50:04 -08:00
Andy2
7884246d7a add menu to main screen for sending me email. TODO: find a darker 
menu icon; add git revision to outgoing text.
 2011-12-06 18:49:48 -08:00
Andy2
3b48c3ca60 use title rather than a field in custom view for title of lookup 
dialog.
 2011-12-06 18:25:55 -08:00
Andy2
7c76af30b2 remove excessing logging 2011-12-06 18:21:48 -08:00
Andy2
ebca62b25e don't specify text file for view used in Dialog -- device will set it. 
Prevents invisible text on HTC MyTouch.
 2011-12-06 18:21:33 -08:00
Andy2
0474984b82 export new preference from jni and add a checkbox setting for it 2011-12-06 18:18:50 -08:00
Andy2
b0470d5276 add new preference that when set prevents calculation and drawing of 
crosshairs.
 2011-12-06 18:17:55 -08:00
Andy2
daa64a19a4 need to generate local.properties now that it's not checked in 2011-12-04 19:32:06 -08:00
Andy2
2918e8f059 need to generate local.properties now that it's not checked in 2011-12-02 21:35:12 -08:00
eehouse@eehouse.org
e1e8516e1b Merge branch 'android_branch' into send_in_background 2011-12-02 19:04:12 -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
Eric House
dc42e63974 fix read_packet() logging 2011-12-02 18:55:47 -08:00
Eric House
964d2dfb0b allow, by default, more than one-player-per-device, but require that 
roomnames be unique to eliminate risk of devices not matching up
correctly.
 2011-12-02 18:55:20 -08:00
Eric House
b706486b6e get rid of stringstream: it's either buggy or I'm using it 
incorrectly, but regardless postgres doesn't like random chars
terminating queries.
 2011-12-02 18:32:37 -08:00
Eric House
3f5e62c9b7 remove logging 2011-12-02 18:31:05 -08:00
Andy2
ae2e27e651 Put the values button back (and remove the corresponding menuitem). 2011-12-02 18:14:26 -08:00
Andy2
08063d9444 Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/NetUtils.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
 2011-12-01 21:18:37 -08:00
Andy2
4c320a52e7 allow scrolling to go a bit deeper 2011-12-01 21:10:04 -08:00
Andy2
fc00102384 don't leak/fail to install zoom-out button when chat enabled 2011-12-01 21:09:37 -08:00
Andy2
3e21b7845a comment 2011-12-01 21:04:31 -08:00
Andy2
85fdb950bb init board so deeper scrolling possible 2011-12-01 21:04:18 -08:00
Eric House
cbd455148d comment only. I tracked down the most recent network proto change 
from before which devices probably can't upgrade mid-game once the
MAX_COLS=32 change is enabled and wanted to record it.
 2011-12-01 20:23:58 -08:00
Eric House
4a32942e57 two fixes that seem to allow old- and new-proto devices to play games 
with 15x15 and 17x17 (and presumably larger) with the old games being
upgraded mid-game: when server's new and wants to use a larger board
but not all clients are capable, shrink the board; and, when new
server is opening state saved by pre-upgrade code, assume a non-0
proto version for clients that registered earlier (as old code didn't
save the client's proto version.)
 2011-12-01 20:22:16 -08:00
Eric House
6691c0713c Merge remote branch 'origin/android_branch' into android_branch 2011-12-01 20:16:15 -08:00
Eric House
0065f5078e add variable controlling odds of "upgrading" -- which still needs tweaking. 2011-12-01 20:16:09 -08:00
Eric House
1e48a8d615 Merge remote branch 'origin/android_branch' into android_branch 
Conflicts:
	xwords4/common/model.c
 2011-12-01 20:12:27 -08:00
Eric House
7da7dbc731 shoulda tried compiling before committing a large merge.... 2011-12-01 19:54:56 -08:00
Eric House
9d42e3f4d0 move logf and showf into their own DbgUtils class 2011-12-01 19:51:02 -08:00
Eric House
47884b8387 ignore new tools-generated file 2011-12-01 19:50:22 -08:00
eehouse@eehouse.org
1272ed3bf5 Merge remote branch 'origin/android_branch' into android_branch 2011-12-01 19:46:10 -08:00
Andy2
577c2c8538 move MultiHandler implementation inside BoardView. 2011-12-01 19:44:22 -08:00
Andy2
15503522f2 implement pinch-to-zoom on board -- and do it in such a way that class 
loader doesn't barf on older versions of the OS that don't provide the
necessary APIs.  Tested only on original Motorola Droid so far (and
emulator running 1.6, which is too old.)
 2011-12-01 18:56:44 -08:00
Andy2
b242d70029 up target SDK to pull in multitouch APIs 2011-12-01 05:40:50 -08:00
Eric House
32f1dfa5da configure by passing params rather than setting ENV variables 2011-11-30 21:01:11 -08:00
Eric House
c39487e0cc add ability to start out with mix of old and new versions and have old 
upgrade to new at random times.
 2011-11-29 20:51:19 -08:00
Eric House
c1e420f726 Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/relay/rq.c
 2011-11-29 06:45:32 -08:00
Eric House
c8b868c243 Separate app from params. No change in behavior (though restart of 
existing games is now broken), but this sets up testing mid-game
upgrade.
 2011-11-29 06:43:16 -08:00
Eric House
ba5ff6cb5d fix too-small buffer. Seems I've done this before. 2011-11-28 20:35:34 -08:00
Eric House
c6e994abef use $RANDOM rather than $SEED -- still repeatable, but avoids relay 
problems when devices have same game seed.
 2011-11-28 18:53:40 -08:00
Eric House
adb9b3853d fix bugs around new variable-length tiles array changes, and otherwise 
improve storage of col/row data so that test runs succeed with
MAX_COLS of 16 or 32.  Still to do: test mid-game upgrade.
 2011-11-28 18:46:08 -08:00
Eric House
42d1d2f7bd define variable before it's first used. 2011-11-28 18:21:46 -08:00
Eric House
e5a943eecb tweak output 2011-11-28 18:15:09 -08:00
Eric House
f20f9d6503 complain if conf file not found (rather than leaving relay to crash 
with an assert whose cause may not be obvious)
 2011-11-28 18:14:39 -08:00
Eric House
1b864b5527 Add backtrace function. May only work on Linux but still very useful. 2011-11-28 18:12:56 -08:00
Eric House
384a41ed5b add ability to specify seed and vary board-size 2011-11-25 18:03:51 -08:00
Eric House
2bfe120014 do away with need to accept out-of-bounds values in getTileRaw(). 2011-11-23 18:25:12 -08:00
eehouse@eehouse.org
93a7d15a5e Merge remote branch 'origin/send_in_background' into send_in_background 2011-11-23 17:57:54 -08:00
Andy2
1575279cd8 replace restore menus in prefs activity with buttons at bottom of 
screen.  The trick involves getting the OS to insert the prefs xml
layout as a ListView, and seems like a hack, but it works so far.
Ought to be tested on several OS versions before next release.
 2011-11-22 19:00:03 -08:00
Andy2
cd23022cde Get rid of int m_msgID, storing all dialog messages as String m_msg. 
The code was getting confused and sometimes set one then tried to
display the other.
 2011-11-22 18:28:57 -08:00
Andy2
cdef8f42f6 add comment about NPEs received when device networking foobared. No 
code change.
 2011-11-22 18:12:21 -08:00
eehouse@eehouse.org
b2a0057d7b Merge branch 'android_branch' into send_in_background 2011-11-21 22:23:25 -08:00
Andy2
91eeee0f72 new file that build.xml comments say should be checked in. 2011-11-21 22:21:28 -08:00
Andy2
d37424ad7f Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/linux/linuxutl.h
 2011-11-21 22:18:52 -08:00
Andy2
a8859599dd update emacs compile-command for new SDK. No code change. 2011-11-21 22:16:33 -08:00
Andy2
795b86e569 when asked to browse empty dict, put up explanatory dialog then exit 
activity.  Required new DlgDelegate method to send event after posting
alert.  Note that eventually when the dict browser shows tile info as
well as words this will change.
 2011-11-21 18:08:51 -08:00
Andy2
f32f7a8b19 Don't behave badly in presence of empty dict: word count should be 0 
and sanity test should pass.
 2011-11-21 18:07:08 -08:00
Andy2
d856b9a8ce Don't behave badly in presence of empty dict: word count should be 0 
and sanity test should pass.
 2011-11-21 18:06:46 -08:00
Andy2
e1e9a68d8f fix ptr out-of-bounds test. Was failing an empty dict. 2011-11-21 18:04:20 -08:00
Eric House
9115b344fb use a hash of lists rather than a single list to store pending 
background messages to fix assertion failure when more than two
devices are playing: messages must be sent grouped by relayID.
 2011-11-21 17:57:38 -08:00
Eric House
eec83fe5b6 don't fail when RELAY_ALLHERE comes without a connection, as that will 
happen when messages come in background.  I'm not sure what the test
I'm removing was there to catch so need to test thoroughly.
 2011-11-21 17:38:50 -08:00
Eric House
b00327aa8b fix to work for NDEVS > 2. 2011-11-21 17:35:08 -08:00
Eric House
72a3ed1891 increase buffer size: longer relay name caused stack overwrite 
failures.
 2011-11-21 17:33:44 -08:00
Eric House
a0a8a816a4 make number of devices configurable 2011-11-21 10:09:29 -08:00
Andy2
c7906c3bd4 prevent min from exceed max by not including values below min as 
possible max settings and vice-versa.  Since spinner values no longer
have a consistent base, parse them rather than relying on position --
requires assumptions such as that View is a TextView, but that is
probably not changing.
 2011-11-21 08:19:25 -08:00
Andy2
aba4e02cac use a standard list item for words rather than consing up a TextView 
and having to worry about text size.
 2011-11-21 07:20:12 -08:00
Eric House
1d13f7d1f2 update instructions for building 2011-11-19 20:05:04 -08:00
Eric House
33496914a4 More new SDK fixes: put back script to generate GitVersion.java. 2011-11-19 19:49:15 -08:00
Eric House
e335f5cf61 fix to use new sdk version to generate local.properties 2011-11-19 19:23:58 -08:00
Eric House
d806e3f906 changes made by android tool for compatibility with new SDK version 2011-11-19 19:07:16 -08:00
Andy2
c781bfc29e remove hard-coded 2-15 array for word-len limit spinners and instead 
create at runtime arrays that represent the words actually in the dict
-- e.g. showing a max of 8 when there are no words longer than that.
 2011-11-18 21:24:59 -08:00
Andy2
872ebe68f4 make array one large to hold word whose len is == max 2011-11-18 21:14:24 -08:00
Andy2
b86330c71f add dict_iter_getCounts() 2011-11-18 21:10:17 -08:00
Andy2
21330af568 make tiles array variable sizes. 32*32*2 is too many bytes to use 
when the typical board at 15*15 requires less than 1/4 of that.
 2011-11-18 18:59:59 -08:00
Andy2
cc0105e14c add param to dict_countWords in which it accumulates counts per word 
length.  Shouldn't hurt speed too much if null passed.
 2011-11-18 08:15:21 -08:00
Andy2
598be8b404 MAX_COLS -> MAX_COLS_DICT for dict-related stuff (since dicts are 
staying with fewer words for now.)
 2011-11-18 07:56:02 -08:00
Andy2
2eac8e70e0 adding missing ifdef 2011-11-18 07:43:37 -08:00
Andy2
37e81fd062 use number of bits based on stream version not current build -- 
required in case new code is talking with old in networked game.
 2011-11-18 07:43:10 -08:00
Andy2
f9c3a95603 move stream version definitions 2011-11-18 07:41:57 -08:00
Andy2
f06eaa573b fix to compile with API changes 2011-11-18 07:41:13 -08:00
Andy2
4760ceda5a Merge branch 'android_branch' into android_browsedict 
Conflicts:
	xwords4/android/XWords4/jni/anddict.c
 2011-11-17 20:55:02 -08:00
Eric House
55d23c9502 various improvements, including allowing to specify seed to enhance 
reproducibility, copying xwrelay.log into directory with game logs
when they don't finish for easier analysis.
 2011-11-17 19:58:08 -08:00
Eric House
cd699ba547 close socket when done 2011-11-17 19:56:54 -08:00
Eric House
8a51d5f3e4 fix race condition that was breaking tests: when one device sends two 
messages they must be handled by the relay in order.  So modify linux
client to build a single packet of all messages sent instead of
letting rq sent each on a separate socket.  The relay would give the
sockets to different threads and sometimes the wrong one won.  Will
need to make sure the android code's doing the same thing (it appears
to be), or perhaps make the coalescing code common so I only debug it
once.
 2011-11-17 19:56:36 -08:00
Andy2
1889fbd78b relaunch activity, with pararms in intent, every time min or max 
changed.  Can't figure any other way to change the list of section
heads, as setListAdapter() is ignored when called a second time.
Note: I got an assertion failure in the jni indexing code so there
may be a bug here.
 2011-11-17 19:52:10 -08:00
Andy2
aab9fd9df2 test the variable that may have been changed, not the one that holds 
the pre-change value.
 2011-11-17 06:54:26 -08:00
Andy2
63c0c5cf09 fix compile warning by passing ptr to embedded super 2011-11-17 06:11:42 -08:00
Andy2
210c59ef9b move bonus square values into model: add API to set an array, and API 
to query model for values.  Now everybody else queries new model API
rather than client via util_getSquareBonus(), model uses its internal
values if present otherwise falls back to util_getSquareBonus(), and
internalizes the array as part of the game.  Now it should be easier
to have different bonus patterns and to have them exchanged as part of
network game init.
 2011-11-16 19:01:11 -08:00
Andy2
fab39a5f87 Trying to deal with old- and new-proto devices interacting. Fix 
clients to append their stream version to their inital connect
message.  (The format can't change, so detecting additional length was
the only option.  comm.c on existing clients won't allow more than one
connect message per channel, so adding a new to be used in addition
didn't work.)  New servers detect this; old will ignore.  Track the
version (implicit or not) of all clients, and use the lowest any
supports, so that new server and all new clients will use newer proto.
 2011-11-16 06:47:55 -08:00
Andy2
bdb8e6f03c fix several crashers that prevented network games from working when 
MAX_COLS was larger than 16.  In order that old-style messages on
relay be readable by new-style code on device, modified server.c's
protocol to include stream version.  But: unless I come up with a
better way of doing this all devices will have to be upgraded at the
same time: old won't be able to read the new format as it's done here.
 2011-11-15 06:13:25 -08:00
Andy2
379e5f1d96 use actual rather than max possible board dimensions to apportion 
space, fixing crashes when max upped to 32.  Will still fail as actual
size approaches that number.
 2011-11-14 20:18:09 -08:00
Andy2
86d5778ec3 remove 16x16 limitation on board size, replacing with 32x32. Change 
is enabled by a compile-time flag so Android needn't follow yet.
 2011-11-14 18:21:41 -08:00
Andy2
2492e7cfc5 Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/linux/cursesmain.c
 2011-11-13 17:10:46 -08:00
Eric House
d6fecaa3d3 don't crash when dict is empty file 2011-11-13 17:06:57 -08:00
Andy2
4edca4ee4c Check for null return from getInfo(), the result when it tries to open 
a corrupt dict.  Such dicts should never get this far, but it doesn't
hurt to be safe.
 2011-11-11 18:30:53 -08:00
Andy2
44c5500ab0 don't crash when empty or corrupt dict file passed in. 2011-11-11 18:29:26 -08:00
Andy2
b334e688bb use getInfo to run sanity check on .xwd files in download directory. 
This prevents deliberately corrupted files from making it into dict
lists.  To the extent that checkSanity() works, it should make use of
that dir safe.
 2011-11-11 07:45:25 -08:00
Andy2
9ff4596667 fix compile warning by passing ptr to embedded super 2011-11-11 07:42:00 -08:00
Andy2
92eb6b857d allow null info ptr so getInfo can be used solely to run sanity check 
on dict.
 2011-11-11 07:41:31 -08:00
Andy2
dddec50f1d Merge branch 'android_branch' into android_browsedict 
Conflicts:
	xwords4/android/XWords4/jni/Android.mk
	xwords4/linux/Makefile
	xwords4/linux/linuxmain.c
 2011-11-10 19:22:57 -08:00
eehouse@eehouse.org
e48ed847df Merge remote branch 'origin/android_branch' into android_branch 2011-11-10 19:02:57 -08:00
Andy2
284bd2d0c4 turn on sanity checking of dicts in download directory, but from 
DictLangCache rather than when the directory's walked initially.  Need
to test still with bogus dict and make sure it's never shown.
 2011-11-10 19:02:18 -08:00
Eric House
5be5e9fdeb cleanup script output 2011-11-10 18:39:35 -08:00
Eric House
619c25ee49 add a bit of logging to help deciphering test app problems. 2011-11-10 18:28:11 -08:00
Eric House
cee738942e back out earlier change using redo: it was broken. Add assert to 
catch problem with passing ptr to tiles as src of tiles.
 2011-11-10 18:26:32 -08:00
Eric House
6d98631640 sanity check: make sure tiles are within range. 2011-11-10 18:24:45 -08:00
eehouse@eehouse.org
9f22b11f81 Merge remote branch 'origin/android_branch' into android_branch 2011-11-10 06:54:42 -08:00
Andy2
43a79a0b47 use undo/redo rather than copying stack to figure past move score. 
This may have been contributing to crashes, but the new code's more
effecient anyway.
 2011-11-10 06:52:33 -08:00
Andy2
00f743409a script for reproducing problem with relay games that show up randomly. 2011-11-10 06:51:30 -08:00
Andy2
d479b2b979 use timeout rather than idle. Sometimes (due to bug?) curses app is 
too busy ever to fire idle proc.
 2011-11-10 06:51:05 -08:00
Andy2
645695e358 improve logging, and fix mistyped variable found by inspection rather 
because of a problem.
 2011-11-10 06:41:07 -08:00
Andy2
b9a7574925 fix emacs header comments; no code change 2011-11-10 06:39:36 -08:00
Andy2
af5c8a096f don't pass a pointer to a tray inside the model to model code that 
will modify that tray!  Fixes nasty random crash/assertion failure.
 2011-11-10 06:35:05 -08:00
Eric House
36c267ad88 Merge remote branch 'origin/android_branch' into android_branch 2011-11-09 06:52:32 -08:00
Eric House
268f018140 add dict sanity check that will, I hope, catch corrupt dicts. 2011-11-09 06:51:12 -08:00
eehouse@eehouse.org
ffd6a42c1e Merge remote branch 'origin/android_branch' into android_branch 2011-11-08 21:12:47 -08:00
Eric House
c591182d6c Modify linux bonus square code to work with board data that's half the 
size.  Toward a board small enough to be transmitted as part of
network game initialization.
 2011-11-08 21:11:06 -08:00
Andy2
956fe350ba remove changed param -- mmap's the default now. 2011-11-07 18:19:12 -08:00
Andy2
e4aa2ff180 finish changelog 2011-11-07 06:51:27 -08:00
Andy2
995c410b7c revert unintended checkin: logging should not always be on. 2011-11-07 06:49:55 -08:00
Andy2
4b5a06fe20 test code tweaks 2011-11-05 06:14:46 -07:00
Andy2
3707e7aaca tweak to get performance to same level as before length-filtering was 
added, mostly by using local variables instead of ptr-accessed in
struct and macro magic to support that.  Passes every test I can think
of on Linux but fast-scrolling broken on Android.
 2011-11-05 06:14:35 -07:00
eehouse@eehouse.org
214f8990bf Merge branch 'android_branch' into android_browsedict 2011-11-04 17:23:27 -07:00
Andy2
ac875894a6 replace assert that occasionally fails with logging. Not sure why it 
fails, but I just drop the (timer) event in the non-debug case so it's
probably harmless.
 2011-11-04 17:19:50 -07:00
Andy2
5123bebe50 don't set dict name to "download more". Just not a good idea. 2011-11-04 17:15:12 -07:00
Andy2
0561ca5ab9 make buttons a bit wider since the bar scrolls now, and rearrange. 2011-11-04 17:14:37 -07:00
Andy2
223d2d6e92 set configchanges on chat activity -- it handles orientations changes fine. 2011-11-04 07:11:34 -07:00
eehouse@eehouse.org
71b09b80ab Merge remote branch 'origin/android_branch' into android_branch 2011-11-04 07:05:56 -07:00
eehouse@eehouse.org
6c1b0e9b58 Merge branch 'android_branch' into android_browsedict 2011-11-04 07:05:16 -07:00
Andy2
61681745c2 sort languages (groups) in dicts activity alphabetically 2011-11-04 07:03:40 -07:00
Andy2
57a1069efe wire min/max through jni: now selecting numbers changes the number and 
length of words selected.  But it's really slow, and indexing seems
broken in some cases.  Not ready for release yet.
 2011-11-04 06:56:59 -07:00
Andy2
fa14f02b69 add ui support for min,max filtering of wordlist. Not yet wired into 
jni.  But: even disabled it seems to lead to much slower scrolling, so
I need to investigate that before taking this any further.
 2011-11-04 06:18:11 -07:00
Andy2
1bba95a985 add minmax compile-time flag, commented-out 2011-11-04 06:17:09 -07:00
Andy2
da02e994b7 protext min,max with compile-time flag 2011-11-04 06:16:44 -07:00
Andy2
4e66747bbc fix for changed API 2011-11-03 21:35:17 -07:00
Eric House
adb9473a87 Merge branch 'android_branch' into android_browsedict 
Conflicts:
	xwords4/common/dictiter.c
	xwords4/linux/linuxmain.c
 2011-11-03 21:32:04 -07:00
Eric House
30387bc528 up version codes 2011-11-03 21:27:43 -07:00
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