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

3118 commits

Author SHA1 Message Date
eehouse
885c9093fb Put up Toast messages on connecting to relay. 2010-02-14 17:23:07 +00:00
eehouse
7d385e180a Don't erase bottom of board drawing tiles; figure font size based on 
chars in dict (untested); get background color from prefs; etc.
 2010-02-14 17:21:59 +00:00
eehouse
32acc38100 default host should be eehouse.org for on-device use 2010-02-14 17:14:41 +00:00
eehouse
d7fe6c80f8 load default preferences on boot. 2010-02-12 09:15:19 +00:00
eehouse
c6b28e9416 turned on -Wall and fixed errors/warnings it reported 2010-02-12 07:13:42 +00:00
eehouse
587159f5d7 fix to compile when XWFEATURE_SEARCHLIMIT off. Same as rev 3023 for 
this file.
 2010-02-12 07:12:30 +00:00
eehouse
786a3fdc57 When drawing letters raise baseline by font's descent to avoid 'J' 
etc. hanging below cell border.
 2010-02-11 13:44:04 +00:00
eehouse
fc2e87e0c4 drop client connection when in the wrong state rather than asserting. 2010-02-11 13:29:28 +00:00
eehouse
bd611bb6f4 implement dictChanged. And so that utf8 dicts could be opened without 
their games being drawn (no BoardActivity around) break the two
android-only callbacks out of UtilCtxt and into a new JNIUtils
interface that then requires new handing in C.
 2010-02-11 13:27:09 +00:00
eehouse
099cf66a79 add choice of SMS and BT as transports. SMS can't be tested on 
emulator and so isn't; BT isn't implemented at all.  But SMS works as
far as the send proc.
 2010-02-09 14:43:37 +00:00
eehouse
37646c20f3 accomodate null objects 2010-02-09 14:42:07 +00:00
eehouse
2d17649af5 add overloaded methods for opening games that will never be rendered, 
where several interfaces passed in are null.
 2010-02-09 14:40:31 +00:00
eehouse
117ff31e64 remove assert. doCreate can get called several times. 2010-02-09 14:36:55 +00:00
eehouse
1afbaf9c42 rename menu item 2010-02-09 14:36:09 +00:00
eehouse
5510ebc388 remove logging 2010-02-09 14:35:16 +00:00
eehouse
e013cbd79d The not-yet-working activities around SMS.... 2010-02-09 14:33:24 +00:00
eehouse
e271358307 add SMS send and receive permissions; add not-yet-working activities 
around SMS.
 2010-02-09 14:33:04 +00:00
eehouse
6d4c972abd menu tweaks; strings for BT and SMS connect 2010-02-09 14:30:39 +00:00
eehouse
6ccab24cbd add connect spinner 2010-02-09 14:30:14 +00:00
eehouse
385ee6a9c5 separate dialogs for sms, bt and relay config. 2010-02-09 14:28:09 +00:00
eehouse
cd63cf1424 Deal with SMS and BT-type address recs. 2010-02-09 14:26:43 +00:00
eehouse
1f7e6db585 guard against double-dispose; add unique-to-android game_hasComms() 2010-02-09 14:25:52 +00:00
eehouse
1ee94f23aa factor out and_dictionary_make_empty 2010-02-09 14:22:59 +00:00
eehouse
f7c8a2f384 Work when initialized with a null instance of DrawCtxt. (All calls 
into java world come from java so no guard against that needed.)
 2010-02-09 14:21:58 +00:00
eehouse
cd89ede3c5 Work (but don't call into java world) when initialized with a null 
instance of CommsTransport.
 2010-02-09 14:20:16 +00:00
eehouse
67cb2421c9 Work (but don't call into java world) when initialized with a null 
instance of UtilCtxt; implement util_makeEmptyDict().
 2010-02-09 14:19:20 +00:00
eehouse
69ce7e2ef0 Build for 1.6 instead of 1.5 for SMS APIs 2010-02-09 14:16:23 +00:00
eehouse
35352f8b6c pull bonus colors from prefs too 2010-02-09 13:14:40 +00:00
eehouse
6522f54989 fix player juggle 2010-02-09 13:14:11 +00:00
eehouse
4a12409d97 Add colors etc. to prefs dialog; wire player colors to be set from 
prefs rather than hard-coded.  Remaining new prefs entries still
unused.
 2010-02-07 05:54:26 +00:00
eehouse
e6871c0840 add .xml file describing prefs (forgotten before); remove file menu. 2010-02-07 05:17:38 +00:00
eehouse
4db8750ec0 do app prefs the way they're supposed to be done 2010-02-06 21:04:19 +00:00
eehouse
338a39e8b4 turn asserts/logging back on; make with -j3 2010-02-06 19:30:59 +00:00
eehouse
4de6b82899 remove unused platforms for speedier checkouts 2010-02-06 19:08:36 +00:00
eehouse
fb65fecebb When CommonPrefs field is changed mid-game, reflect it immediately. 
Means adding board_prefsChanged() to jni and having Utils class call
it via JNIThread when prefs change.
 2010-02-01 15:06:12 +00:00
eehouse
0df6bf873c close socket on thread exit -- allows to reconnect to relay after 
closing and reopening a game.
 2010-02-01 15:03:13 +00:00
eehouse
7e20bd1a30 add about menu to opening dialog 2010-02-01 05:45:39 +00:00
eehouse
38ed6c925b remove unneeded intents 2010-02-01 05:45:24 +00:00
eehouse
0485b6d4e6 invoke prefs from games list activity too 2010-02-01 05:45:10 +00:00
eehouse
967ba62dff Fix to compile on Palm (68K): remove parameters removed by r3013 and 
move slot moved by r2982.  Fix -- with gross ifdefs -- warning in
pool.c caused by Palm's random() being the only 16-bit one.
 2010-02-01 03:17:46 +00:00
eehouse
6893fe742a fix r3013 breakage: remove gameID params 2010-02-01 01:50:38 +00:00
eehouse
87eae92006 turn off debugging for a release 2010-01-31 22:10:10 +00:00
eehouse
24285b5d7a include device role in game list summary 2010-01-31 21:46:04 +00:00
eehouse
9f250c99ef get rid of gameID param. This change breaks all other platforms... 2010-01-31 21:35:07 +00:00
eehouse
caa5d6a55f implement enough networking to play a game via relay (provided I don't 
quit on either device.)  Uses java.nio, a single thread blocking on
select() and a single SocketChannel.  Outbound packets are queued, and
incoming packets reassembled then passed to the JNIThread to be sent
to the jni for parsing.
 2010-01-31 21:26:21 +00:00
eehouse
15ce0a12da add game_receiveMessage() (see prev note) 2010-01-31 21:22:55 +00:00
eehouse
b0e88eff83 implement util_makeStreamFromAddr() and (android-only) 
game_receiveMessage(), the latter combining
comms_checkIncomingStream() and server_receiveMessage() which are
always used together and require a stream be passed between which
currently can't happen across jni.
 2010-01-31 21:17:21 +00:00
eehouse
69cbff63f6 Hardcode ip address of emulator's host rather than eehouse.org for 
easier debugging.  Needs to be in a preference....
 2010-01-31 21:14:49 +00:00
eehouse
41472c4984 assert have at least one remote player 2010-01-31 21:13:31 +00:00
eehouse
49402ed218 Get comms info (host name, etc.) from user and pass it through to the 
send proc.  Along the way, write jni code to instantiate a new object
including setting enums.  *Now* I'm ready for networking....
 2010-01-30 20:06:06 +00:00
eehouse
bb90dce2c4 coalesce CMD_DO messages; fixes robot-vs-robot game. 2010-01-30 15:33:57 +00:00
eehouse
3798084dab idle via a local Runnable rather than having whole class implement it. 2010-01-30 15:33:16 +00:00
eehouse
20aad594e4 don't explain robot scores by default 2010-01-30 15:31:08 +00:00
eehouse
a01844e751 add Hex dict for help with testing. Don't ship. :-) 2010-01-30 14:56:21 +00:00
eehouse
7b0f100f27 wire in enough comms that java's send proc gets called when device is 
a guest.  Networking's next....
 2010-01-30 14:38:44 +00:00
eehouse
b915319178 create and pass to jni CommsTransport instance when game isn't standalone 2010-01-30 14:36:55 +00:00
eehouse
5b1a0f167e class that will implement network for comms 2010-01-30 14:35:33 +00:00
eehouse
4b9fa4d42a new "class" wraps TransportProcs 2010-01-30 14:33:28 +00:00
eehouse
333c5fc040 add makeByteArray() 2010-01-30 14:32:20 +00:00
eehouse
8def96dd59 pass params, e.g. clean, to make 2010-01-30 13:44:45 +00:00
eehouse
ee2fe9d193 get/set enums from C; preserve device role setting from ui to saved 
game.
 2010-01-30 13:44:12 +00:00
eehouse
c2e1e916b8 relay feature and logging on 2010-01-30 13:43:21 +00:00
eehouse
e86d656b4a substitute smaller built-in dict to save time moving bits during 
development; don't hard-code name of built-in.
 2010-01-30 03:31:20 +00:00
eehouse
6dfac28b13 rearrange to work with newer version of ndk and sdk just installed 2010-01-30 03:18:01 +00:00
ehouse
52b7205474 cache common java objects for reuse rather than build anew each time. 
Seems to speed drawing a bit.
 2010-01-27 13:51:23 +00:00
ehouse
40ac5694fd first submitted translation, for Catalan; improve string-checking 
script to include locale directories
 2010-01-27 05:19:59 +00:00
ehouse
5a288d3068 turn off debug for alpha drop 2010-01-26 14:52:52 +00:00
ehouse
874ef7e571 use top 16 bits of random in picking tiles. Seems to give better 
results on android; will need to test with other platforms before
merging.
 2010-01-26 14:51:00 +00:00
ehouse
ec085d8944 lots of little changes toward making prefs (per-game and global) work, 
which they more-or-less do.  Some still not captured.
 2010-01-26 14:48:37 +00:00
ehouse
c682a7caac snapshot work toward getting networking done. 2010-01-26 14:46:48 +00:00
ehouse
90f93aefa8 Add lots of widgets. List of players can no longer be a list since it 
wants to scroll, so it's textview subclasses that don't show focus
correctly yet.
 2010-01-26 14:43:39 +00:00
ehouse
0649597d90 Add prefs activity. 2010-01-26 14:38:31 +00:00
ehouse
4425eaa99e move showColors into CommonPrefs, removing separate storage in linux 
and wince and removing setter from board and jni APIs.  Palm change
pending.
 2010-01-26 04:14:18 +00:00
ehouse
b3dba204c6 fix compile warning 2010-01-26 04:03:21 +00:00
ehouse
73749f97a5 script to check .xml and .java files for missing string entries and to 
add stubs.
 2010-01-26 04:02:05 +00:00
ehouse
8a4c31b203 rename file 2010-01-25 03:05:15 +00:00
ehouse
68079d3590 Add ability to open utf8-formatted dicts and to display bitmap tiles 
(though poorly.)  Both required processing in the jni that isn't
possible (e.g. because no libiconv included) so I created callbacks
into java from the dict building code.  Add ability to download dicts,
to select them, to add and remove players and make them robots or
human.  Robot-vs-robot game doesn't work well (robots trade a lot and
server_do seems not to be getting called enough) but will soon.
Coalesce penMove events.  Implement game list menuitems like delete,
copy, etc.
 2010-01-25 02:49:14 +00:00
ehouse
676fd73fc0 Activity for downloading dicts with nothing but a WebView in it. 
Works, but not cleanly.  Still need to get the path to
/sdcard/downloads programatically, and to exit cleanly back to parent
Activity.
 2010-01-25 02:23:04 +00:00
ehouse
bf33bd4a0f ask permission to write to storage and use internet; add DictActivity; 
take control of orientation changes for several activities.
 2010-01-25 02:20:32 +00:00
ehouse
fc28573f21 include java files in TAGS 2010-01-25 02:09:08 +00:00
ehouse
82382a7cfa Pass results back via timers and call board_draw() when so indicates. 
Needed to test dragDropSetAdd.  Candidate for merge to trunk.
 2010-01-25 00:28:30 +00:00
ehouse
1073a98f9f add dragDropSetAdd which causes mid-drag tiles to be treated as if 
they're 2/3 their height higher.  Meant to work better on touchscreens
where finger would otherwise prevent user from seeing where the drop
will land.  Still not tested or tuned on device.
 2010-01-25 00:19:54 +00:00
ehouse
59aa9f6e15 instead of measuring glyphs one at a time, put hdc in TRANSPARENT mode 
and draw them all, then measure the stack.  Candidate for merge to
main for wince release.
 2010-01-25 00:12:09 +00:00
ehouse
b3c8327db1 Players are now in a list with a view into which they can be opened for editing. 2010-01-20 06:55:45 +00:00
ehouse
960fbd0b33 Fire GameConfig activity to edit a game; use file save/open methods in 
Utils.
 2010-01-20 06:54:09 +00:00
ehouse
f4535f3408 2010-01-20 06:52:37 +00:00
ehouse
dd05c5b58e add constructor that names player by position in game. (Template 
needs to come from strings.xml)
 2010-01-20 06:50:59 +00:00
ehouse
171318156d Remove board layout to JNIThread; format scores to show remaining 
tiles and whose turn it is.
 2010-01-20 06:49:38 +00:00
ehouse
7f0768a4f9 do board layout here rather than in BoardView so main thread isn't 
talking to jni (fixes assert in jni catching overlapping calls from
both threads); call server_writeFinalScores for BoardActivity.
 2010-01-20 06:48:43 +00:00
ehouse
92d5bbbf18 more strings and menu items 2010-01-20 06:44:58 +00:00
ehouse
ad013b8cc7 add server_writeFinalScores. 2010-01-20 06:44:02 +00:00
ehouse
a62af87a61 fix bogus assert; plug leaks when makeGameFromStream can only read a 
gi; implement writeFinalScores.
 2010-01-20 06:43:10 +00:00
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
ehouse
17f27f3764 revert r2797; endian issues are screwing up mask calculation 2009-11-15 21:05:44 +00:00
ehouse
784906fde0 set biPlanes and color table entry 0. Now works, though not well yet, 
on both PPC and Win32.
 2009-11-15 20:44:50 +00:00
ehouse
caf4165eba Process bitmap buffers 16- rather than 8-bits at a time. 2009-11-15 18:25:09 +00:00
ehouse
b38891269e Use scoreboard font for Remaining tiles display. Rewrite 
glyph-measurement code to use device-independent monochrome bitmaps
and to look at the buffer rather than call GetPixel over and over.
Not tested yet on WinMo (beyond confirming that it compiles/links) but
it seems much faster on desktop.
 2009-11-15 18:19:07 +00:00
ehouse
11a00ddb9b Remove Rem string and up dll version number. 2009-11-15 15:48:35 +00:00
ehouse
6d44cfa7fc assume log strings are utf-8, as they may contain dict letters 2009-11-15 15:46:57 +00:00
ehouse
7966f20829 for REM rect too place innerRect centered in outerRect 2009-11-15 15:45:50 +00:00
ehouse
61e087fbfe new string and some old translated/shortened 2009-11-11 04:35:25 +00:00
ehouse
c1827562dc be consistent is use of variable vs real name 2009-11-10 14:37:42 +00:00
ehouse
3d53711e31 new string translated 2009-11-10 04:21:06 +00:00
ehouse
2ecf415618 Remove on case where HandleEvents was being called recursively and 
creating unexpected state transitions; add assert to catch any future
recursion.
 2009-11-09 05:30:42 +00:00
ehouse
393cccb86c Add MSGONLY state to indicate cref being kept alive only to preserve 
messages for a latter connection.
 2009-11-09 05:29:06 +00:00
ehouse
b84c1a10d9 Use different rooms for each game. The relay, or maybe it's the linux 
client's TERM handler, can't handle so many connectings on same room.
 2009-11-09 05:25:20 +00:00
ehouse
b7e2567c7d account for new comms relay state in displaying relay conn status 2009-11-09 03:29:13 +00:00
ehouse
8be09b3fc4 Complete script so it runs gtk versions one host at a time (after 
connecting) to test the relay's new disconnected message-storing
feature.  Works except when the gtk client crashes, which is a lot.
 2009-11-09 00:06:53 +00:00
ehouse
4025c37604 Make "Room 1" the default room name. 2009-11-09 00:03:43 +00:00
ehouse
aae12428da Add limited support for store-and-forward (where limitations include 
that all devices must be connected initially and that it's all memory
based so a crash wipes stored messages.)  Accept messages for
forwarding when in the MISSING state, not just the ALLHERE state.
Store messages that can't be sent now, and send any that have
accumulated when a host reconnects.  When a cref loses its last
connection, keep it around unless it has no messages stored (as will
be the case when a game ends.)
 2009-11-08 21:35:39 +00:00
ehouse
2d4ae3e44a When forwarding message, lookup cref by socket if cookieID == 0, as 
can be the case when through to a non-all-connected game.
 2009-11-08 21:32:36 +00:00
ehouse
f6fb019732 Send to relay if connected, even if not all hosts present. And detect 
duplicate initial packets a bit better.  This change goes with the
next checkin on the relay side: move to modified store-and-forward so
devices can connect at different times once the game is established.
 2009-11-08 21:30:13 +00:00
ehouse
8e0dad43c7 get rid of overlogged message 2009-11-08 21:25:43 +00:00
ehouse
066c3de9a7 add to gtk version a quick -F option to use new skip-confirm feature 2009-11-08 17:25:19 +00:00
ehouse
a61d01c5ff add new global preference that allows turning off confirmation dialog 
after each turn.  Meant to fix ID: 2735517 feature request on sf.net.
 2009-11-08 17:00:20 +00:00
ehouse
86d6f8d0a3 script and helper for testing proposed store-and-forward relay feature. 2009-11-05 04:31:23 +00:00
ehouse
ed52582ea4 get rid of states and code for checking numbers of players -- since 
any number is allowed now.
 2009-11-03 05:03:20 +00:00
ehouse
3bdfda6548 Make it possible for multiple games to connect using the same room 
name.  All new connections are stored together, and after each
connection an attempt is made to build one complete game with a host
and however many guests.  All remaining devices are moved into a new
pending record in the same state, and the completed game is treated as
always.  Seems to work, though nearly 20% of linux instances are
failing to connect the relay run from the new test script samename.sh.
Need to figure out why.

Also added logging of seed and connname to comms.c since games
launched together can no longer be certain to connect on the relay.
This allows the test script to identify joined games from their logs
and detect success or failure.

This checkin changes the relay protocol, so relay and clients will
both need to be upgraded.
 2009-11-02 01:01:47 +00:00
ehouse
11b586cd4b lookup hearbeat recipient by socket rather then cookieID since 
cookieID isn't always correct until later
 2009-11-02 00:45:54 +00:00
ehouse
e65db4b8c2 use log macro rather than fprintf to stderr 2009-11-02 00:09:56 +00:00
ehouse
84ac5223b2 script to test new feature where lots of games can use the same "room" 
and will just get mached up as soon as a host and right-sized set of
guests is available.  Basically works, but will never exit if any of
the games fails to exit (as is happening most times), so still need to
detect failures.
 2009-11-02 00:09:11 +00:00
ehouse
7d411526d3 add .2 for consistent time formatting 2009-11-01 01:40:18 +00:00
ehouse
7a71c4636b change varible names; remove instance variable than can be on the stack. 2009-11-01 01:38:03 +00:00
ehouse
82c15f7f09 update script for b5 2009-10-25 15:09:16 +00:00
ehouse
231c0b4f44 claiming to handle EN_SETFOCUS broke text insertion for StrBox on PPC 
(but not SP).  So for now, note focus changes and scroll if
appropriate but don't claim to have handled them.
 2009-10-25 15:06:52 +00:00
ehouse
cfd1350dac white space only: get rid of annoying extra spaces at ends of lines. 2009-10-25 15:03:12 +00:00
ehouse
b957e9c195 Only set StrBox font on Win32. WinMo devices seem to have Unicode 
font even if not localized.
 2009-10-25 15:00:06 +00:00
ehouse
34032a9d0a set rem text color, which otherwise varies. 2009-10-25 14:57:42 +00:00
ehouse
fa5d36517a Track EDITTEXTs in dialogs when following focus with scroll position. 
This seems to fix bug where conns dialog wouldn't scroll on
Smartphone, though I'm not sure why.
 2009-10-25 00:55:19 +00:00
ehouse
32916d2918 adjustForConnType only needed when several compiled in. 2009-10-25 00:53:15 +00:00
ehouse
27c518dec4 When tray's hidden you can't see that you're in trade mode. So try 
revealing the tray (and so showing the mode) before aborting trade
request due to being in trade mode.
 2009-10-25 00:23:00 +00:00
ehouse
1c94e2c6cc Resource tweaks: fix blank picker for Catalan; make Polish and 
Catalan trade miniwindow messages three lines for better fit; tweak
hint-limits dialogs for Catalan; re-layout Connections dialog (though
it doesn't scroll on Smartphone!)
 2009-10-24 17:44:11 +00:00
ehouse
0dfdb767df dialog text only: invite->room 2009-10-24 16:35:33 +00:00
ehouse
244e0f58db Don't set address in standalone game (should fix assertion 
failure/possible crash); set default menu to Undo after it's been used
once.
 2009-10-24 15:12:45 +00:00
ehouse
5602827ebf Print remaining tiles in scoreboard smaller and using tile background 
color in attempt to make it clearer what the number means.  The goal
is to remove clutter and make more room for player name.
 2009-10-24 14:53:17 +00:00
ehouse
85da3d2082 add parens for clarity 2009-10-24 14:50:23 +00:00
ehouse
899c67f3fe ce code no longer needs to ask if dict is utf-8, as internally all 
are.
 2009-10-23 09:02:02 +00:00
ehouse
ab853ffb3b All dict strings are utf8, so don't ever convert using CP_ACP. Fixes 
misdisplay of Spanish Ñ in tray and on board.
 2009-10-23 08:56:43 +00:00
ehouse
6aca59abe0 Make state private to ceblank.c; all dict strings are utf8, so don't 
ever convert using CP_ACP.  Fixes misdisplay of Spanish Ñ.
 2009-10-23 08:54:54 +00:00
ehouse
8ec7b01595 fix catalan trade miniwindow by making buffer large enough to convert 
text without errors.
 2009-10-23 07:53:31 +00:00
ehouse
b126b8b6bf more tweaks for smartphone 2009-10-22 02:47:46 +00:00
ehouse
06cd5f5a0e tweak dialog layout 2009-10-21 03:43:20 +00:00
ehouse
a1f3d1280f Move scripts to scripts dir; build cab files in built dir along with 
the files they contain.
 2009-10-21 03:39:23 +00:00
ehouse
9cdb9ce45b fix to work with new pocketpc-cab, which strips an extra layer of \ 
from dos pathnames.
 2009-10-20 04:07:16 +00:00
ehouse
cdf418b904 Don't assume resources aren't utf-8 because current dict isn't. 
Always assuming they're utf-8 seems to work, so do that for now.
Fixes problems with Catalan messages when using English dict.
 2009-10-17 04:14:01 +00:00
ehouse
ad2ba1c249 Don't assume resources aren't utf-8 because current dict isn't. 
Always assuming they're utf-8 seems to work, so do that for now.
Fixes problems with Catalan messages when using English dict.
 2009-10-17 04:10:28 +00:00
ehouse
0d326c0252 Generalize code for moving lower items up to cover hidden items, and 
use for role-config and juggle buttons in gameinfo dlg.
 2009-10-17 04:01:59 +00:00
ehouse
1929505c10 Make GameInfo struct private 2009-10-17 03:38:37 +00:00
ehouse
2daea90580 cleanup prefs dialog (and comment where needs translation changes to 
fit)
 2009-10-16 12:42:05 +00:00
ehouse
ca7038043a a few tweaks to dialog layout 2009-10-16 03:35:31 +00:00
ehouse
1fa8b2e48f remove unused param (not even compiled on Palm); on wince, try to 
duplicate for timer the vertical offset used for scores.
 2009-10-16 03:20:39 +00:00