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
2895 commits 21 branches 243 tags 33 MiB
Commit graph

2876 commits

Author SHA1 Message Date
ehouse
706fe3f927 implement remSelected and notifyGameOver 2010-01-20 06:41:14 +00:00
ehouse
7eccde84e3 Add utils like juggle() to be called from GameConfig; always keep max 
number of LocalPlayer instances around so they can be filled from jni
code (which is easier than making the jni construct new instances.)
 2010-01-20 06:38:29 +00:00
ehouse
531ae8ea1a add file open/save functions. 2010-01-20 06:35:56 +00:00
ehouse
406a6a4a98 clean up GameConfig activity intent filter 2010-01-20 06:29:21 +00:00
ehouse
08017179c5 fix bogus assertion 2010-01-20 05:52:13 +00:00
ehouse
6bf9de70d5 Generate file with same name as class it contains. 2010-01-19 13:29:19 +00:00
ehouse
f7907c866d Move jni calls for Game menu items into jni thread 2010-01-19 13:28:32 +00:00
ehouse
b3cf0b41e1 Get rid of separate tile picker in favor of having existing 
BlockingActivity do it.  This may not work when picking from the pool
is enabled but is cleaner for now.
 2010-01-17 17:51:27 +00:00
ehouse
f509b766e9 don't log every function. 2010-01-17 17:49:13 +00:00
ehouse
69c8577dcb Back out change adding Looper. Using own queue is better because its 
length can be tested and there's no race condition (between the looper
being available and the parent thread wanting to post messages) when
the constructor inits the queue.
 2010-01-16 18:56:32 +00:00
ehouse
5c183acb5e Run JNIThread inside a Looper; use BlockingActivity to implement 
dialogs requiring an immediate response.  The Looper change was made
in the hopes that a new Activity wouldn't be required and may not be
necessary.
 2010-01-16 18:39:27 +00:00
ehouse
35943e8731 add util_userError() 2010-01-16 18:34:27 +00:00
ehouse
2d46bd60c9 Add transparent activity that can be called from a thread that will 
block until the dialog it puts up gets an answer.  Calling
showDialog() from the thread I want to block didn't work.
 2010-01-16 18:27:22 +00:00
ehouse
7c4198c05e implement util_getUserString and features like formatRemainingTiles 
that display a bunch of text.  Started working on util_userQuery.
 2010-01-16 14:16:27 +00:00
ehouse
a7d4d20998 Sanity check yOffset. Fixes problem where a scrolled board in 
landscape mode is displayed in portrait with the top rows missing
though no scrolling should be needed.
 2010-01-15 13:51:29 +00:00
ehouse
f9c9b41b3a save and open games by file rather than one globally, and display some 
info about each in games list (though all still have the same players
and dict.)
 2010-01-15 13:48:26 +00:00
ehouse
3beba51b6f add jni methods, and modify common code, so a CurGameInfo struct alone 
can be read from and stored to a game file.
 2010-01-15 13:44:29 +00:00
ehouse
a3a313fdb4 cleanup; refresh view on regaining focus rather than using 
startActivityForResult
 2010-01-13 13:31:23 +00:00
ehouse
c04c6974ba turn debug back on 2010-01-13 13:29:55 +00:00
ehouse
b2f0b91a23 save phony "new game" even if names not set 2010-01-13 12:57:02 +00:00
ehouse
cf60be5082 implement board_beginTrade() 2010-01-13 12:29:11 +00:00
ehouse
7f999134d7 touch .java file that uses svn version so it'll always get picked up. 2010-01-13 12:17:26 +00:00
ehouse
de3f45044f Don't show extra file in game list. 2010-01-13 12:16:43 +00:00
ehouse
1106ddd6bb Turn off DEBUG for release and STUBBED_DICT for good. 2010-01-13 12:15:46 +00:00
ehouse
20e8ba9eb0 add draw_objFinished() 2010-01-13 12:14:12 +00:00
ehouse
fa44159823 Use clipping in scoreboard and tray; show selected tiles with thicker 
border.
 2010-01-13 12:13:05 +00:00
ehouse
0e160011e3 add draw_objFinished(); turn boilerplate into macros. 2010-01-13 12:11:24 +00:00
ehouse
cb57fcc0be Add target, as default, that generates svn version for about box. 2010-01-13 12:03:32 +00:00
ehouse
21b3b29eab fix typos 2010-01-12 13:47:17 +00:00
ehouse
14372216d0 implement showValues; pause engine to handle events; call srandom 
during init; add menus and call notImpl() for them.
 2010-01-12 13:39:19 +00:00
ehouse
839e707069 refresh list view on (some) changes; get rid of unused button. 2010-01-12 13:32:19 +00:00
ehouse
47d29d8d4d don't draw tile values < 0 2010-01-12 13:30:20 +00:00
ehouse
1a4f0e04bf add copy constructors; change starting game to two players, second a 
robot.
 2010-01-12 13:20:18 +00:00
ehouse
71fe75049b new menus and shortcuts; tweak formatting 2010-01-12 13:18:16 +00:00
ehouse
4db53ed176 add Toast-based temporary about box with svnversion and notImpl() function 2010-01-12 13:15:47 +00:00
ehouse
11b453d5cf fix to compile with debugging turned off 2010-01-10 23:39:54 +00:00
ehouse
8d6d22f425 fix to compile with debugging turned off 2010-01-10 23:38:49 +00:00
ehouse
e76306a543 fix drawing blank tiles 2010-01-10 18:12:48 +00:00
ehouse
da0b54273f make all columns stretchable to fix oversized second button 2010-01-10 18:08:11 +00:00
ehouse
6b5be9a276 remove logging 2010-01-10 17:35:50 +00:00
ehouse
2c3e45318d All I wanted was to implement a tile picker, but it turns out dialogs 
can't be synchronous on Android: you can't block the main UI thread.
So now there's a new background thread to which all jni activity
except game opening and saving is delegated (and these happen before
and after the thread exists.)  Tile picking works because the request
comes in on the background thread which then blocks until the
BoardActivity reports that the tile picker's gone away.
 2010-01-10 17:35:23 +00:00
ehouse
50991fd028 Add common head/tail macros to all jni entrypoints that save/restore 
the jni env passed in so all calls happening inside will use the right
one.  Required as part of running a second thread, re. which see
longer comment to follow
 2010-01-10 17:29:09 +00:00
ehouse
cc527acb49 pass in/store ptr to JNIEnv* rather than env itself 2010-01-10 17:25:46 +00:00
ehouse
148d433e81 add makeStringArray 2010-01-10 17:23:30 +00:00
ehouse
552b718738 tile picker strings and intent 2010-01-10 17:20:18 +00:00
ehouse
6a4a0a8775 include thread id in logs 2010-01-10 17:19:30 +00:00
ehouse
5c762466aa new activity/layout for picking tiles 2010-01-10 17:18:37 +00:00
ehouse
a91f662327 save and restore games (though there's a global game for now). 2010-01-09 17:19:25 +00:00
ehouse
5d9dc49bf0 formatting changes only 2010-01-09 17:18:15 +00:00
ehouse
cd5069474e don't store dict: it's in the model 2010-01-09 17:11:31 +00:00
ehouse
278b815a3e fix ntohl; allow null Strings 2010-01-09 17:10:59 +00:00
ehouse
9761596e6e add system menu to games list with "delete all" item; implement roughly 2010-01-09 14:39:34 +00:00
ehouse
35dd738c26 add onDispose call to game_dispose, and implement it such that jni 
doesn't leak.
 2010-01-09 13:30:23 +00:00
ehouse
3db30a2995 increase bits stored for yOffset to 4 in case whole thing scrolled. 2010-01-07 14:47:01 +00:00
ehouse
c68c01a82a set focusable here not in code 2010-01-07 14:38:16 +00:00
ehouse
ef68670c0c remove claim to handle orientation changes. Now on screen turn 
activity is destroyed and recreated, allowing to lay the board out
anew.  This is inefficient, but a good test for now.
 2010-01-07 14:37:09 +00:00
ehouse
4b9c328d8e don't log draw; too verbose 2010-01-07 14:35:04 +00:00
ehouse
b14cf81df4 to fix board getting erased on every draw, draw to our own bitmap and 
canvas and blit that to draw's canvas each time.  Requires keeping x
and y offset since board doesn't fill the view; requires erasing tiles
and score entries before drawing.
 2010-01-07 14:34:07 +00:00
ehouse
f6a951f845 add yOffsetChange commented out 2010-01-07 14:30:56 +00:00
ehouse
fdce005fb0 add vertScrollBoard 2010-01-07 14:29:49 +00:00
ehouse
e1c92707e7 implement scoreBegin; add vertScrollBoard 2010-01-07 14:28:53 +00:00
ehouse
9bd51e4305 add yOffsetChange commented out (not needed for scrolling, just for UI 
to show thumb.)
 2010-01-07 14:27:20 +00:00
ehouse
ecd5667cf0 makeIntArray takes array of initial values 2010-01-07 14:24:53 +00:00
ehouse
df7a445a9e widen a couple of labels 2010-01-05 14:11:39 +00:00
ehouse
96041e1937 latest from translator 2010-01-05 14:05:04 +00:00
ehouse
da91820525 Draw 'X' icon in empty middle square; start first player as non-robot 
to show it.
 2010-01-04 06:03:28 +00:00
ehouse
052c99c9db remove symlinks if they're not back to us -- so that more than one 
copy of the tree can be active.
 2010-01-04 05:50:12 +00:00
ehouse
4a4b05f66c make backgrounds transparent 2010-01-04 05:48:42 +00:00
ehouse
7655ccf064 latest from translator 2010-01-03 22:56:29 +00:00
ehouse
7d0b30f05a icon for middle cell 2010-01-03 22:31:26 +00:00
eehouse
ef188164e2 implement drawBoardArrow, but without setting tranparency correctly. 2010-01-03 01:02:14 +00:00
ehouse
1b350e0c34 remove translate comments where done; add (one) where missing. 2010-01-03 00:54:52 +00:00
ehouse
3fb90e2ca2 new file from tranlator 2010-01-02 22:31:27 +00:00
ehouse
b7a508b52e update copyright: it's a new year 2010-01-02 20:32:12 +00:00
ehouse
833d338e24 new file from tranlator 2010-01-02 20:27:30 +00:00
eehouse
d206aef266 initial checkin of java source for android port 2010-01-02 19:30:20 +00:00
eehouse
1a5ae00777 initial checkin of jni source and build scripts for android port 2010-01-02 19:10:08 +00:00
eehouse
c7729ca25c add a calloc to mempool 2010-01-02 01:42:07 +00:00
eehouse
b5e1e3a2c6 add assert -- unset numPlayers trashed stack 2010-01-02 01:41:12 +00:00
eehouse
a6e6e2b05c fix stubbed dict support 2010-01-02 01:40:25 +00:00
ehouse
0dfdb315ee up version to b9 2009-12-28 00:20:15 +00:00
ehouse
5cf5345eb1 Set addrChanged on role change even if conns dlg not used: fixes bug 
where freshly installed device fails to connect.
 2009-12-28 00:18:52 +00:00
ehouse
a3fa0d402c Don't call getHostAddr until have data to send: it's flat-out wrong on 
wince, and works better when done later.
 2009-12-28 00:14:09 +00:00
ehouse
dfe1d849cd Set up ConnMgr proc ptrs *before* attempting to use them. 2009-12-27 23:53:41 +00:00
ehouse
56ece4ee5f make provision of dict path optional 2009-12-27 21:33:53 +00:00
ehouse
d5e641ee52 Add the ALL_HERE alert to the set not duplicated. 2009-12-27 19:04:29 +00:00
ehouse
378d02f1f5 Don't enable COMMS_HEARTBEAT for wince either; copy .cab file to www 
path if shell variable set.
 2009-12-27 19:03:17 +00:00
ehouse
7ac98bfcfb Don't require a timeout waiting for a game to connect initially, and 
make no timeout the default.
 2009-12-27 18:17:24 +00:00
ehouse
c15998a10a add two missing strings (commented requiring translation) 2009-12-27 17:37:49 +00:00
ehouse
fe69b8403e cleanup script; no functional change 2009-12-27 17:36:18 +00:00
ehouse
d80c04dd6b remove whitespace that was confusing check_ids.sh 2009-12-27 17:33:11 +00:00
ehouse
37b80527e6 Don't put certain alerts up more than once at a time -- to prevent a 
huge number of stacking up when networked device is unattended or in
background.  Same infrastructure should support a checkbox in some
dialogs by which users say "Don't show me this again."
 2009-12-27 02:54:30 +00:00
ehouse
9b2eb9273c remove mistaken assert 2009-12-27 00:49:13 +00:00
ehouse
9e8496c429 This should eventually be part of cegcc's headers. But use it locally 
until then.
 2009-12-23 06:09:25 +00:00
ehouse
9976b8d7a1 remove stuff duplicate by what should be cegcc header file. Renamed 
this to make room for that.
 2009-12-23 06:08:47 +00:00
ehouse
3ae0df2764 Add ifdefs to work with and without cegcc support for ConnMgr (which 
for now seems to lack ability to link so I'm still loading procs by
name); don't close ConnMgr connection when phone stopped so can get
notified of further changes and needn't restart; on WM_ACTIVATE, put
full-screen mode in sync with prefs setting to fix crash where app is
launched while running and yields to prev running copy which then crashes
on exit on Treo700w (see recent checkin 2853).
 2009-12-23 06:01:26 +00:00
ehouse
488a102977 Fix to compile for win32. 2009-12-21 15:31:06 +00:00
ehouse
098cd1b297 Implement enough connmgr support, loading the dll and getting proc 
addresses by name, to successfully bring up cellular connection for
rest of networking to use when it's down.  This is a start: eventually
the stuff in connmgr.h (being added here) should be replaced by
support added to cegcc (including link info so the proc ptrs go away.)
Still to do: figure out how to detect when phone is turned on so can
try again without user needing to restart the app.
 2009-12-21 06:43:21 +00:00
ehouse
3fb3616e6c When exiting turn on fullscreen mode after saving prefs to prevent, 
for some unknown reason, crash on Wince 5.0 (or at least the Treo700W
I'm testing on.)
 2009-12-21 06:36:04 +00:00
ehouse
b084c5e5b2 reduce logging 2009-12-21 06:21:37 +00:00
ehouse
638337384b set flag on exit and don't allocate anything or try to send via 
network; clear globals var after freeing it.
 2009-12-18 04:24:55 +00:00
ehouse
28265749f9 fix unused var warning in release build 2009-12-17 13:09:10 +00:00
ehouse
81d41a621f fix connsdlg: resize, respace and for French ifdef out unsupported choices (to match other .rc files) 2009-12-16 02:48:27 +00:00
ehouse
da4b288838 inform of need to reboot after language change as FYI rather than error 2009-12-16 02:46:00 +00:00
ehouse
a1be2fb8fc add ports relay is listening on to http display 2009-12-16 02:43:52 +00:00
ehouse
da6a8eb2f0 Strings for new error and progress messages, in English and marked 
needing translation.
 2009-12-14 04:17:14 +00:00
ehouse
0a381b5a44 Implement callback for connect-to-relay success and new error message 
for provinding too many players.
 2009-12-14 04:12:20 +00:00
ehouse
fc17df2a7e When guest connects, check if providing too many players before 
reponding to connection request so that we just deny the request (with
new error code) rather than revoking it later.
 2009-12-14 04:10:23 +00:00
ehouse
35f068e05c Implement new callback giving progress connecting with relay. 2009-12-14 04:06:26 +00:00
ehouse
8450c9da2b New callback called on first connect to relay and on first ALLHERE 
message so users can see progress.  Handle new relay message ALLBACK
meaning "ALLHERE but not for the first time".
 2009-12-14 04:03:17 +00:00
ehouse
273f3d2f4a don't show turn confirm dialog by default 2009-12-14 02:54:56 +00:00
ehouse
dd236d55d6 include RELAY_NAME_DEFAULT in help target 2009-12-10 05:29:05 +00:00
ehouse
936ae796fd up version strings to b8 2009-12-10 05:28:28 +00:00
ehouse
d90f6707cc Improve error message 2009-12-10 05:28:03 +00:00
ehouse
6af05df5ba Remember role when changes so can pass to conns dlg. 2009-12-09 05:25:38 +00:00
ehouse
32634c4847 Add help text explaining room and connect order to conns dialog. 
Still need to add for other .rc files and polish the text.
 2009-12-09 05:11:20 +00:00
ehouse
015b0d42d8 include title in head with summary readable in tab 2009-12-08 14:51:03 +00:00
ehouse
12b17e13b6 My first post-initial-translation pass: lots of little tweaks to make 
stuff fit better.
 2009-12-05 04:22:33 +00:00
ehouse
770980790c add linebreak 2009-12-05 04:21:44 +00:00
ehouse
4d7637cfe2 cleanup: combine clauses 2009-12-05 02:36:59 +00:00
ehouse
07be694df6 Respond to disconnect error from comms with new error message then new 
game dialog with conns already open on top.  It's opened as soon as
new game gets its first WM_PAINT message, which may not be best.
Tested only on win32 so far.
 2009-12-04 09:09:07 +00:00
ehouse
9f7c0db09f Always launch host first, sleep to make sure it'll be connected and 
the room registered before launching any guests.
 2009-12-04 08:56:51 +00:00
ehouse
c893fd4a9e On receipt of connection-denied message via new rerror callback, put 
up new error messages and then conns dialog so user can connect again
after changing room name or just waiting.  A new game is started so
that comms is re-inited and will try again to connect to relay.
 2009-12-04 08:18:49 +00:00
ehouse
14b060707f Report relay connection denials due to misordering out to platform, 
and refuse to connect again until comms has been reset.  This goes
with platform code to put up the new game/conns dialogs on disconnect
errors.
 2009-12-04 08:14:03 +00:00
ehouse
65230143e4 Allow editing relay host and port in debug version 2009-12-04 08:11:45 +00:00
ehouse
26469d734c Modify state machine and return new error codes to force host to 
connect first, guests second, with clear error messages if the order's
wrong.  This seems to make it simpler for users to get a connection
right.  Code holding multiple games worth of hosts and guests in a
cref is gone.
 2009-12-04 08:03:27 +00:00
ehouse
337c36dfd2 remove unused parameter 2009-12-04 07:59:07 +00:00
ehouse
7ad59e3e2b cleanup 2009-12-04 07:54:14 +00:00
ehouse
a8e4eca525 fix debug build compile errors. Duh. 2009-12-04 02:19:58 +00:00
ehouse
c8aa9d7f72 fix non-dbg build compile errors and warnings 2009-12-03 03:05:35 +00:00
ehouse
8c21f74cc3 First cut at Czech translation; include it in set of dlls built. 2009-12-02 06:01:19 +00:00
ehouse
05d6cfbd6e new file ready for localization 2009-11-27 19:35:50 +00:00
ehouse
d6436bbf65 up version number 2009-11-26 02:26:09 +00:00
ehouse
8007e5597b Fix stupid typo that broke both backspace and drag-to-scroll. 2009-11-26 02:23:21 +00:00
ehouse
a0fa8f94da force update scroll info when changing the set of visible widgets. fixes bug where smartphone didn't scroll prefs dlg after switch to global prefs. 2009-11-26 02:20:34 +00:00
ehouse
cc24c63dd9 Tweak control size 2009-11-23 02:15:38 +00:00
ehouse
d5f7a0693f Handle missing relay error messages. 2009-11-22 19:25:49 +00:00
ehouse
8c7aab4247 Add error message for relay/comms protocol version mismatch; remove 
ability to edit relay address and port by default.
 2009-11-22 18:02:26 +00:00
ehouse
7fbd2bed45 Fix to compile when RELAY feature disabled 2009-11-22 18:00:20 +00:00
ehouse
077b2c4789 Fix to compile when RELAY feature disabled; handle error code for 
incorrect relay version flags.
 2009-11-22 17:58:59 +00:00
ehouse
3cdf4aa0bf Fix to compile when RELAY feature disabled 2009-11-22 17:56:54 +00:00
ehouse
5ab3425377 allow default relay port, like name, to be set at compile time 2009-11-22 16:30:20 +00:00
ehouse
55478369e4 listen on only one port by default 2009-11-22 16:29:23 +00:00
ehouse
98ad2c3147 draw pending score smaller when has more digits; move rem up one pixel same as score. 2009-11-19 02:29:39 +00:00
ehouse
b8e7cd411f fix to use new API. (this and prev checkin via terminal app on phone :-) 2009-11-19 02:26:38 +00:00
ehouse
3d6b43f032 fix palm and palm-arm compile problems including using changed APIs. 2009-11-19 02:22:32 +00:00
ehouse
370d04f318 Add notion of minimum length to font match and calc longest score 
string in the scoreboard at beginning of draw.  Fixes problem where
scores > 99 didn't fit vertical scoreboard.
 2009-11-18 13:51:32 +00:00
ehouse
3eadd93aa6 Pass scores and remaining tiles count to draw_scoreBegin so can 
determine font size based on max length.   API change.
 2009-11-18 13:24:56 +00:00
ehouse
e9287fcbbf reorder some formal params; provide width so score font isn't 
recalculated each time.
 2009-11-17 05:32:21 +00:00
ehouse
6bd1c4be15 up version strings to b6 2009-11-16 01:20:30 +00:00