Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-30 10:26:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
3142 commits 21 branches 243 tags 33 MiB
Commit graph

3123 commits

Author SHA1 Message Date
eehouse
f1f5b63a0d put ok/cancel buttons back on player edit dialog. Just feels better 
that way.
 2010-04-08 04:12:51 +00:00
eehouse
ea07f92b28 don't show remaining tiles when <= 0 2010-04-08 04:12:26 +00:00
eehouse
97569ae6d0 add advanced pref to hold dict download url; use it. 2010-04-08 04:12:08 +00:00
eehouse
27f65ba39d open connection to relay in the network thread, not in UI thread. It 
can block for a while.
 2010-04-08 04:11:39 +00:00
eehouse
cbb7f5ff4f move game shutdown into onPause and startup from onCreate to onStart 
and onResume so that state's been saved by the time GamesList gets
focus again and wants to display it.  This requires that startup be
ingnored when game's already loaded and that some code test for null
game ptr before acting.
 2010-04-08 04:11:15 +00:00
eehouse
af0c088464 close cursor to avoid exceptions in finalize 2010-04-08 04:10:42 +00:00
eehouse
df473199f9 fix sql syntax error 2010-04-08 04:10:10 +00:00
eehouse
812262e41d add basic framework to collect metadata prior to saving open game 
(e.g. number of moves) and display it in game list.  What to save and
how to display it still not finalized but it works.
 2010-04-08 04:09:50 +00:00
eehouse
aa8b6ac7e6 get rid of warning-generating copyright symbol 2010-04-08 04:09:11 +00:00
ehouse
daa84bf4e2 include date in output 2010-03-31 02:46:29 +00:00
eehouse
2d740bd4b0 remove unused file 2010-03-28 23:39:10 +00:00
eehouse
b07808e8db add copyright notice; turn logging back on for jni code 2010-03-28 23:38:53 +00:00
eehouse
4de143ca10 turn off logging for release 2010-03-28 16:09:55 +00:00
eehouse
ec96b0dd0d start comms after giving CommsTransport a handler for any network 
activity.  This might fix a very rare race condition.
 2010-03-28 16:09:46 +00:00
eehouse
9b955ae770 resendAll on REconnect as well as connect since it doesn't otherwise 
seem to get done.
 2010-03-28 16:09:34 +00:00
eehouse
47f74ceef7 copy improvements from trunk, then fix to deal with missing dict and 
use new -o flag.
 2010-03-28 16:09:27 +00:00
eehouse
6325c3dc63 remove old comment 2010-03-28 16:09:19 +00:00
eehouse
f4b64fe97d add option, off by default, to stall each message forward by some time 
to better simulate network conditions when testing against local relay.
 2010-03-28 16:09:07 +00:00
eehouse
603462fc33 add option to skip modal dialog showing final game score (may prevent 
curses version from becoming nonresponsive when used from playme.sh);
add menu command to curses version to resend messages.
 2010-03-28 16:08:54 +00:00
eehouse
13b46297e0 Separate life of socket from that of selector: close socket if must 
but don't exit the thread and be ready to reopen.  Fixes bug where
wouldn't reconnect to relay if died and then came back.
 2010-03-25 04:53:44 +00:00
eehouse
cb5cc975b3 add new params required for comms_getInitialAddr 2010-03-25 04:53:16 +00:00
eehouse
f71430dc27 better logging of outgoing sms -- which still doesn't work in emulator 
after new tools released.
 2010-03-25 04:52:58 +00:00
eehouse
f430a84d75 add comms_transportFailed, and call when relay goes down. This makes 
icon change correctly and comms start trying to reconnect, but the
loop in CommsTransport can't be restarted yet.
 2010-03-25 04:51:55 +00:00
eehouse
55abf1116b get relay port from prefs and pass into jni 2010-03-25 04:50:19 +00:00
eehouse
077bc53e80 go back to having Ok and Cancel buttons: that's the way the built-in 
prefs editors work.  Dismiss == Cancel, again following the built-in.
 2010-03-25 04:48:03 +00:00
eehouse
02a96cdaa6 remove ability to edit host and port when configuring relay. Must use 
prefs/advanced.
 2010-03-21 03:13:16 +00:00
eehouse
786541e9ae pass default hostname in from platform code rather than compiling it 
into jni; in java pull it from preferences and pass into jni.
 2010-03-21 03:12:58 +00:00
eehouse
a32975362a increase text of color labels -- but they should really be white. 2010-03-21 03:12:38 +00:00
eehouse
815ac74ebe change color prefs key names so won't crash opening older db 2010-03-21 03:12:28 +00:00
eehouse
19f6ec62db add a color sample above the RGB sliders so changes appear in real 
time.
 2010-03-21 03:12:17 +00:00
eehouse
d68038b18b Remove ok button from color editor; when cancel chosen don't save changes. 2010-03-21 03:12:02 +00:00
eehouse
9466203844 use sliders instead of text fields for editing of colors, and store 
them as ints.  This will probably cause older versions to crash.  Need
either to change the names of keys or warn with next release.
 2010-03-21 03:11:49 +00:00
eehouse
b20296fbd2 First cut at a color prefs editor. 2010-03-21 03:11:29 +00:00
eehouse
e05b31585d get rid of logging 2010-03-21 03:11:09 +00:00
eehouse
a5c3fa5f59 don't pass empty stream to comms_send: this fixes a problem where 
client code calls server_initClientConnection when the game's already
been started and empty messages get queued up.  Ideally the call
wouldn't happen but I'm not sure how to test if a game's begun.
server's doing the right thing not putting anything in the message.
 2010-03-21 03:10:56 +00:00
eehouse
5806aa0aca get rid of excess logging 2010-03-21 03:10:47 +00:00
eehouse
0b7eee672a do something for -S on curses version too 2010-03-21 03:10:36 +00:00
eehouse
b3a4ac306e actually do something (on the gtk side at least) when -S param is 
passed.
 2010-03-21 03:10:29 +00:00
eehouse
76926abdbf get rid of "ignored" since passwd no longer is 2010-03-21 03:10:20 +00:00
eehouse
b6aaf6c38c in debug builds track who sets env so we can log who has it on 
conflict rather than just assert.
 2010-03-21 03:10:10 +00:00
eehouse
62b586d322 close down jni thread before saving game to fix occasional assertion 
fail occuring when draw and save were in the jni at the same time.
 2010-03-21 03:10:00 +00:00
eehouse
5f6c8fd579 support passwords: save 'em when configuring player, and implement 
askPassword in jni and java code.
 2010-03-21 03:09:47 +00:00
eehouse
4633bc506b turn logging back on 2010-03-21 03:09:23 +00:00
eehouse
e2ad027740 ready for next release: remove Hex dict and turn off logging 2010-03-14 16:32:54 +00:00
eehouse
05f7da8c33 ignore more 2010-03-14 16:25:27 +00:00
eehouse
0943c24669 what I meant to check in: remove log message and commented code 2010-03-14 16:25:18 +00:00
eehouse
c293425d2e When cell background changes to show focus draw cell chars in normal 
color rather than white.
 2010-03-14 16:25:06 +00:00
eehouse
f28f5b80d3 include name of dict being downloaded in download progress dialog 2010-03-14 16:24:54 +00:00
eehouse
f5f54f53f4 increase size of miniwindow text and move linebreak in trading text so 
still fits at larger size.
 2010-03-14 16:24:37 +00:00
eehouse
77373765f8 get rid of strings that don't need localization 2010-03-14 16:24:22 +00:00
eehouse
6a3661d30e use XWListAdapter to get rid of duplicate methods 2010-03-14 05:02:08 +00:00
eehouse
7fadce15ef add menuitem to main games list view that brings up view of all 
installed dicts.  Currently allows to delete them.  Later should allow
invoking a browser like DawgShow.
 2010-03-14 05:01:55 +00:00
eehouse
626a7e4a32 rename list item class/layout to indicate more generic use 2010-03-14 05:01:33 +00:00
eehouse
78fb9e0092 new class that implements those functions in ListAdapter that are 
always the same or depend on a single count variable.
 2010-03-14 05:01:13 +00:00
eehouse
cd2fc9b49a don't try to work on games whose dicts are missing (though users can't 
actually delete them yet): check in GamesList, and put up alert via which
they can launch the download activity.
 2010-03-13 23:11:57 +00:00
eehouse
0f620305f0 refactor to rebuild dict list onResume() to pick up any downloaded dicts. 2010-03-13 23:11:35 +00:00
eehouse
6eb045d3a8 don't crash if exiting without having successfully opened a game. 2010-03-13 23:11:23 +00:00
eehouse
0fc42fe85c get rid of unused DictActivity 2010-03-13 23:11:11 +00:00
eehouse
5ef7697c05 download dicts under app control (with new activity) and save them 
locally rather than leave them in the browser's downloads directory.
Fix code that expects all files in local storage to be games (since
dicts are now there too.)
 2010-03-13 23:10:58 +00:00
eehouse
6e77904d56 layout for dict download progress and string to populate 2010-03-13 23:10:42 +00:00
eehouse
2761772e05 When user dismisses GameConfig form, check if the game being viewed 
has any state (moves) and if the changes being made would invalidate
that state and force a reset.  If so, give the user a choice between
save and discard.  Means CurGameInfo behaves slightly differently if a
game is in progress.  Also fix game reset to preserve comms address.
 2010-03-13 23:10:30 +00:00
eehouse
11d6f7417e when copying strings between structs, realloc, don't just copy ptrs. 2010-03-13 23:10:11 +00:00
eehouse
ef15f50edf add model_getNMoves 2010-03-13 23:09:53 +00:00
eehouse
eab9eed137 rm unused .xml file 2010-03-09 06:30:08 +00:00
eehouse
846f07e929 get rid of save button in comms config dialog 2010-03-09 06:29:49 +00:00
eehouse
a727c3bb2b get rid of tmp font-flags config preference 2010-03-09 06:29:31 +00:00
eehouse
dfb33c33b4 change about toast into about alert, in Utils so callable from two 
locations.  Url and mailto ref may not work yet.  Needs contrast of
text with background fixed.
 2010-03-09 06:29:04 +00:00
eehouse
fd423f7704 treat enter key same as center; improves testing with emulator if 
nothing else.
 2010-03-09 06:28:42 +00:00
eehouse
04e454f922 add relay status icon 2010-03-08 06:16:08 +00:00
eehouse
e73c6d1234 pass relayStatus an enum rather than an int 2010-03-08 06:15:37 +00:00
eehouse
285e1b47d5 get rid of save button: dismiss to save. 2010-03-08 06:15:14 +00:00
eehouse
4bbda7ad6e new strings for force-remote dialog 2010-03-08 06:14:58 +00:00
eehouse
5140b95766 new dialog to force user to pick remote players after making game be 
host; call new CurGameInfo methods to ensure gi is kosher before it's
passed to jni code (which asserts if it's not).
 2010-03-08 06:14:44 +00:00
eehouse
f50a25ef3f move creation of summary string into CurGameInfo 2010-03-08 06:14:28 +00:00
eehouse
9beada3c4c add logic to show different names, even change values if needed, to be 
consistent with rules based on the device role, e.g. that a guest has
no remove players and a host has at least one.
 2010-03-08 06:14:00 +00:00
eehouse
dd002cf60f custom view for dialog to list players in checkboxes and require that 
one be make remote
 2010-03-08 06:13:36 +00:00
eehouse
2741c0067e increase size of player list item view in game config -- looks more 
like a real list now.
 2010-03-08 06:13:19 +00:00
eehouse
5d42cebca1 change compile command 2010-03-08 06:13:06 +00:00
eehouse
0be2096f9c report UnresolvedAddressException, which I've seen 2010-03-08 06:12:44 +00:00
eehouse
257addec99 divider to insert between players 2010-03-08 06:12:21 +00:00
eehouse
47387990e9 represent mid-drag tiles on the board as pending -- usually drawn 
inverted by platforms -- since that's how they'll look once they drop.
Inverted color is easier to follow too.
 2010-03-08 06:12:01 +00:00
eehouse
3b94642e3d don't consider specials that are blanks to be bitmap-backed tiles. 
This prevents the board from passing an array of empty bitmaps into
draw code which in turn allows platform code to be less defensive.
 2010-03-08 06:11:42 +00:00
eehouse
08d5139631 translate blank text from '_' to '?' 2010-03-08 06:11:30 +00:00
eehouse
6e08bbc9ce don't draw tile that's the source of a drag. 2010-03-08 06:11:18 +00:00
eehouse
00e8742ad8 show blank as a ? rather than a _. 2010-03-08 06:10:46 +00:00
eehouse
ec24df8546 include any mid-drag tile, if it's a blank, in the set of blank tiles 
rendered in the second pass.  Mid-drag tiles were not being rendered
if they happened to be blanks.
 2010-03-08 06:10:37 +00:00
eehouse
815a5f85b0 core files happen 2010-03-08 06:10:02 +00:00
eehouse
6bb1170ca8 minor bugs with tray focus: player color not used for pending score; 
pending score doesn't show focus; focussed empty tile slots drawn with
bogus value.
 2010-03-08 06:09:40 +00:00
eehouse
0a34c2512c turn logging back on 2010-03-08 06:08:46 +00:00
eehouse
bc3f6c2c30 turn off debugging for release 2010-02-28 18:19:47 +00:00
eehouse
f896e86693 work around svnversion not working inside git-managed tree 2010-02-28 18:17:35 +00:00
eehouse
5fc86dbe3a 0 means transparent 2010-02-28 16:56:27 +00:00
eehouse
0fa5f5fcd5 improve bitmap generation: only foreground needs to change; background 
can always be transparent.
 2010-02-28 16:55:56 +00:00
eehouse
cd85406c01 create and cache new bitmaps from black-on-transparent originals 
provided from dict based on player color and whether inverted.  This
works around apparent lack of API to change colors of monochrome
bitmaps at draw time (paralleling those for drawing text.)
 2010-02-28 16:54:59 +00:00
eehouse
4e2ebebcfd notify BoardView when prefs change 2010-02-28 16:54:22 +00:00
eehouse
da46fe3163 just draw the bitmap in the largest rect possible. 2010-02-28 16:54:06 +00:00
eehouse
36fd71bde8 use fillRect instead of two lines 2010-02-28 16:53:48 +00:00
eehouse
b4f40627ae fix warnings flagged by Eclipse 2010-02-27 20:22:04 +00:00
eehouse
99847cd0c5 remove noop function 2010-02-27 20:06:45 +00:00
eehouse
a067da05db when IS_CURSOR flag is set, use draw using background from prefs. 2010-02-27 18:06:06 +00:00
eehouse
f0840f1e8d implement focus keys capture and jni interaction. Some hackishness 
required due to inconsistency in ordering of key events,
e.g. sometimes up not preceeded by down.
 2010-02-27 18:05:54 +00:00
eehouse
cb6b19f0aa implement board_getFocusOwner, board_focusChanged and board_handleKey, 
and utils needed.
 2010-02-27 18:05:39 +00:00
eehouse
397d0df573 turn on PERIMETER_FOCUS 2010-02-27 18:05:29 +00:00
eehouse
856b957f6a another file to search 2010-02-27 18:05:21 +00:00
eehouse
671876fc06 fix varargs version of logf 2010-02-27 18:05:12 +00:00
eehouse
47402bd3b5 remove unused field 2010-02-27 18:05:00 +00:00
eehouse
26d4056a76 add timestamp to java logs 2010-02-27 18:04:52 +00:00
eehouse
b6a151a7e8 don't adjust y upward if divider's being dragged -- should be tiles 
only.  Fixes bug where divider can't be dragged unless grabbed low or
started quickly.
 2010-02-27 18:04:40 +00:00
eehouse
7d0bd9d50c implement mini window, jni and java rendering. Works on emulator, but 
may not work as well under fat fingers....
 2010-02-27 18:04:33 +00:00
eehouse
a18470e4a2 add and implement reset menuitem 2010-02-27 18:04:11 +00:00
eehouse
4b48c1a0e6 set draw after ending game so scoreboard will update 2010-02-27 18:03:51 +00:00
eehouse
28edaa09e2 fix missing import (oops) and cleanup final scores stuff. 2010-02-27 18:03:36 +00:00
eehouse
6d1c09e756 fix compile errors introduced by addition of const 2010-02-27 18:03:22 +00:00
eehouse
b52c9f0d14 Fixes bug found by alpha tester by dragging third tile to left of 
divider.  Inval all tiles when a drag ends off any managed space.  We
don't know what tiles have already been moved, and when it's returned
to its initial spot may appear a dup.
 2010-02-27 18:03:15 +00:00
eehouse
cf9c952fc2 handle final scores menuitem: add server_endGame to jni and new 
dialog/mechanism to call back and forth between threads to query and
end game on positive response.
 2010-02-27 18:03:07 +00:00
eehouse
142492ad85 get rid of game info menuitem and strings 2010-02-25 04:52:11 +00:00
eehouse
6fa6162a39 improve choice of font size for cells and tiles: calculate once based 
on a reasonable size, then figure multipliers (floats) to be used to
calculate the size and descent for font selection and positioning
relative to baseline.  Seems to work for dicts with and without
descending chars and with and without diacriticals.  Untested for
dicts with bitmaps (e.g. Catalan.)
 2010-02-25 04:51:35 +00:00
eehouse
3e8d4220f5 hide .apk file 2010-02-25 04:51:16 +00:00
eehouse
8c9b710e61 fix old typo: colors should be different 2010-02-25 04:51:06 +00:00
eehouse
c2ff34eeaa fix compile errors due to conflicts with default 2010-02-24 14:20:09 +00:00
eehouse
ce03b01491 new from translator 2010-02-24 05:21:55 +00:00
eehouse
eb3d0308e0 add const 2010-02-24 04:34:22 +00:00
eehouse
e5f3384050 another .gitignore 2010-02-24 04:30:21 +00:00
eehouse
210332ec93 implement and call comms_resendAll 2010-02-24 04:30:13 +00:00
eehouse
2d22ef1f6a hide more files/dirs 2010-02-24 04:29:54 +00:00
eehouse
8de2665642 implement phonies: add jni->java for util_warnIllegalWord, jni changes 
to preserve the field in CurGameInfo, and java changes to keep
correct text in reused dialogs.
 2010-02-24 04:29:46 +00:00
eehouse
3fd42f8510 temporarily add options to prefs to choose flags passed to Paint for 
drawing text
 2010-02-24 04:29:28 +00:00
eehouse
3ca7f84659 temporarily add options to prefs to choose flags passed to Paint for 
drawing text; improve calc of textHeight to better fill cell.  Still
need to detect dicts where descent isn't used, e.g. hex
 2010-02-24 04:29:17 +00:00
eehouse
8b84bdf56e Once user has rejected a bad word, don't ask about any later ones as 
the whole turn's being rejected.  Should be merged to trunk.
 2010-02-24 04:29:00 +00:00
eehouse
3d26d9fc01 name of file has changed 2010-02-24 04:28:52 +00:00
eehouse
414ee944af turn logging back on 2010-02-24 04:28:44 +00:00
eehouse
ae63c16473 add some .gitignore files 2010-02-24 04:28:34 +00:00
eehouse
6e9fb31f60 fix compile errors due to making some fields const 2010-02-24 04:28:22 +00:00
eehouse
c6e9cb36d0 add .gitignore 2010-02-23 06:05:56 +00:00
eehouse
071edd8121 turn logging off for release 2010-02-21 22:02:55 +00:00
eehouse
c7a0ebb830 cleanup: cache Paint used to draw bitmap, etc. 2010-02-21 21:42:23 +00:00
eehouse
2498e86a38 lock orientation at current setting before bringing up blocking 
dialog; unlock on dismissing it.  The solves problem of how to draw
background board when orientation changes and jni thread is blocked.
 2010-02-21 21:41:21 +00:00
eehouse
fe8e49bce2 Forgot to add this yesterday: interface for jni thread to use to shift 
drawing into BoardView where it can be synchronized.
 2010-02-21 04:58:04 +00:00
eehouse
93ad1f3b30 get rid of BlockingActivity, using instead dialogs inside 
BoardActivity.  Block jni thread after it posts to the UI thread to
put up the dialog, and in a dismiss listener on the dialog release the
blocked thread.  Seems to work.
 2010-02-21 04:56:37 +00:00
eehouse
cbbf30d0b7 synchronize access to the bitmap and owning canvas used first by 
jni-sourced drawing and then by doDraw to put the bits on the screen.
This should fix crashes when screen orientation changes while
board_draw is running in the JNI thread, but for some reason the
emulators aren't signaling config changes so I can't test.
 2010-02-20 19:19:45 +00:00
eehouse
de58f33b4c add game time to board and jni; clean up hide/show on check events. 2010-02-18 04:44:30 +00:00
eehouse
74140ccaad remove duplicated code 2010-02-18 04:42:22 +00:00
eehouse
5cf9472642 translate error codes into alerts or toasts where appropriate. 2010-02-17 15:10:10 +00:00
eehouse
1e253c0210 turn logging back on 2010-02-17 14:38:11 +00:00
eehouse
cd0afbfae8 Create and pass enum into relayErrorProc 2010-02-17 14:37:53 +00:00
eehouse
135d936a7d Fix warnings that appear when logging off. 2010-02-15 02:54:10 +00:00
eehouse
928f65a266 turn off logging for release 2010-02-15 02:49:16 +00:00
eehouse
84fa9bce88 Fix problems detecting orientation change: instead of passing a 
message, have draw check if dimensions are same as when did layout and
redo them if they're changed.  Works because the OS wants us to redraw
as soon as orientation changes.  But this makes it easier to hit a
synchronization problem: if re-layout happens mid-draw then canvas or
other draw-related objects may be null.  Need to get rid of the jni
thread OR synchronization drawing and layout.
 2010-02-15 02:48:27 +00:00
eehouse
996351cc9c minor changes: rearrange menus, new strings, etc. 2010-02-14 22:05:08 +00:00
eehouse
919c7be9d6 set gameID when saving CurGameInfo from java IFF it isn't already set. 2010-02-14 22:01:06 +00:00