X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=blobdiff_plain;f=pctb%2Fshow-thing.tcl;h=440f9c6a13a0cc88b994e7bbfd7f76defb9d9dff;hp=19912cbb47aab980855ea38e441fb577ddd27e5b;hb=8787ee59f6840de63bac432b516a30d0dfe22c84;hpb=8ca929d6e99e7c48659061a7215a55cd533a4c42

diff --git a/pctb/show-thing.tcl b/pctb/show-thing.tcl
index 19912cb..440f9c6 100755
--- a/pctb/show-thing.tcl
+++ b/pctb/show-thing.tcl
@@ -3,11 +3,12 @@
 # usage:
 #  run show-thing without args
 #  then on stdin write
-#     one line which is a Tcl list for foolist
+#     one line which is a Tcl list for unk_{l,r} unk_contexts glyphsdone
 #     the xpm in the format expected
 #  then expect child to raise SIGSTOP or exit 0 or exit nonzero
 #  if child raised SIGSTOP, check database was updated
 
+
 proc manyset {list args} {
     foreach val $list var $args {
         upvar 1 $var my
@@ -15,14 +16,92 @@ proc manyset {list args} {
     }
 }
 
+
+#---------- display core ----------
+
 set mul 6
 set inter 1
 
 set gotsh 20
 set csrh 20
+set ctxh 20
+
+proc init_widgets {} {
+    # idempotent
+    global csrh gotsh ctxh
+
+    if {[winfo exists .d]} return
+    
+    frame .d
+
+    image create bitmap image/main
+    label .d.mi -image image/main -borderwidth 0
+
+    frame .d.csr -bg black -height $csrh
+    frame .d.got -bg black -height $gotsh
+    frame .d.ctx -bg black
+
+    image create bitmap image/cursor -data \
+{#define csr_width 11
+#define csr_height 11
+static unsigned char csr_bits[] = {
+   0x20, 0x00, 0x20, 0x00, 0x20, 0x00, 0x21, 0x04, 0x22, 0x02, 0x25, 0x05,
+   0xaa, 0x02, 0x74, 0x01, 0xa8, 0x00, 0x70, 0x00, 0x20, 0x00};
+}
+
+    frame .d.csr.csr
+    label .d.csr.csr.l -image image/cursor -compound left
+    entry .d.csr.csr.e -bd 0
+    pack .d.csr.csr.l -side left
+
+    frame .d.mi.csr_0 -bg white -width 1
+    frame .d.mi.csr_1 -bg white -width 1
+
+    pack .d.csr .d.mi .d.got .d.ctx -side top
+    pack .d
+
+    frame .help
+    pack .help
+}
+
+proc show_context {maxhv x ctxs} {
+    global mul
+    upvar 1 $maxhv maxh
+    set w .d.ctx.at$x
+    if {[llength $ctxs]==1} { set fg blue } { set fg yellow }
+    label $w -bg black -fg $fg -text [join $ctxs "/\n "]
+    place $w -x [expr {$x*$mul}] -y 0
+    set wh [winfo reqheight $w]
+    if {$wh > $maxh} { set maxh $wh }
+}
+
+proc resize_widgets {} {
+    global mulcols mulrows csrh gotsh ctxh glyphsdone
+    global unk_l unk_contexts
+    
+    foreach w {.d.csr .d.got .d.ctx} {
+	$w configure -width $mulcols
+    }
+    #.d configure -height [expr {$csrh+$mulrows+$gotsh+$ctxh}]
+    foreach w {0 1} {
+	.d.mi.csr_$w configure -height $mulrows
+    }
+
+    eval destroy [winfo children .d.ctx]
+
+    set maxh 0
+    foreach {min max context got} $glyphsdone {
+	show_context maxh $min [list $context]
+    }
+    show_context maxh $unk_l $unk_contexts
+    .d.ctx configure -height $maxh
+}
+
+
+#---------- xpm input processor ----------
 
 proc read_xpm {f} {
-    global foolist mul inter rhsmost_max unk_l unk_r gotsh csrh
+    global glyphsdone mul inter rhsmost_max unk_l unk_r mulcols mulrows
     global cols rows wordmap
     
     set o {}
@@ -65,7 +144,7 @@ proc read_xpm {f} {
 		    set how q
 		} else {
 		    set ab 0
-		    foreach {min max context got} $foolist {
+		    foreach {min max context got} $glyphsdone {
 			set rhsmost_max $max
 			if {$x >= $min && $x <= $max} {
 			    set how [lindex {a b} $ab]
@@ -98,33 +177,16 @@ proc read_xpm {f} {
 	incr y
     }
     set data [exec xpmtoppm << $o]
-    image create photo main_image -data $data
-    
-    foreach w {.d .d.csr .d.got} {
-	$w configure -width $mulcols
-    }
-    .d configure -height [expr {$csrh+$mulrows+$gotsh}]
-    foreach w {0 1} {
-	.d.csr_$w configure -height $mulrows
-    }
-    place .d.got -x 0 -y [expr {$csrh+$mulrows}]
+    image create photo image/main -data $data
 }
 
-#puts $o
 
-frame .d
+#---------- per-invocation display ----------
 
-set mi main_image
-image create bitmap main_image
-label .d.mi -image $mi -borderwidth 0
-
-frame .d.csr -bg black -height $csrh
-frame .d.got -bg black -height $gotsh
-
-proc draw_foolist {} {
-    global foolist mul inter
+proc draw_glyphsdone {} {
+    global glyphsdone mul inter
     eval destroy [winfo children .d.got]
-    foreach {min max context got} $foolist {
+    foreach {min max context got} $glyphsdone {
 	frame .d.got.m$min -bd 0 -background \#888
 	label .d.got.m$min.l -text "$got" -fg white -bg black -bd 0
 	pack .d.got.m$min.l -padx 1 -pady 1
@@ -132,41 +194,23 @@ proc draw_foolist {} {
     }
 }
 
-set imcsr [image create bitmap -data \
-{#define csr_width 11
-#define csr_height 11
-static unsigned char csr_bits[] = {
-   0x20, 0x00, 0x20, 0x00, 0x20, 0x00, 0x21, 0x04, 0x22, 0x02, 0x25, 0x05,
-   0xaa, 0x02, 0x74, 0x01, 0xa8, 0x00, 0x70, 0x00, 0x20, 0x00};
-}]
-
-frame .d.csr.csr
-label .d.csr.csr.l -image $imcsr -compound left
-entry .d.csr.csr.e -bd 0
-pack .d.csr.csr.l -side left
-
-frame .d.csr_0 -bg white -width 1
-frame .d.csr_1 -bg white -width 1
-
-place .d.csr -x 0 -y 0
-place .d.mi -x 0 -y $csrh
-pack .d
-
-frame .help
-pack .help
-
 proc startup_cursor {} {
     global cur_already cur_mode cur_0 cur_1 last_ht
-    global foolist unk_l unk_r
+    global glyphsdone unk_l unk_r
     
-    set cur_already [expr {[llength $foolist]/4-1}]
+    set cur_already [expr {[llength $glyphsdone]/4-1}]
     set cur_mode 1 ;# one of:   0 1 already text
 
     set cur_0 $unk_l
     set cur_1 [expr {$unk_r+1}]
     set last_ht {}
+
+    recursor
 }
 
+
+#---------- runtime display and keystroke handling ----------
+
 proc helptext {t} {
     global last_ht
     if {![string compare $t $last_ht]} return
@@ -186,13 +230,13 @@ proc helptext {t} {
 proc recursor/0 {} { recursor//01 0 }
 proc recursor/1 {} { recursor//01 1 }
 proc recursor//01 {z1} {
-    global mul rhsmost_max cols foolist
+    global mul rhsmost_max cols glyphsdone
     upvar #0 cur_$z1 cur
     .d.csr.csr.l configure -text {adjust}
     place .d.csr.csr -x [expr {$cur*$mul - 7}]
     bind_key space { othercursor }
     bind_leftright cur_$z1 0 [expr {$cols-1}]
-    if {[llength $foolist]} {
+    if {[llength $glyphsdone]} {
 	bind_key Tab { set cur_mode already; recursor }
     } else {
 	bind_key Tab {}
@@ -226,9 +270,10 @@ proc recursor/text {} {
     pack .d.csr.csr.e -side left
     focus .d.csr.csr.e
     bind_key Return {
-	binary scan [.d.csr.csr.e get] h* hex
-	if {[string length $hex]} {
-	    RETURN_RESULT DEFINE "$cur_0 $cur_1 $hex"
+	set strq [.d.csr.csr.e get]
+	if {[regexp {^(?:[!-[]|[]-~]|\\\\|\\x[0-9a-f]{2})+} $strq]} {
+	    .d.csr.csr.e delete 0 end
+	    RETURN_RESULT DEFINE "$cur_0 $cur_1 $strq"
 	}
     }
     bind_key Escape {
@@ -241,20 +286,20 @@ proc recursor/text {} {
 
 proc recursor/already {} {
     global mul
-    global foolist
+    global glyphsdone
     global cur_already mul
-    global foolist cur_already mul
+    global glyphsdone cur_already mul
     .d.csr.csr.l configure -text {correct}
-    set rmax [lindex $foolist [expr {$cur_already*4}]]
+    set rmax [lindex $glyphsdone [expr {$cur_already*4}]]
     place .d.csr.csr -x [expr {$rmax*$mul-3}]
     bind_key Return {}
     bind_key space {}
-    bind_leftright cur_already 0 [expr {[llength $foolist]/4-1}]
+    bind_leftright cur_already 0 [expr {[llength $glyphsdone]/4-1}]
     bind_key Tab { bind_key Delete {}; set cur_mode 1; recursor }
     bind_key Delete {
-	RETURN_RESULT DELETE [lrange $foolist \
+	RETURN_RESULT DELETE [lrange $glyphsdone \
 				  [expr $cur_already*4] \
-				  [expr $cur_already*4+1]]
+				  [expr $cur_already*4+2]]
     }
     helptext {
 	{{<- ->}   {move cursor, selecting glyph to correct}}
@@ -289,12 +334,14 @@ proc leftright {var min max inc} {
 proc recursor {} {
     global csrh cur_mode cur_0 cur_1 mul
     foreach z1 {0 1} {
-	place .d.csr_$z1 -y $csrh -x [expr {[set cur_$z1] * $mul}]
+	place .d.mi.csr_$z1 -y 0 -x [expr {[set cur_$z1] * $mul}]
     }
     recursor/$cur_mode
 }
 
 
+#---------- database read and write ----------
+
 # database format:
 # series of glyphs:
 #   <context> <ncharacters> <hex>...
@@ -303,101 +350,169 @@ proc recursor {} {
 
 # $database($context 0x<bits> 0x<bits>...) = $hex
 
+set database_header {# ypp-sc-tools pctb font v1}
+
+proc db_getsl {f} {
+    if {[gets $f l] < 0} { error "unexpected db eof" }
+    return $l
+}
+    
 proc read_database {} {
-    global database
-    set f [open database r]
-    while {[gets $f l] >= 0} {
-	if {![regexp {^(\w+) (\d+) ((?:[0-9a-f]{2})+)$} $l \
-		  dummy context strl strh]} {
-	    error "bad syntax"
-	}
-	if {[string length $strh] != $strl*2} { error "$strh $strl" }
-	gets $f l; set width [format %d $l]
+    global database database_header rows database_fn
+    catch { unset database }
+    set database_fn ./charset-$rows.txt
+    set f [open $database_fn r]
+    if {[string compare [db_getsl $f] $database_header]} { error "$l ?" }
+    if {([db_getsl $f])+0 != $rows} { error "wrong h ?" }
+    while 1 {
+	set context [db_getsl $f]
+	if {![string length $context]} continue
+	if {[regexp {^\#} $context]} continue
+	if {![string compare . $context]} break
+
 	set bm $context
-	for {set x 0} {$x < $width} {incr x} {
-	    gets $f l; lappend bm [format %x 0x$l]
+	set strq [db_getsl $f]
+	while 1 {
+	    set l [db_getsl $f]
+	    if {![string length $l]} break
+	    lappend bm [format %x 0x$l]
 	}
-	set database($bm) $strh
+	set database($bm) $strq
     }
     close $f
 }
 
 proc write_database {} {
-    global database
+    global database rows database_fn database_header
     set ol {}
     foreach bm [array names database] {
-	set strh $database($bm)
-	set strs [binary format h* $strh]
-	set strdo [format "%d %s" [expr {[string length $strh]/2}] $strh]
-	set o "[lindex $bm 0] $strdo\n"
-	append o [format "%d\n" [expr {[llength $bm]-1}]]
+	set strq $database($bm)
+	set o "[lindex $bm 0]\n$strq\n"
 	foreach x [lrange $bm 1 end] { append o "$x\n" }
+	
 	lappend ol $o
     }
-    set f [open database.new w]
+    set f [open $database_fn.new w]
+    puts $f "$database_header\n$rows\n"
     foreach o [lsort $ol] {
-	puts -nonewline $f $o
+	puts $f $o
     }
     close $f
-    file rename -force database.new database
+    file rename -force $database_fn.new $database_fn
 }
 
-proc update_database/DEFINE {c0 c1 strh} {
-    global foolist unk_l unk_context wordmap database
+proc dbkey {ctx l r} {
+    global wordmap
+    set bm $ctx
+    for {set x $l} {$x <= $r} {incr x} {
+	lappend bm [format %x $wordmap($x)]
+    }
+    return $bm
+}
+
+proc update_database/DEFINE {c0 c1 strq} {
+    global glyphsdone unk_l unk_contexts wordmap database
     if {$c0 > $c1} { manyset [list $c0 $c1] c1 c0 }
     if {$c0 == $unk_l} {
-	set ncontext $unk_context
+	set ncontexts $unk_contexts
     } else {
-	foreach {l r context got} $foolist {
-	    if {$l==$c0} { set ncontext $context; break }
+	foreach {l r context got} $glyphsdone {
+	    if {$l==$c0} { set ncontexts [list $context]; break }
 	}
-	if {![exists ncontext]} {
+	if {![info exists ncontexts]} {
 	    puts stderr "must start at letter LHS!"
 	    return
 	}
     }
-    set bm $ncontext
-    for {set x $c0} {$x < $c1} {incr x} {
-	lappend bm [format %x $wordmap($x)]
+    incr c1 -1
+    foreach c $ncontexts {
+	set bm [dbkey $c $c0 $c1]
+	set database($bm) $strq
     }
-    set database($bm) $strh
+    write_database
+}
+
+proc update_database/DELETE {l r ctx} {
+    global database
+    set bm [dbkey $ctx $l $r]
+    unset database($bm)
     write_database
 }
     
 
 proc RETURN_RESULT {how what} {
+    global mainkind
     place forget .d.csr.csr
     pack forget .d.csr.csr.e
     helptext {{{ Processing }}}
     unbind_all_keys
     update idletasks
-    puts "$how $what"
+    puts stderr "$how $what"
     eval update_database/$how $what
+    done/$mainkind
 }
 
-#    bind . <Key-space> {}
+#---------- main progrm ----------
 
-proc test_main {} {
-    global foolist unk_l unk_r unk_context
-    
-    set foolist {
+proc main/test {} {
+    global glyphsdone unk_l unk_r unk_contexts
+
+    set glyphsdone {
 	7 11 1 M
 	13 17 0 a
 	19 23 0 n
     }
     set unk_l 25
     set unk_r 29
-    set unk_context 0
+    set unk_contexts Test
 
     set f [open text.xpm]
     read_xpm $f
     close $f
 
-    draw_foolist
+    read_database
+    resize_widgets
+    draw_glyphsdone
     startup_cursor
+}
+proc done/test {} {
+}
+
+proc required {} {
+    global glyphsdone unk_l unk_r unk_contexts
     
+    if {[gets stdin l]<0} {
+	if {[eof stdin]} { fconfigure stdin -blocking yes; exit 0 }
+	return
+    }
+    init_widgets
+    manyset [lrange $l 0 3] unk_l unk_r unk_contexts
+    set glyphsdone [lrange $l 3 end]
+    puts stderr "SHOW-THING GOT $l"
+
+    fileevent stdin readable {}
+
+    read_xpm stdin
+    resize_widgets
     read_database
-    recursor
+    draw_glyphsdone
+    startup_cursor
+}
+
+proc main/automatic {} {
+    fconfigure stdin -blocking no
+    fileevent stdin readable required
+}
+proc done/automatic {} {
+    exec sh -c {printf \\0 >&4}
+    fileevent stdin readable required
+}
+
+switch -exact -- $argv {
+    {}               { set mainkind test }
+    {--automatic 1}  { set mainkind automatic }
+    {--automatic*}   { error "incompatible versions - install problem" }
+    default          { error "huh $argv ?" }
 }
 
-test_main
+main/$mainkind