Commit graph

5125 commits

Author SHA1 Message Date
Andy2
5c995af38c stop changing formats between internal and external structs
(iterators); use internal format all the time for speed.  Update linux
test code for new API.
2011-11-02 18:32:00 -07:00
Andy2
7231bd4be3 make dict entries text size bigger 2011-11-02 05:18:10 -07:00
Andy2
8704acfbf1 launch dict browser from tap on dict rather than contextual menu on it. 2011-11-02 05:06:53 -07:00
Andy2
050a68ce42 use XP_REALLOC now that it's fixes 2011-11-02 05:04:31 -07:00
eehouse@eehouse.org
04b8c09128 Merge branch 'android_branch' into android_browsedict 2011-11-02 04:39:51 -07:00
Andy2
ab4ccb1a22 use realloc for testing 2011-11-02 04:39:12 -07:00
Andy2
38867b2875 fix bug in debug free following debug realloc to smaller size 2011-11-02 04:38:39 -07:00
Andy2
eb2b139e48 add some consts and better test for null index data 2011-11-01 18:47:20 -07:00
Andy2
b822f573d6 use getStartsWith() to implement search; add dict name and word count to
title; change text of menu item that launches dict browser from
Details to Browse
2011-11-01 18:45:41 -07:00
Andy2
9f2158f094 add dict_getStartsWith to jni 2011-11-01 18:43:36 -07:00
Andy2
482aca5cfb fix crash due to bad allocation of indexing data space. First cut
used XP_REALLOC, but that turns out to be broken, at least on android.
Haven't really used it before...
2011-11-01 18:33:29 -07:00
Andy2
5827127ceb add some consts and better test for null index data 2011-11-01 18:18:06 -07:00
Andy2
fc4a5c31f4 silence picky compiler 2011-10-31 21:11:52 -07:00
Andy2
11b7ed1e8e fix to compile with new dictiter files 2011-10-31 21:11:22 -07:00
Andy2
3b04cb542c silence picky compiler 2011-10-31 21:11:10 -07:00
eehouse@eehouse.org
45de6c734b Merge branch 'android_branch' into android_browsedict 2011-10-31 21:06:04 -07:00
Andy2
0d4404d43b add dict_getStartsWith(), and code to test it. Lots of cleanup and
bugfixing of dictiter code as well.
2011-10-31 21:05:34 -07:00
Andy2
88f556356c dict_tileForString -> dict_tilesForString 2011-10-31 20:56:48 -07:00
Andy2
69b1b4da27 break dict iteration stuff out into new files. No code change
otherwise.
2011-10-31 18:30:55 -07:00
Andy2
3c53da46ce fix to compile with changed API. Crashes, but want to fix up API in
other branch before debugging here....
2011-10-31 18:22:33 -07:00
eehouse@eehouse.org
24d95675c7 Merge branch 'android_branch' into android_browsedict 2011-10-31 07:03:34 -07:00
eehouse@eehouse.org
916d817ef2 Merge remote branch 'origin/android_branch' into android_branch 2011-10-31 07:02:30 -07:00
eehouse@eehouse.org
ff3a8d4179 Merge branch 'android_branch' into android_browsedict 2011-10-31 06:38:16 -07:00
Andy2
1d34c26ebc remove unneeded parama 2011-10-31 06:37:53 -07:00
Andy2
dc58d123d5 combine params into single struct 2011-10-31 06:34:21 -07:00
Eric House
491c9d06d6 reverse sense of option to mmap dicts by default 2011-10-29 20:31:47 -07:00
Andy2
7d1e9c7638 Merge branch 'android_branch' into android_browsedict
Conflicts:
	xwords4/android/XWords4/jni/Android.mk
	xwords4/android/XWords4/res/values/strings.xml
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
2011-10-28 22:27:22 -07:00
Andy2
8f3c4f6426 add config option to enable face-up tile picking 2011-10-28 22:24:47 -07:00
Andy2
8d228ae190 turn on face-up tile picking for Android (though there's no prefs UI
to enable it for a game yet).  In common code, break pick tile utils
method in two, one for blank and the other for tray tiles.  In java,
implement dialog for picking the tiles.  Works, though is a bit clumsy
to have the dialog come and go after every pick.  Better would be a
dialog that stays up and accumulates picks -- but it'd have to know to
reduce the set of tile choices as letters are chosen.  This'll do for
now.
2011-10-28 22:15:56 -07:00
Andy2
390e7558b0 Merge branch 'android_branch' into android_browsedict
Conflicts:
	xwords4/common/dictnry.c
2011-10-28 21:00:01 -07:00
Eric House
f6ff3e85c6 Merge remote branch 'origin/android_branch' into android_branch
Conflicts:
	xwords4/common/dictnry.c
	xwords4/common/dictnry.h
	xwords4/linux/linuxmain.c
2011-10-28 20:54:55 -07:00
Eric House
71450b02b3 use indexing (and add binary search) to double speed of getNthWord 2011-10-28 20:27:16 -07:00
Eric House
ff89ffb168 add missing backup button to fully test tile picking 2011-10-28 20:23:59 -07:00
Andy2
4df13f5617 fix missing dict language 2011-10-28 06:39:47 -07:00
Andy2
b490618c8e silence warning with cast 2011-10-28 06:34:59 -07:00
Eric House
84044fa9ee move lookup dialog into superclass so can be used from dict browser. 2011-10-27 21:10:35 -07:00
Eric House
308720186d get all word-click events and print contents -- setting up for lookup 2011-10-27 18:43:28 -07:00
Eric House
1741021c3c add search field and button. Not yet wired to do anything. 2011-10-27 18:26:48 -07:00
Eric House
ed055b83c6 export index from jni and use for fastscrolling. Works, but is a bit slow still. 2011-10-27 07:01:57 -07:00
Eric House
5282246dd6 use <cr> and previx separator, not terminator, so java-side split() doesn't end list with empty str. 2011-10-27 07:00:57 -07:00
Eric House
4818a2919d Merge branch 'android_branch' into android_browsedict 2011-10-26 22:25:54 -07:00
Eric House
42d1a48a1d don't include indices for prefixes that don't exist. 2011-10-26 22:25:21 -07:00
Eric House
412a58f6b9 make dict_makeIndex work for depth > 1. 2011-10-26 22:20:21 -07:00
Eric House
f2c4e39cd4 add dict_makeIndex(). Works, but only for depth==1 so far (A, not AA or AAA). 2011-10-26 07:10:50 -07:00
Andy2
92f692510f outline for fastscroll with thumb. Will need jin support mapping
indices <-> first letters, e.g. BB to whatever the index is of the
first word starting with BB.
2011-10-25 19:33:55 -07:00
Andy2
a7ce5a43de fix so count comes from dict; combine two jni methods into one; fix
crash in destructor.  Now an entire dict can be scrolled through if
you have the patience.
2011-10-25 18:36:12 -07:00
eehouse@eehouse.org
57487aaf3e Merge branch 'android_branch' into android_browsedict 2011-10-25 06:49:32 -07:00
Andy2
b62fe13c97 move dict iterator test into separate function and add test for
dict_getNthWord().  Still ifdef'd out.
2011-10-25 06:48:59 -07:00
Andy2
fc973079dc add first cut at dict_getNthWord. Works. Is slow. 2011-10-25 06:48:16 -07:00
Andy2
74cf751729 use existing dict iteration APIs to implement jni that adequately
displays a dict.  But I don't have a getNth in C to implement the one
I've added in java; need to add that, and caching, to speed it up.
2011-10-24 20:15:52 -07:00