X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=pctb%2Fdictionary-manager;h=63c096dee04b9a45a733bb554832498b68012233;hp=fe794422708eaa066fded89bc3089393d5822d73;hb=c3bdac1bb1e4dd2ac8f7934748232d3cd2e477ad;hpb=63d118ba305b2ce65523a11941cec11728fdaf34

diff --git a/pctb/dictionary-manager b/pctb/dictionary-manager
index fe79442..63c096d 100755
--- a/pctb/dictionary-manager
+++ b/pctb/dictionary-manager
@@ -404,7 +404,7 @@ proc required/pixmap {} {
     set data [exec pnmscale 2 << $ppm]
     image create photo image/main -data $data
 
-    set alloptions [exec ./dictionary-pixmap-options $unk_what]
+    set alloptions [exec ./database-info-fetch $unk_what]
 
     select_database pixmap
 
@@ -741,7 +741,7 @@ proc recursor//01 {z1} {
     global mul rhsmost_max cols glyphsdone cur_0 cur_1
     global all_contexts
     upvar #0 cur_$z1 cur
-    .d.csr.csr.l configure -text {adjust}
+    .d.csr.csr.l configure -text "adjust [char_get_definition_context_actual]"
     place .d.csr.csr -x [expr {$cur*$mul - 7}]
 
     set okctxts [char_get_definition_contexts]
@@ -750,7 +750,10 @@ proc recursor//01 {z1} {
     foreach ctx [lsort [array names all_contexts]] {
 	set key [string range $ctx 0 0]
 	if {[lsearch -exact $okctxts $ctx] >= 0} {
-	    bind_key [string tolower $key] [list set new_context $ctx]
+	    bind_key [string tolower $key] "
+		[list set new_context $ctx]
+                recursor
+            "
 	} else {
 	    bind_key [string tolower $key] {}
 	}
@@ -787,9 +790,11 @@ proc othercursor {} {
 proc char_start_define_text {} {
     global cur_0 cur_1 cur_mode
     if {$cur_0 == $cur_1} return
-    if {![string length [char_get_definition_context_actual]]} return
+    set cdgdca [char_get_definition_context_actual]
+    if {![string length $cdgdca]} return
     .d.csr.csr.e delete 0 end
     set cur_mode text
+    .d.csr.csr.l configure -text "define $cdgdca:"
     recursor
 }
 
@@ -801,7 +806,6 @@ proc recursor/text {} {
 	{Escape   {abandon entry}}
     }
     unbind_all_keys
-    .d.csr.csr.l configure -text {define:}
     pack .d.csr.csr.e -side left
     focus .d.csr.csr.e
     bind .d.csr.csr.e <Key-Return> {