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

3133 commits

Author SHA1 Message Date
eehouse
baac58c090 add summaries to global prefs; remove "hide values" pref since screen 
is big enough we'll never need it.
 2010-04-23 08:39:24 +00:00
eehouse
e57626ec87 add ability to set text pref summary from its value and do so for the 
four "advanced" prefs.
 2010-04-23 08:38:21 +00:00
eehouse
0ffc5c326f don't pass bitmaps into java draw code since they're no longer used. 2010-04-23 08:37:27 +00:00
eehouse
5d31c18658 copy dict name into dict struct so e.g. Counts and Values works 2010-04-23 08:36:20 +00:00
eehouse
8067e82332 pass dict name into jni along with its bytes 2010-04-23 08:35:38 +00:00
eehouse
ceff1cde8b pass dict name into jni along with its bytes 2010-04-23 08:34:58 +00:00
eehouse
c2c463171c fix dict_splitFaces to work for utf8 -- by calling into existing java 
code.  Fixes multi-device play with Catalan dict.
 2010-04-22 04:56:48 +00:00
eehouse
bb2642f4b6 use new scaling code based on width of text rather than number of 
chars and where it was called from.
 2010-04-22 04:56:37 +00:00
eehouse
94d3f7483c Since we're not using bitmaps any more remove the code to parse and 
convert them.
 2010-04-22 04:56:14 +00:00
eehouse
7003a5cd93 remove dead variable and code 2010-04-21 12:36:25 +00:00
eehouse
f47b61594b use new code to draw tray specials as well. This is much better than 
the old way, and now all the bitmap stuff can go away.
 2010-04-21 12:36:09 +00:00
eehouse
8ba90c9cbb first pass at replacing bitmap drawing of specials with text scaled 
horizontally to fit.  Does a much better job of making the letters
look natural, with the same baseline alignment as everything else.  No
caching is done and performance seems fine.
 2010-04-21 12:35:55 +00:00
eehouse
e1378e91ab test for null ptr when firing runnable not when creating it 2010-04-20 13:31:08 +00:00
eehouse
2d6ddae8ce tell view at create time whether zoom controls are enabled so it draws 
self in the right place.
 2010-04-20 02:40:00 +00:00
eehouse
4eb7f80cca draw board img at very top of screen if zoom controls are enabled so 
that they appear below tray and don't steal events from tray.  There
should be a better way to do this but it's a big improvement.
 2010-04-20 02:39:44 +00:00
eehouse
9f48c4f99b check for null before calling method on object, fixing one NPE seen 
and another expected.
 2010-04-20 02:39:30 +00:00
eehouse
4d3bab67bb make about box text white for contrast. I don't know why this is 
required when opensudoku seems to be doing the same thing and getting
white text without specifying.  More to learn...
 2010-04-20 02:39:16 +00:00
eehouse
f501ccd946 add better missing-param messages 2010-04-20 02:39:06 +00:00
eehouse
56270dbe7e add missing carriage return (assumed by common code) 2010-04-20 02:38:55 +00:00
eehouse
fbe46c1284 pass boolean isUTF8 in from jni, and if false create InputStreamReader 
to decode ISO8859_1 rather than utf-8.  Fixes problem with Ñ in old
Spanish dicts.  Should fix all pre-utf8-format dicts, actually.
 2010-04-20 02:38:42 +00:00
eehouse
25ffcbec88 add another file (which I've scanned before...) 2010-04-20 02:38:20 +00:00
eehouse
1b14cb7dd6 make order in which bonus color prefs are loaded match that in common 
code, fixing bug where two were switched.
 2010-04-17 04:21:24 +00:00
eehouse
f04a60c0ea make background color the last color preference. It's least important. 2010-04-17 04:21:07 +00:00
eehouse
c6c59d57f8 use the new empty/background color 2010-04-17 04:20:36 +00:00
eehouse
70554b869f change string describing color 2010-04-17 04:20:20 +00:00
eehouse
81bdd66250 default background color is white 2010-04-17 04:20:07 +00:00
eehouse
a7c9159b81 fix init of other colors (new was missing) 2010-04-17 04:19:16 +00:00
eehouse
a6a421f550 add preference for empty cell color, which other platforms have. This 
change makes the pref editable and persistent, but doesn't use it to
draw.
 2010-04-17 04:17:49 +00:00
eehouse
9a98c56b2b latest from translator 2010-04-17 04:17:26 +00:00
eehouse
7827fab1d3 log the various lifecycle methods, including onStop and onDestroy that 
are now overridden only for for logging
 2010-04-17 04:17:12 +00:00
eehouse
348f3cfef3 up alpha version 2010-04-17 04:16:57 +00:00
eehouse
d247ef6ccd tell view about zoom preference every time focus is gained. This 
fixes problems where doesn't have right setting after orientation
change.
 2010-04-17 04:16:45 +00:00
eehouse
a07cdd8513 limit depth of zoom further 2010-04-17 04:16:17 +00:00
eehouse
afcf669be3 only update volkeys pref after pref window's gone away rather than on 
every focus gain.
 2010-04-17 04:15:57 +00:00
eehouse
98d4da136e don't pass null CommonPrefs instance to jni. Fixes crash when closing 
prefs window that was on top of board.
05d8b4c383a5520ce1e0691f25e3af89f69b7cf5 introduced this change by
switching to making multiple calls to unload game.
 2010-04-17 04:15:36 +00:00
eehouse
d1e8b95843 add assert that would have helped 2010-04-17 04:15:20 +00:00
eehouse
d66e74a301 turn off logging for release 2010-04-15 03:35:33 +00:00
eehouse
95ddf7ddd4 add preference controlling whether volume keys or a 
ZoomButtonsController is used to support zooming.  Default is the more
discoverable ZoomButtonsController.
 2010-04-15 03:34:03 +00:00
eehouse
a9a4a99243 reset dims on start to force relayout and init of board rect in common 
code: scroll changes there require init after load since board dims
aren't part of what's saved.
 2010-04-15 02:17:12 +00:00
eehouse
3da04d092d move constant 2010-04-15 02:16:59 +00:00
eehouse
ad2c725a58 always install scrollbar because zooming can require it after the 
fact.
 2010-04-15 02:16:40 +00:00
eehouse
7a5b2e10c3 changes, previously committed, to take advantage of new zoom API: hook 
up to volume key and to ZoomButtonsController, pass from UI thread to
JNI thread and back, dis/enable buttons based on zoomability, and
remove zoom submenu.
 2010-04-15 02:16:30 +00:00
eehouse
7f7af21ff4 make 2nd player robot by default (previously committed) 2010-04-15 02:16:06 +00:00
eehouse
da2cfa5934 changes (commited earlier but now somehow missing) putting 
scroll-related fields into a struct so vertical and horizontal can be
handled by the same code; add to board_zoom out params indicating
whether further zooming is possible.
 2010-04-15 02:15:50 +00:00
eehouse
477899e6aa add debug-only source file 2010-04-13 03:22:08 +00:00
eehouse
43d53bceb8 fix compile command 2010-04-08 04:19:51 +00:00
eehouse
0d7b074b72 minimal changes to get zoomin/out working, which they do. But board 
coords are off and probably other fixup is needed.
 2010-04-08 04:16:16 +00:00
eehouse
805ac26d09 add zoomin/zoomout menuitems. These should become a zoomwindow later. 2010-04-08 04:15:48 +00:00
eehouse
339fc5a9e6 don't zoom down below two cells so we can still drag-scroll 2010-04-08 04:15:33 +00:00
eehouse
41b29c9ba3 distribute extra pixels evenly, with extras one each at the beginning 
of the arrays.
 2010-04-08 04:15:25 +00:00
eehouse
d01a30d1be adjust yOffset same as x so we zoom in toward center; reduce xOffset 
when zoom out makes it too big.
 2010-04-08 04:15:16 +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
5922d8c96a fix coordToCell to return false when cell off board -- to fix bug 
where blank tiles were drawn on top of tray area when scrolled down
there.
 2010-04-08 04:14:42 +00:00
eehouse
774d3f8a13 copyright change 2010-04-08 04:14:34 +00:00
eehouse
b1ed0200cc stretch rows to fill space given by platform: they don't have to be square. 2010-04-08 04:14:22 +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
eehouse
6bd818a10f set drag threshold to 1; 3 is just wrong on android 2010-04-08 04:13:59 +00:00
eehouse
bf0f217460 fix confirm-changes-that-lose-turns logic so doesn't require 
confirmation if no moves yet made.
 2010-04-08 04:13:41 +00:00
eehouse
1deda80a9c add ok/cancel to relay/sms config dialog 2010-04-08 04:13:23 +00:00
eehouse
f1f5b63a0d put ok/cancel buttons back on player edit dialog. Just feels better 
that way.
 2010-04-08 04:12:51 +00:00
eehouse
ea07f92b28 don't show remaining tiles when <= 0 2010-04-08 04:12:26 +00:00
eehouse
97569ae6d0 add advanced pref to hold dict download url; use it. 2010-04-08 04:12:08 +00:00
eehouse
27f65ba39d open connection to relay in the network thread, not in UI thread. It 
can block for a while.
 2010-04-08 04:11:39 +00:00
eehouse
cbb7f5ff4f move game shutdown into onPause and startup from onCreate to onStart 
and onResume so that state's been saved by the time GamesList gets
focus again and wants to display it.  This requires that startup be
ingnored when game's already loaded and that some code test for null
game ptr before acting.
 2010-04-08 04:11:15 +00:00
eehouse
af0c088464 close cursor to avoid exceptions in finalize 2010-04-08 04:10:42 +00:00
eehouse
df473199f9 fix sql syntax error 2010-04-08 04:10:10 +00:00
eehouse
812262e41d add basic framework to collect metadata prior to saving open game 
(e.g. number of moves) and display it in game list.  What to save and
how to display it still not finalized but it works.
 2010-04-08 04:09:50 +00:00
eehouse
aa8b6ac7e6 get rid of warning-generating copyright symbol 2010-04-08 04:09:11 +00:00
ehouse
daa84bf4e2 include date in output 2010-03-31 02:46:29 +00:00
eehouse
2d740bd4b0 remove unused file 2010-03-28 23:39:10 +00:00
eehouse
b07808e8db add copyright notice; turn logging back on for jni code 2010-03-28 23:38:53 +00:00
eehouse
4de143ca10 turn off logging for release 2010-03-28 16:09:55 +00:00
eehouse
ec96b0dd0d start comms after giving CommsTransport a handler for any network 
activity.  This might fix a very rare race condition.
 2010-03-28 16:09:46 +00:00
eehouse
9b955ae770 resendAll on REconnect as well as connect since it doesn't otherwise 
seem to get done.
 2010-03-28 16:09:34 +00:00
eehouse
47f74ceef7 copy improvements from trunk, then fix to deal with missing dict and 
use new -o flag.
 2010-03-28 16:09:27 +00:00
eehouse
6325c3dc63 remove old comment 2010-03-28 16:09:19 +00:00
eehouse
f4b64fe97d add option, off by default, to stall each message forward by some time 
to better simulate network conditions when testing against local relay.
 2010-03-28 16:09:07 +00:00
eehouse
603462fc33 add option to skip modal dialog showing final game score (may prevent 
curses version from becoming nonresponsive when used from playme.sh);
add menu command to curses version to resend messages.
 2010-03-28 16:08:54 +00:00
eehouse
13b46297e0 Separate life of socket from that of selector: close socket if must 
but don't exit the thread and be ready to reopen.  Fixes bug where
wouldn't reconnect to relay if died and then came back.
 2010-03-25 04:53:44 +00:00
eehouse
cb5cc975b3 add new params required for comms_getInitialAddr 2010-03-25 04:53:16 +00:00
eehouse
f71430dc27 better logging of outgoing sms -- which still doesn't work in emulator 
after new tools released.
 2010-03-25 04:52:58 +00:00
eehouse
f430a84d75 add comms_transportFailed, and call when relay goes down. This makes 
icon change correctly and comms start trying to reconnect, but the
loop in CommsTransport can't be restarted yet.
 2010-03-25 04:51:55 +00:00
eehouse
55abf1116b get relay port from prefs and pass into jni 2010-03-25 04:50:19 +00:00
eehouse
077bc53e80 go back to having Ok and Cancel buttons: that's the way the built-in 
prefs editors work.  Dismiss == Cancel, again following the built-in.
 2010-03-25 04:48:03 +00:00
eehouse
02a96cdaa6 remove ability to edit host and port when configuring relay. Must use 
prefs/advanced.
 2010-03-21 03:13:16 +00:00
eehouse
786541e9ae pass default hostname in from platform code rather than compiling it 
into jni; in java pull it from preferences and pass into jni.
 2010-03-21 03:12:58 +00:00
eehouse
a32975362a increase text of color labels -- but they should really be white. 2010-03-21 03:12:38 +00:00
eehouse
815ac74ebe change color prefs key names so won't crash opening older db 2010-03-21 03:12:28 +00:00
eehouse
19f6ec62db add a color sample above the RGB sliders so changes appear in real 
time.
 2010-03-21 03:12:17 +00:00
eehouse
d68038b18b Remove ok button from color editor; when cancel chosen don't save changes. 2010-03-21 03:12:02 +00:00
eehouse
9466203844 use sliders instead of text fields for editing of colors, and store 
them as ints.  This will probably cause older versions to crash.  Need
either to change the names of keys or warn with next release.
 2010-03-21 03:11:49 +00:00
eehouse
b20296fbd2 First cut at a color prefs editor. 2010-03-21 03:11:29 +00:00
eehouse
e05b31585d get rid of logging 2010-03-21 03:11:09 +00:00
eehouse
a5c3fa5f59 don't pass empty stream to comms_send: this fixes a problem where 
client code calls server_initClientConnection when the game's already
been started and empty messages get queued up.  Ideally the call
wouldn't happen but I'm not sure how to test if a game's begun.
server's doing the right thing not putting anything in the message.
 2010-03-21 03:10:56 +00:00
eehouse
5806aa0aca get rid of excess logging 2010-03-21 03:10:47 +00:00
eehouse
0b7eee672a do something for -S on curses version too 2010-03-21 03:10:36 +00:00
eehouse
b3a4ac306e actually do something (on the gtk side at least) when -S param is 
passed.
 2010-03-21 03:10:29 +00:00
eehouse
76926abdbf get rid of "ignored" since passwd no longer is 2010-03-21 03:10:20 +00:00
eehouse
b6aaf6c38c in debug builds track who sets env so we can log who has it on 
conflict rather than just assert.
 2010-03-21 03:10:10 +00:00