Andy2
4cd15a9c6a
Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy
...
Conflicts:
xwords4/common/comms.c
2010-10-29 05:27:07 -07:00
Eric House
e069a268cd
implement dialog to edit chat text
2010-10-28 21:31:40 -07:00
Andy2
7e0bcee6d2
add room name to callback used when device connects: fix linux to compile
2010-10-28 18:46:07 -07:00
Andy2
5400fad50d
log timeout-dlg messages so there's a record
2010-10-28 18:44:37 -07:00
Eric House
6e843dec6c
make 10997 default relay port
2010-10-22 18:30:19 -07:00
Andy2
b9e3ca212b
turn off glib-dependant checksuming for non-linux builds
2010-10-18 22:08:04 -07:00
Eric House
211e9ded7f
TIMEOUT needs to be bigger for small NGAMES values
2010-10-18 20:18:24 -07:00
Eric House
38ae2faacc
don't nuke bad files along with good
2010-10-14 22:17:34 -07:00
Eric House
c92d59fa53
games can be started with multiple dicts; saving of successful games/logs optional
2010-10-14 05:59:45 -07:00
Eric House
40a7a1b5a3
cleanup; track checked rooms rather than checking each time seen
2010-10-12 19:17:42 -07:00
Eric House
8011eeec2c
cleanup; fix off-by-one bug with NAMES that was breaking runs with
...
four-device games; check before run that there aren't already waiting
games in db.
2010-10-12 05:17:32 -07:00
Eric House
6c5b279946
respect TIMEOUT, and kill all remaining processes before exiting
2010-10-05 20:58:29 -07:00
Eric House
f0b05da131
reduce logging
2010-10-05 20:57:07 -07:00
Andy2
31f3cbc6c8
complete rewrite: use bash's new associative arrays to track games and
...
pids etc. so that a single process can manage starting and stopping
all games. Fixes race conditions where a game would be killed after
finishing but before it'd sent out the message that would allow other
games to finish.
2010-10-04 22:16:58 -07:00
Andy2
a13bb34419
plug memory leak
2010-10-04 22:14:44 -07:00
Eric House
14fd1f9023
add test code for chat feature: display incoming chat and send via
...
menu. Sent message is hard-coded for now; should fix that.
2010-10-03 18:13:48 -07:00
Eric House
a6f5ea5f4a
sync after saving. Seems to improve recovery from TERMs sent by test scripts.
2010-09-28 18:06:05 -07:00
Eric House
1bfdd1978e
move log directory away each time
2010-09-24 20:19:12 -07:00
Andy2
35ff5a7835
exit on logdir being gone before grepping it
2010-09-23 06:41:37 -07:00
Andy2
451ced44ba
cleanup: shorter timeout; set aside games that finish correctly
2010-09-23 06:29:55 -07:00
Eric House
659278448b
changes to work against remote relay
2010-09-22 05:45:40 -07:00
Eric House
076b211cab
tweak to allow to specify host/port for use against remote relay
2010-09-21 20:38:54 -07:00
Eric House
b6ce74be1c
add timeout after which all games are killed
2010-09-20 22:08:51 -07:00
Eric House
c671f2ab05
plug memory leak
2010-09-20 22:07:10 -07:00
Andy2
d199ec5168
account for possibility client apps won't exit on TERM
2010-09-20 05:33:58 -07:00
Andy2
84a26c2c1a
more to ignore
2010-09-20 05:32:17 -07:00
Andy2
00cdbc97d3
Install a no-op TERM handler at first then replace later with one that
...
just exits main loop. Do cleanup/file saving on exit from mainloop.
Fixes occasional crash where TERM came in before we were setup to
cleanup.
2010-09-20 04:55:35 -07:00
Andy2
54512b9e11
put logs in own dir
2010-09-18 07:35:16 -07:00
Andy2
eec07649a6
put logs in own dir; echo every time game ends successfully.
2010-09-18 07:35:02 -07:00
Andy2
7e1066dbcc
vary room names
2010-09-16 22:20:43 -07:00
Andy2
76e7459a6d
various improvements, e.g. random sleeps before and after starting
2010-09-16 18:56:34 -07:00
Andy2
ca6039e890
new test script attempting to mimic real-world usage
2010-09-16 05:39:50 -07:00
Andy2
452e3fc86b
timeout in milliseconds instead of seconds
2010-09-16 04:46:04 -07:00
Andy2
fa50bd00f1
timeout final scores alert
2010-09-16 03:42:57 -07:00
Andy2
0d7165f881
add ability to run gtk from newrelay.sh. Trying to run 50 instances
...
crashes the relay as ACKs take too long to come back.
2010-09-16 01:44:54 -07:00
Eric House
9fc39a55ed
add params to set public-room-related booleans; add timeout option on
...
modal dialogs so gtk version can run unattended.
2010-09-14 21:13:45 -07:00
Andy2
86a1e943ca
make dict settable too
2010-09-12 03:53:39 -07:00
Andy2
8908ca5b1d
ignore new test script's log files
2010-09-11 01:40:05 -07:00
Andy2
1cd2d542f7
new test script
2010-09-11 01:39:20 -07:00
Andy2
d5f2a72227
note that file's out-of-date
2010-09-11 01:28:04 -07:00
Andy2
b3d3673dc9
read the langcode out of dict and into common struct
2010-09-10 01:57:22 -07:00
Andy2
20312144dd
tons of changes, still rough, snapshoted here: a gtk device vs device
...
game works to completion with both signing up as guests (no -s) with
one local and one remote player (identical commandlines.) Not yet
tested: if any signs up as a host, reconnecting rather than
connecting, etc. This is just a snapshot.
2010-09-10 01:30:40 -07:00
Andy2
34a94f23a0
fix error message to not specify host or guest
2010-09-10 01:24:42 -07:00
Andy2
f7c5ff619d
turn off heartbeats
2010-09-10 01:24:03 -07:00
Andy2
2d69d8f2b0
use new crosshairs flags to draw a cross in the middle third of cells
2010-08-11 18:51:09 -07:00
Andy2
6dc21ae7a8
pass (hard-coded) param controlling non-turn board switching
2010-07-17 06:22:42 -07:00
Andy2
e4feef9bbc
reverse sense of -I since hint region unsupported on Android
2010-07-16 18:24:17 -07:00
Andy2
a99e8142b0
Merge branch 'android_branch' into toolbar
...
Conflicts:
xwords4/android/XWords4/jni/Android.mk
xwords4/android/XWords4/jni/xwjni.c
xwords4/android/XWords4/res/values/strings.xml
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java
2010-07-16 06:32:32 -07:00
Eric House
e2c663622f
ignore dicts
2010-07-15 18:09:40 -07:00
Andy2
f4e0c5f1ad
turn on crosshairs feature
2010-07-13 06:27:07 -07:00
Andy2
f2674ed27c
XWFEATURE_RAISETILE is off by default
2010-07-12 19:11:42 -07:00
Andy2
de32e514ab
cherry-pick three revisions from toolbar branch ( d1c7d4097c
, f848473c1a
and 6484a2fb9b
) and manually fix conflicts.
2010-07-12 18:48:03 -07:00
Andy2
6484a2fb9b
fix to compile (with or without KEYBOARD_NAV undefined)
2010-07-09 06:50:39 -07:00
Andy2
6b9b97231a
fix to compile with KEYBOARD_NAV undefined
2010-07-09 06:49:32 -07:00
Andy2
4425ff838c
add buttons (gtk) to test new prev-move feature; modify to fit new api
...
(curses).
2010-07-07 05:29:04 -07:00
Andy2
3452666231
use board_canTogglePending to disable button
2010-07-03 11:39:10 -07:00
Andy2
592d99ba80
add new button and handler to test redo of undone pending moves.
2010-07-02 18:53:37 -07:00
Andy2
e150db29ee
use board_canFlip() to prototype disabling flip button when useless.
2010-06-30 20:25:56 -07:00
eehouse@eehouse.org
1fdf1e1a41
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2010-06-17 20:40:13 -07:00
Eric House
afb3f4040a
fix to compile in non-debug mode
2010-06-17 20:35:54 -07:00
Andy2
80aa22b2d1
add common prefs field sortNewTiles and way to set on linux cmdline
2010-06-17 18:10:32 -07:00
Andy2
cb5763312d
can't use svnversion for file name any more
2010-06-07 05:50:01 -07:00
Eric House
08ad0bdfa5
fix assertion failure by passing max size not < actual size
2010-06-05 08:10:02 -07:00
eehouse
f514717428
Change board_zoom to indicate direction only of zoom, not number of
...
cols. When figuring internal dimensions zoom out as needed to meet
maxSize value. This fixes problem where rotating a zoomed portrait
board to landscape leaves cells bigger than they can be made by
zooming, but then the desired zoom has been changed and stored and so
on return to portrait cells are smaller/less zoomed. Need to see if I
can live with that.
2010-06-05 03:40:23 +00:00
eehouse
a80d874e9d
change api for board_zoom and change callers. No effect on java and
...
no behavior change.
2010-06-05 03:39:06 +00:00
eehouse
a2d2b0adbd
quick hack to enable/disable zoom buttons so can debug board.c w/out
...
android.
2010-06-05 03:38:40 +00:00
eehouse
e1d956ac09
catch up with board_setPos API change.
2010-06-03 04:58:02 +00:00
eehouse
92e02c9c2e
catch up with API changes
2010-05-28 02:31:04 +00:00
eehouse
04835a09e1
add missing params so compiles
2010-04-23 09:32:14 +00:00
eehouse
f501ccd946
add better missing-param messages
2010-04-20 02:39:06 +00:00
eehouse
ad2c725a58
always install scrollbar because zooming can require it after the
...
fact.
2010-04-15 02:16:40 +00:00
eehouse
1950e38bda
remove bogus assert and logging
2010-04-08 04:15:08 +00:00
eehouse
a87ecf5638
pass vScale and hScale into draw_boardBegin so platform can use same
...
size font for all cells regardless of size; fix scrolling to pass
actual sum of the disappearing rows' heights.
2010-04-08 04:14:55 +00:00
eehouse
d263b47a56
lots of changes, still rough, to allow zooming in and out on board.
...
Includes ability to scroll horizontally by dragging. Board init API
changes to specify board width and max height instead of cell
dimensions, so now board owns task of picking cell size. If the
number of cells does not evenly divide into a board dimension then the
extra pixels are distributed among some columns/rows in a way that
still allows bitblit-based scroll implementations (though horizontal
scrolling at this point always does an invalAll()). Not yet tested
with overlapping tray. And still need to allow rows to be taller than
cols are wide if platform code has given the space. Stream format
changes with this checkin.
2010-04-08 04:14:14 +00:00
ehouse
daa84bf4e2
include date in output
2010-03-31 02:46:29 +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
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
cb5cc975b3
add new params required for comms_getInitialAddr
2010-03-25 04:53:16 +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
05f7da8c33
ignore more
2010-03-14 16:25:27 +00:00
eehouse
00e8742ad8
show blank as a ? rather than a _.
2010-03-08 06:10:46 +00:00
eehouse
815a5f85b0
core files happen
2010-03-08 06:10:02 +00:00
eehouse
47402bd3b5
remove unused field
2010-02-27 18:05:00 +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
6893fe742a
fix r3013 breakage: remove gameID params
2010-02-01 01:50:38 +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
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
28265749f9
fix unused var warning in release build
2009-12-17 13:09:10 +00:00
ehouse
35f068e05c
Implement new callback giving progress connecting with relay.
2009-12-14 04:06:26 +00:00
ehouse
273f3d2f4a
don't show turn confirm dialog by default
2009-12-14 02:54:56 +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
d5f7a0693f
Handle missing relay error messages.
2009-11-22 19:25:49 +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
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
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
066c3de9a7
add to gtk version a quick -F option to use new skip-confirm feature
2009-11-08 17:25:19 +00:00
ehouse
86d6f8d0a3
script and helper for testing proposed store-and-forward relay feature.
2009-11-05 04:31:23 +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
0dfdb767df
dialog text only: invite->room
2009-10-24 16:35:33 +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
ehouse
f80b1d74f2
include name of player whose turn it is in scoreboard entry, reducing
...
length until it fits. (Still needs polishing...)
2009-10-15 12:44:53 +00:00
ehouse
2721561324
add option to include new duplicate packets flag
2009-09-26 14:33:09 +00:00
ehouse
827f44ff48
Script to put games on relay that need partners, great for testing
...
with just one handheld.
2009-09-26 13:48:58 +00:00
ehouse
547c1758a9
For testing, add option to send duplicates of all packets
2009-09-26 13:47:51 +00:00
ehouse
b1352f013c
prepend Test_ to cookie/room name
2009-09-22 03:38:43 +00:00
ehouse
a13e1d6488
add util_clearTimer, implement on all platforms, and call when closing
...
comms to fix crash on Wince when timer fired after comms had been
deleted. The closure stored and passed in was no longer a valid ptr.
2009-09-21 12:49:08 +00:00
ehouse
a91fd28773
fix some warnings when building linux client without debugging but
...
with warnings as errors.
2009-09-20 21:51:29 +00:00
ehouse
52055d6334
add USE_CURSES to help
2009-09-20 20:48:05 +00:00
ehouse
1da25307e5
Display relay state on board, horizontal scoreboard mode only for now.
2009-09-20 18:45:25 +00:00
ehouse
a5556469ef
fix timer formatting
2009-09-20 05:00:23 +00:00
ehouse
e8ae5e43ad
don't timeout games just because they're set to sleep a long time between moves.
2009-09-17 03:41:08 +00:00
ehouse
18e9301e87
rename Cookie to Invite, a change that may change. Rename everywhere
...
in clients but not in relay where cookie is too pervasive. (There are
no code changes in this checkin.)
2009-09-14 03:11:11 +00:00
ehouse
535e97b855
replace array of indices with array of ptrs for faster & smaller code
2009-09-13 05:28:12 +00:00
ehouse
6c4b991566
Modify comms and games APIs so single struct of callbacks is passed
...
instead of multiple callbacks; add callback called when relay state
changes; adapt linux and palm clients to new API. (Wince changes
pending.)
2009-09-12 21:39:13 +00:00
ehouse
8ddc8612a8
experimental CC def should not have been checked in
2009-09-05 13:00:35 +00:00
ehouse
3a1c2572dd
Merge in unicode changes to read in utf-8 dictionary format
2009-09-04 12:30:10 +00:00
ehouse
6827ab5d88
Unify signal handlers that do same thing; clean memory leaks and a
...
double-dispose.
2009-08-30 15:23:05 +00:00
ehouse
1c8147c21c
Tweak to support non-ascii utf-8 chars from dicts. Seems to display
...
Catalan and Polish fine (on board.)
2009-08-29 16:09:58 +00:00
ehouse
d86d2b556a
Tweak to support non-ascii utf-8 chars from dicts. Seems to display
...
Catalan and Polish fine (on board.)
2009-08-29 16:09:24 +00:00
ehouse
d29b048504
timeout games after five minutes no matter what
2009-08-23 15:35:47 +00:00
ehouse
537de614b9
remove timer assert; log socket errors
2009-08-21 12:15:40 +00:00
ehouse
f5f5df990e
Drive hosts launched from list of local roles in anticipation of
...
splitting tests between machines.
2009-08-21 03:31:34 +00:00
ehouse
1264cacdc1
when one participant in a game crashes kill the rest so another can
...
begin.
2009-08-20 11:56:33 +00:00
ehouse
522bd8636d
include timestamp in "game finished ok" output
2009-07-31 13:04:37 +00:00
ehouse
fbd3559e3b
Fix assertion failures
2009-07-31 13:03:05 +00:00
ehouse
7338a706cb
option to randomly kill xwords instances
2009-07-29 04:31:23 +00:00
ehouse
192fb50bf8
add SIGINT handler that calls quit (to save files). Listen for errors in poll.
2009-07-29 04:29:29 +00:00
ehouse
9ab746d8ac
Include strerror output in a few socket-related error messages.
2009-07-28 05:17:44 +00:00
ehouse
62b7d3c3a4
Clean up gtk case and fix post-game log checking.
2009-07-28 05:02:09 +00:00
ehouse
19cff0f7c5
make all game ids (cookies) unique; fix success test
2009-07-16 04:36:30 +00:00
ehouse
fed0458f2e
various improvements. Runs games forever now, though exit is clumsy.
2009-07-13 02:57:41 +00:00
ehouse
d7cd277893
Add option to close stdin on startup, which seems required to run
...
curses version from script. There's probably a better way...
2009-07-12 01:32:14 +00:00
ehouse
df293db349
script to run lots of games with events at more natural intervals against relay.
2009-07-12 01:18:09 +00:00
ehouse
4c523b628c
Make slow-robot work for curses client too.
2009-07-10 05:04:04 +00:00
ehouse
184a154c52
New feature, meant for testing relay, makes robot skip random number
...
of seconds within specified range before making a move. Working only
on gtk so far, and will probably never be used other than on linux
clients.
2009-07-09 12:43:51 +00:00
ehouse
7893c2066a
get rid of gratuitous echo
2009-07-05 01:46:27 +00:00
ehouse
c0073183ba
improve relay test script to better run in a loop.
2009-07-03 14:55:20 +00:00
ehouse
a954286960
avoid mempool assertions by cleaning up on way out
2009-06-30 12:55:47 +00:00
ehouse
669e423ca8
Use new dict API to get rid of XP_UCHAR4 type, replacing with const XP_UCHAR*.
2009-04-07 04:23:56 +00:00
ehouse
2838f421a5
fix a couple of null ptr exceptions
2009-04-05 23:48:33 +00:00
ehouse
f0d6dda9dd
A couple of new types for xp code dealing with utf8.
2009-04-05 19:27:30 +00:00
ehouse
a9b88d95b2
Read new dicts and old into new format.
2009-04-05 19:22:55 +00:00
ehouse
b63c75f36e
use libncursesw
2009-04-05 18:35:51 +00:00
ehouse
cb72b3ffef
call gi_initPlayerInfo() for defaults when not provided on commandline.
2009-03-08 19:57:27 +00:00
ehouse
53fca87b10
Go back to combo box for role, and add config button beside it using new support in nwgamest.
2009-03-08 19:56:48 +00:00
ehouse
de4c57e740
include strerror output in logging when socket read fails
2009-03-08 19:56:01 +00:00
ehouse
dbec991e9a
use PID as cookie so creation order visible on relay during testing
2009-03-02 01:46:10 +00:00
ehouse
aa48b4c3ed
plug memory leak by closing relay socket when quitting
2009-02-28 19:19:42 +00:00
ehouse
3f01c9129e
Lots of changes to make gtk version better test with relay: make
...
possible to start without specifying comms params, to switch roles
and/or number of players when starting new game; clean up dialogs,
esp. use notebook widget to have tab switch between comms types.
2009-02-28 18:52:44 +00:00
ehouse
c2b34e459d
include pid in log for better multi-device debugging
2009-02-28 18:50:21 +00:00
ehouse
13415e895e
test script, first draft.
2009-02-28 16:31:34 +00:00
ehouse
46cb6c2955
fix assertion on exit: nuke mempool after everything it contains; call
...
gtk_main_quit rather than gtk_exit() so can exit from main()
2009-02-28 16:31:03 +00:00
ehouse
bac17d8c1e
start adding conns dialog
2009-02-24 04:34:37 +00:00
ehouse
80b3425b5b
log size of incoming packets
2009-02-07 18:15:17 +00:00
ehouse
c672fcfafd
Make it possible to run same binary against relay with relay heartbeat
...
and direct with comms heartbeat. This mostly means changing ifdefs.
2009-02-01 15:50:58 +00:00
ehouse
3a643c51a4
cleanup; set locale based on ENV
2009-01-25 20:31:13 +00:00
ehouse
09c879dccc
Add sms support, largely untested.
2009-01-13 13:33:56 +00:00
ehouse
99a5a7912b
Use new draw API but same bitmap as always (large in tile, small in
...
cell.) In cases where bitmap and text provided, prefer bitmap.
2009-01-13 13:02:17 +00:00
ehouse
7158ef3802
Cleanup; add sms example to usage()
2009-01-05 02:11:13 +00:00
ehouse
dc82fc6bff
Use the new common/strutils binToSms routines. For now, use glib's
...
too and assert output is the same.
2009-01-05 02:10:27 +00:00
ehouse
c731e0d231
Remove newlines from debug statements.
2009-01-05 01:59:04 +00:00
ehouse
342674276a
Cleanup to build with relay enabled; don't enable any network features
...
if STANDALONE_ONLY is defined.
2009-01-03 23:56:20 +00:00
ehouse
863f79bfb9
Fix compile errors using latest gcc (fread etc must have return value checked)
2009-01-03 18:12:34 +00:00
ehouse
cefd69d8b3
Since there's now a flag indicating whether to show the value of a
...
tile, make value unsigned. Adjust/fix platforms. Add cmdline flag to
linux apps for hiding values.
2008-12-29 03:09:35 +00:00
ehouse
1755267d55
Add support to gtk app for tranport over "sms", with files containing
...
base64-encoded data as the messages. Make necessary changes to comms.
This is the foundation for doing real SMS transport on handhelds.
Currently a full robot game works for two gtk clients provided the
server is launched first.
2008-12-29 01:35:29 +00:00
ehouse
b24f3d66a7
fix warning when DEBUG not defined
2008-11-22 17:14:08 +00:00
ehouse
5118e415c7
use a gharish color for focus so doesn't get lost
2008-11-22 16:37:58 +00:00
ehouse
46b574b4e7
fix inval of focussed tile to take divider into account.
2008-11-20 05:12:48 +00:00
ehouse
5cb97bf636
New Ubuntu has a stricter compiler...
2008-11-06 03:16:09 +00:00
ehouse
e30c72c829
make -q option take number of seconds to pause before quitting
2008-10-26 15:33:21 +00:00
ehouse
9b17c20117
gtk/ncurses support for Rem: focus and showing remaining tiles. Also
...
rewrite gtkask to use gtk_message_dialog and add sigint handler.
2008-10-24 09:07:30 +00:00
ehouse
86fb79d969
Fix to compile and run for IP-direct case, possibly breaking
...
heartbeats used over bluetooth.
2008-10-11 17:33:07 +00:00
ehouse
f021964213
fix ncurses version so it can save games and read them back in: make existing gtk code run on both.
2008-09-18 03:46:27 +00:00
ehouse
36627fb051
Add listeners to model so board can be notified whenever dictionary
...
changes. Pass dict into draw via new API, removing it from the
draw_begin calls.
2008-09-05 12:11:37 +00:00
ehouse
797b859c8e
add pointer support to LIB_NO_UI case
2008-08-30 13:28:53 +00:00
ehouse
4d6aec67fe
error message when hit feature is off but you try to use it; clean up memory on way out.
2008-08-30 13:27:27 +00:00
ehouse
30fcb88e43
fix problems drawing focus so letters still visible on board.
2008-07-28 05:03:37 +00:00
ehouse
bc05761c4a
change API for drawing divider so it can be focussed as well as
...
selected. Being using that information in palm and wince. For GTK,
use color rather than ugly black rects to indicate focus.
2008-07-17 05:03:01 +00:00
ehouse
ad52e63ff0
separate UI-specific code so that a non-UI linux library can be compiled, e.g. for use with a toolkit not gtk or ncurses
2008-06-30 03:39:27 +00:00
ehouse
bbfdeb6bf8
Draw tiles hanging a bit below board when hidden to allow testing of
...
common case on wince devices.
2008-06-07 23:03:47 +00:00
ehouse
bd6aed4b5a
Fix so curses-only builds and curses build doesn't segfault.
2008-05-26 00:27:48 +00:00
ehouse
c6da605b56
add missing error message
2008-05-24 16:08:13 +00:00
ehouse
5502c3ef8b
Trying to give smartphone users way to use keypad to move tiles to
...
board. Enabling key-to-text works, but constants to turn it off
aren't in cegcc. So for b2 add a quick hack where 1 means first tile
in tray, 7 means last (rightmost). Enable and test on gtk.
2008-05-11 20:29:43 +00:00
ehouse
ebad668227
add some consts.
2008-05-06 12:49:37 +00:00
ehouse
4730a23188
fix gtk_draw_vertScrollBoard to scroll bits rather than just letting
...
board inval everything.
2008-04-12 16:50:46 +00:00
ehouse
ff254fcef4
add ability to scroll the board by dragging it. add new method
...
util_altKeyDown to allow user to choose between scrolling board and
dragging the hint rect when both are possible. add adjustYOffset;
make it and board_setYOffset more tolerant of out-of-bounds inputs and
use that to simplify calling code.
2008-04-08 03:55:53 +00:00
ehouse
75ab88565d
implement util_yOffsetChange; increase pen timer to half second.
2008-03-27 04:12:16 +00:00
ehouse
ae67a58a26
Attempt to find font that best fits string to encosing rect. Works
...
but only with a hack: need to understand pango better.
2008-03-25 12:47:05 +00:00
ehouse
d3ce87b057
Indicate empty cell with CELL_ISEMPTY rather than an empty string; fix
...
palm to not draw star on top of placed tile.
2008-03-14 09:36:42 +00:00
ehouse
a3bc875191
Fix errors, all in debug-only code, flagged by __attribute__ format addition.
2008-03-11 12:24:23 +00:00
ehouse
355cfa9fcc
add owner param to drawTileMidDrag so can color tiles correctly
2008-03-11 11:48:53 +00:00
ehouse
bc873169f1
Add __attribute__ ((format)) and fix problem it flags.
2008-03-10 12:02:53 +00:00
ehouse
f30dd17e00
rename constants to begin with GTK so they're unique.
2008-03-10 00:51:20 +00:00
ehouse
0b1f4b8f0a
merge with drag_n_drop branch: apply patch generated with this command on that branch: svn diff -r 2080:2087
2008-03-08 23:16:21 +00:00
ehouse
e6a485f653
Add ENABLE_LOGGING define so logging can be used on non-debug builds, e.g. to trace opening of non-debug saved games and prefs files.
2008-02-17 21:48:48 +00:00
ehouse
f5ae6b9809
add -Werror
2008-02-16 19:05:30 +00:00
ehouse
c3555440fd
get rid of const-related warnings
2008-02-16 15:49:03 +00:00
ehouse
ea7949dd22
Make a couple of dialogs format for narrower screen and respect keypad buttons.
2008-02-02 20:58:44 +00:00
ehouse
2910bab3a0
fix perimeter focus clearing and board size setting.
2008-02-02 17:21:57 +00:00
ehouse
b98b7fd993
Move toward running curses on a small screen: replace omnipresent menu
...
with one drawn on demand; change size and location of scoreboard and
tray if needed; use wgetch rather than reading stdin to support keypad
keys for navigation. Also stick g_ in front of some frequently used
global names.
2008-02-02 16:56:20 +00:00
ehouse
bae6890c35
fix to build without Bluetooth headers
2008-02-02 16:53:36 +00:00
ehouse
6e715d63ee
change name of field. No code change. Pending on symbian and franklin which don't compile.
2008-02-02 15:17:53 +00:00
ehouse
6e9e5b5c99
Fix to compile and run standalone
2008-01-19 16:03:53 +00:00
ehouse
08da013d4d
Warn user, and refuse to continue, when new game is as host and has no remote players. API
...
changes, so other platforms won't compile until changed.
2008-01-04 14:47:52 +00:00
ehouse
b115cc6f0c
fix unused param warning
2008-01-02 01:43:45 +00:00
ehouse
3b1fcceb16
Fix compilation errors due to constant name changes -- no change to binary.
2007-12-14 13:06:44 +00:00
ehouse
d5d29adc0c
Change util function to use signed type; other cleanup to compile with various features.
2007-12-05 06:28:51 +00:00
ehouse
5457ea1b59
replace all __FUNCTION__ with __func__
2007-12-02 19:13:25 +00:00
ehouse
a560c9f8a8
Add files forgotten with last checkin; add additional parameter to
...
addListener so listeners can be removed on reset.
2007-11-28 03:59:26 +00:00
ehouse
e1d5632a7b
Re-add direct-via-ip transport, and implement for linux in order to
...
better test heartbeats. Fix so can play against Palm over BT.
Assertions failing on Linux when reset, but it's otherwise done.
2007-11-26 02:58:25 +00:00
ehouse
ee726968b0
Don't draw negative number of tiles left.
2007-11-25 15:12:22 +00:00
ehouse
4c8cf98d24
Add and set a compile-time option so comms will set a periodic timer
...
and use it to send and check for heartbeats over any transport.
Caller must supply a reset proc which is called when heartbeat hasn't
been received in too long. No changes required to comms protocol, but
that means the heartbeat interval is fixed at compile time: can't be
negotiated, and the two ends had better agree. Currently tested with
linux host and PalmOS guest, where only the first heartbeat failure is
recovered from. So there's some debugging to be done still.
2007-11-18 23:43:27 +00:00
ehouse
cfb01d8f3d
Deal with incoming fragmented rfcomm packets; log packet contents.
2007-11-15 14:40:56 +00:00
ehouse
ac42b5e7d6
fix oversized font when scoreboard miniwindow has two lines.
2007-11-14 05:57:12 +00:00
ehouse
1094680ee7
quick hack at framing rfcomm packets
2007-11-14 05:53:28 +00:00
ehouse
6b834cce4a
Add ability via compile-time flag to connect via rfcom rather than
...
l2cap. Works with two caveats: assumes l2cap-style complete packets
(no framing), and has problems with linux sdp system's tendency to
retain records long after sessions are closed.
2007-11-13 15:20:33 +00:00
ehouse
383847e75c
Fix typo breaking compile.
2007-11-05 03:42:27 +00:00
ehouse
3060888264
Update BT code to advertise and search sdp records and use psm reported to work with new Palm
...
code. Log btaddr after converting from name.
2007-11-05 03:38:00 +00:00
ehouse
de640cda98
Update BT code to advertise and search sdp records and use psm reported to work with new Palm
...
code. Get rid of pthreads dependency which was for logging only.
2007-11-05 03:17:07 +00:00
ehouse
880254c17f
Fix tray hanging below main window; draw pending tiles white-on-black as on other platforms.
2007-10-24 12:46:15 +00:00
ehouse
e0f5fcf280
Instead of three fixed-sized fonts, choose fonts (lazily) based on the size of the rect into which it's to be drawn.
2007-10-23 03:08:47 +00:00
ehouse
2f925349a6
Fix so can without BT, and so compiler can be specified to Makefile.
2007-06-02 02:07:45 +00:00
ehouse
edfdda6fd2
Fix so compiles curses-only, and so curses cell can be 2x1 (for square board)
2007-06-01 02:08:04 +00:00
ehouse
dd7a5c8104
type name change only
2007-05-26 14:14:01 +00:00
ehouse
eeebeca542
substitute macro for common sizeof(x)/sizeof(x[0]) pattern; no generated code change
2007-05-26 14:03:07 +00:00
ehouse
0fd0692748
better logging: include function name
2007-03-17 15:38:44 +00:00
ehouse
5afdcc20db
include result of strerror in messages logging errno; turn relay on by default (linux)
2007-02-04 01:22:00 +00:00
ehouse
7c8b7294cd
add const to a bunch of char* decls in APIs and variables; no code change
2007-02-03 17:54:20 +00:00
ehouse
3f111c5657
name change only: Connectedness becomes DeviceRole
2007-02-02 08:34:37 +00:00
ehouse
7ed3ad89b7
Remove assert that's firing; don't inval_all from util_yOffsetChange:
...
that blocks testing common inval code.
2007-01-21 23:00:52 +00:00
ehouse
a998e96de9
Tweak scroll-of-focussed-board inval code so we don't inval the whole
...
board, which looks crappy. Instead inval only what was previously a
border row, and pass a new param to draw_vertScrollBoard so the
platform can choose not to scroll cells that will just get overwritten
with different bits.
2007-01-21 22:59:29 +00:00
ehouse
20ecd5f7d7
get rid of draw methods; always highlight cursor same way;
...
board_handleKeyUp becomse board_handleKey for curses
2007-01-19 08:20:58 +00:00
ehouse
e0010901f1
add board_handleKeyRepeat, and call it from palm and gtk. This lets a
...
held nav key walk the cursor across the board.
2007-01-07 04:32:29 +00:00
ehouse
593980817f
Clean up for non-keyboard and non-keyboard-nav cases. Wince is the
...
latter: make it compile again.
2007-01-07 01:01:20 +00:00
ehouse
098a2ec5c4
Use new keydown/up APIs from linux, and add key support and drawing
...
changes to implement keyboard navigation/focus in gtk port.
2007-01-06 17:46:02 +00:00
ehouse
afc302a29b
When alt key pressed cursor can move onto occupied squares it normally skips.
2006-11-22 13:49:14 +00:00
ehouse
7fe5718cc5
When "dived" focus reaches and crosses border of object, return as if
...
not handled. This causes the platform to handle the key event itself,
typically by moving the focus to the next top-level object.
2006-11-17 13:41:13 +00:00
ehouse
cac0fd94d7
Use new top-level focus drawing model, and new API indicating whether
...
key handled.
2006-11-14 06:47:50 +00:00
ehouse
4ccddbd93f
add a done button
2006-11-13 02:02:15 +00:00
ehouse
84321fa158
fix drawing of empty tray space.
2006-11-12 15:39:10 +00:00
ehouse
eb32609a1d
Fix to compile and work with draw API changes
2006-11-12 14:51:47 +00:00
ehouse
2945a120f9
resend_all when a socket connects. This is the strategy needed with
...
Palm where apps quit and reopen connections many times during a game.
2006-11-11 22:44:31 +00:00
ehouse
9f0db2d9c5
add -lmcheck, which purports to catch memory errors
2006-11-11 22:42:40 +00:00
ehouse
b171900dfb
When moving focus through tray, skip empty space; when through board,
...
skip cells with tiles permanently played. Space char raises focus but does
not move it laterally.
2006-11-09 06:05:40 +00:00
ehouse
e8b74e1cc3
set focus to board if not held prior to passing keys
2006-11-08 05:05:11 +00:00