X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=blobdiff_plain;f=pctb%2Fshow-thing.tcl;h=5356c3292c7c58a276944752d6b16c325b1f5090;hp=4537e6af63b8242cd7afca15aebd1cad341f4e69;hb=2ca58afcdf02d87e31115110ecd6c83ecc5dabc7;hpb=54f10d7fe3898d21ea03d544c9c3d3f1c0561969

diff --git a/pctb/show-thing.tcl b/pctb/show-thing.tcl
index 4537e6a..5356c32 100755
--- a/pctb/show-thing.tcl
+++ b/pctb/show-thing.tcl
@@ -1,4 +1,13 @@
-#!/usr/bin/tk
+#!/usr/bin/wish
+
+# usage:
+#  run show-thing without args
+#  then on stdin write
+#     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 {
@@ -7,39 +16,133 @@ proc manyset {list args} {
     }
 }
 
-set foolist {
-    7 11 1 M
-    13 17 0 a
-    19 23 0 n
-}
-set unk_l 25
-set unk_r 29
-set unk_context 0
-
 
+#---------- display core ----------
 
 set mul 6
 set inter 1
-set rhsmost_max -1
-
-set f [open text.xpm]
-set o {}
-set y -3
-while {[gets $f l] >= 0} {
-    if {![regexp {^"(.*)",$} $l dummy l]} {
-	append o "$l\n"
-	continue
+
+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"] -justify left
+    place $w -x [expr {($x-1)*$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
     }
-    if {$y==-3} {
-	manyset $l cols rows colours cpp
-	#assert {$colours==2}
-	#assert {$cpp==1}
-	set mulcols [expr {$cols*$mul+$inter}]
-	set mulrows [expr {$rows*$mul+$inter}]
-	append o "\"$mulcols $mulrows 9 1\",\n"
-	for {set x 0} {$x<$cols} {incr x} { set wordmap($x) 0 }
-    } elseif {$y==-2} { # first pixel
-	append o \
+    #.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 contexts got} $glyphsdone {
+	show_context maxh $min $contexts
+    }
+    show_context maxh $unk_l $unk_contexts
+    .d.ctx configure -height $maxh
+}
+
+
+#---------- xpm input processor ----------
+
+proc read_xpm {f} {
+    global glyphsdone mul inter rhsmost_max unk_l unk_r mulcols mulrows
+    global cols rows wordmap
+    
+    set o {}
+    set y -3
+    while 1 {
+	if {[gets $f l] < 0} { error "huh? "}
+	if {![regexp {^"(.*)",$} $l dummy l]} {
+	    append o "$l\n"
+	    if {[regexp {^\}\;$} $l]} break
+	    continue
+	}
+	if {$y==-3} {
+	    manyset $l cols rows colours cpp
+	    if {$colours!=2 || $cpp!=1} { error "$l ?" }
+
+	    set chop_l [expr {$unk_l - 80}]
+	    set chop_r [expr {$cols - $unk_l - 100}]
+	    if {$chop_l<0} { set chop_l 0 }
+
+	    set unk_l [expr {$unk_l - $chop_l}]
+	    set unk_r [expr {$unk_r - $chop_l}]
+	    set ngd {}
+	    foreach {min max contexts got} $glyphsdone {
+		lappend ngd \
+		    [expr {$min-$chop_l}] \
+		    [expr {$max-$chop_l}] \
+		    $contexts $got
+	    }
+	    set glyphsdone $ngd
+
+	    set realcols $cols
+	    set cols [expr {$cols - $chop_l - $chop_r}]
+	    debug "NOW cols=$cols chop_l,r=$chop_l,$chop_r rows=$rows\
+                $unk_l $unk_r $ngd"
+	    
+	    set mulcols [expr {$cols*$mul+$inter}]
+	    set mulrows [expr {$rows*$mul+$inter}]
+	    append o "\"$mulcols $mulrows 9 1\",\n"
+	    for {set x 0} {$x<$cols} {incr x} { set wordmap($x) 0 }
+	} elseif {$y==-2} { # first pixel
+	    append o \
 "\"+ c #111\",
 \"a c #800\",
 \"A c #fcc\",
@@ -49,103 +152,90 @@ while {[gets $f l] >= 0} {
 \"U c #ff0\",
 \"q c #000\",
 \"Q c #ff0\",\n"
-    } elseif {$y==-1} { # 2nd pixel but we've already printed ours
-    } else {
-	set ybit [expr {1<<$y}]
-	set x 0
-        set ol "\"+"
-        set olh $ol
-	foreach c [split $l ""] {
-	    set how "u"
-	    if {$x >= $unk_l && $x <= $unk_r} {
-		set how q
+	} elseif {$y==-1} { # 2nd pixel but we've already printed ours
+	} else {
+	    set ybit [expr {1<<$y}]
+	    set x 0
+	    set ol "\"+"
+	    set olh $ol
+	    if {$chop_r>=0} {
+		set l [string range $l $chop_l end-$chop_r]
 	    } else {
-		set ab 0
-		foreach {min max context got} $foolist {
-		    set rhsmost_max $max
-		    if {$x >= $min && $x <= $max} {
-			set how [lindex {a b} $ab]
-			break
+		set l [string range $l $chop_l end]
+		append l [string repeat " " [expr -$chop_r]]
+	    }
+	    foreach c [split $l ""] {
+		set how "u"
+		if {$x >= $unk_l && $x <= $unk_r} {
+		    set how q
+		} else {
+		    set ab 0
+		    foreach {min max contexts got} $glyphsdone {
+			set rhsmost_max $max
+			if {$x >= $min && $x <= $max} {
+			    set how [lindex {a b} $ab]
+			    break
+			}
+			set ab [expr {!$ab}]
 		    }
-		    set ab [expr {!$ab}]
 		}
-	    }
-	    switch -exact $c {
-		" " { set p $how }
-		"o" {
-		    set p [string toupper $how]
-		    incr wordmap($x) $ybit
+		switch -exact $c {
+		    " " { set p $how }
+		    "o" {
+			set p [string toupper $how]
+			incr wordmap($x) $ybit
+		    }
+		    default { error "$c ?" }
 		}
-		default { error "$c ?" }
-	    }
-	    append ol "[string repeat $p [expr {$mul-$inter}]][
+		append ol "[string repeat $p [expr {$mul-$inter}]][
                          string repeat + $inter]"
-	    append olh [string repeat + $mul]
-	    incr x
+		append olh [string repeat + $mul]
+		incr x
+	    }
+	    set ole "\",\n"
+	    append ol $ole
+	    append olh $ole
+	    set olhn [string repeat $olh $inter]
+	    if {!$y} { append o $olhn }
+	    append o [string repeat $ol [expr {$mul-1}]]
+	    append o $olhn
 	}
-        set ole "\",\n"
-	append ol $ole
-	append olh $ole
-	set olhn [string repeat $olh $inter]
-        if {!$y} { append o $olhn }
-        append o [string repeat $ol [expr {$mul-1}]]
-	append o $olhn
+	incr y
     }
-    incr y
+    set data [exec xpmtoppm << $o]
+    image create photo image/main -data $data
 }
 
-#puts $o
 
-set xpm [exec xpmtoppm << $o]
+#---------- per-invocation display ----------
 
-set gotsh 20
-set csrh 20
-
-frame .d -width $mulcols -height [expr {$csrh+$mulrows+$gotsh}]
-
-set mi [image create photo -data $xpm]
-label .d.mi -image $mi -borderwidth 0
-
-frame .d.csr -bg black -width $mulcols -height $csrh
-frame .d.got -bg black -width $mulcols -height $gotsh
-
-foreach {min max context got} $foolist {
-    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
-    place .d.got.m$min -x [expr {$min*$mul+$inter}] -y 0
+proc draw_glyphsdone {} {
+    global glyphsdone mul inter
+    eval destroy [winfo children .d.got]
+    foreach {min max contexts 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
+	place .d.got.m$min -x [expr {$min*$mul+$inter}] -y 0
+    }
 }
 
-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 -height $mulrows -width 1
-frame .d.csr_1 -bg white -height $mulrows -width 1
+proc startup_cursor {} {
+    global cur_already cur_mode cur_0 cur_1 last_ht
+    global glyphsdone unk_l unk_r
+    
+    set cur_already [expr {[llength $glyphsdone]/4-1}]
+    set cur_mode 1 ;# one of:   0 1 already text
 
-place .d.csr -x 0 -y 0
-place .d.mi -x 0 -y $csrh
-place .d.got -x 0 -y [expr {$csrh+$mulrows}]
-pack .d
+    set cur_0 $unk_l
+    set cur_1 [expr {$unk_r+1}]
+    set last_ht {}
 
-frame .help
-pack .help
+    recursor
+}
 
-set cur_already [expr {[llength $foolist]/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 {}
+#---------- runtime display and keystroke handling ----------
 
 proc helptext {t} {
     global last_ht
@@ -166,19 +256,20 @@ 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 {}
     }
     bind_key Return {
 	if {$cur_0 != $cur_1} {
+	    .d.csr.csr.e delete 0 end
 	    set cur_mode text
 	    recursor
 	}
@@ -206,9 +297,9 @@ 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]} {
+	    RETURN_RESULT DEFINE "$cur_0 $cur_1 $strq"
 	}
     }
     bind_key Escape {
@@ -221,20 +312,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}}
@@ -269,12 +360,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>...
@@ -283,76 +376,180 @@ 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"
-	}
-        binary scan $strw h* strh
-	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
+    if {![file exists $database_fn]} return
+    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_fn.new w]
+    puts $f "$database_header\n$rows\n"
     foreach o [lsort $ol] {
-	puts -nonewline $o
+	puts $f $o
     }
+    puts $f "."
+    close $f
+    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 contexts got} $glyphsdone {
+	    if {$l==$c0} { set ncontexts $contexts; 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
+    }
+    write_database
+}
+
+proc update_database/DELETE {l r ctxs} {
+    global database
+    foreach ctx $ctxs {
+	set bm [dbkey $ctx $l $r]
+	catch { unset database($bm) }
     }
-    set database($bm) $strh
     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"
+    debug "$how $what"
     eval update_database/$how $what
+    done/$mainkind
+}
+
+#---------- main progrm ----------
+
+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_contexts Test
+
+    set f [open text.xpm]
+    read_xpm $f
+    close $f
+
+    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]
+    debug "GOT $l"
+
+    fileevent stdin readable {}
+    fconfigure stdin -blocking yes
+
+    read_xpm stdin
+    resize_widgets
+    read_database
+    draw_glyphsdone
+    startup_cursor
 }
 
-#    bind . <Key-space> {}
+proc main/automatic {} {
+    fconfigure stdin -blocking no
+    fileevent stdin readable required
+}
+proc done/automatic {} {
+    exec sh -c {printf \\0 >&4}
+    main/automatic
+}
+
+proc debug {m} { }
+
+set mainkind test
+foreach arg $argv {
+    switch -exact -- $arg {
+	{--debug}        { proc debug {m} { puts stderr "SHOW-THING $m" } }
+	{--noop-arg}     { }
+	{--automatic-1}  { set mainkind automatic }
+	{--automatic*}   { error "incompatible versions - install problem" }
+	default          { error "huh $argv ?" }
+    }
+}
 
-read_database
-recursor
+main/$mainkind