X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=blobdiff_plain;f=yarrg%2Fwhere-vessels;h=b9264923f6b25e4fadda724fe9db250465875cfd;hp=66d8527a6a6d88784491efcb9d41487b599676c9;hb=7d38bda05d74767d4c8ab7127f72e3704350bf28;hpb=c221fee571a483c7ff5a51703a228c254cb050f3;ds=sidebyside

diff --git a/yarrg/where-vessels b/yarrg/where-vessels
index 66d8527..b926492 100755
--- a/yarrg/where-vessels
+++ b/yarrg/where-vessels
@@ -66,6 +66,14 @@ proc errexpect-arrayget {arrayvar key} {
     errexpect-error "undefined $key"
 }
 
+proc errexpect-arrayget-boolean {arrayvar key} {
+    switch -exact [uplevel 1 [list errexpect-arrayget $arrayvar $key]] {
+    	true	{ return 1 }
+	false	{ return 0 }
+	default	{ errexpect-error "unexpected $key" }
+    }
+}
+
 proc errexpect-catch {code} {
     global errorInfo errorCode
     set rc [catch {
@@ -93,8 +101,11 @@ proc nextarg {} {
     return $v
 }
 
-set notes_loc vessel-notes
+set notes_loc {}
 set scraper {./yppedia-ocean-scraper --chart}
+set info_cache _vessel-info-cache
+set info_source rsync.yarrg.chiark.net::yarrg/vessel-info
+set no_owners 0
 
 proc parseargs {} {
     global ai argv
@@ -110,6 +121,7 @@ proc parseargs {} {
 	    --clipboard-file { load-clipboard-file [nextarg] }
 	    --local-html-dir { lappend scraper --local-html-dir=[nextarg] }
 	    --notes { glset notes_loc [nextarg] }
+	    --vessel-info-source { glset info_source [nextarg] }
 	    --debug { incr debug }
 	    default { badusage "unknown option $arg" }
 	}
@@ -120,12 +132,19 @@ proc parseargs {} {
 
 proc argdefaults {} {
     global ocean notes_loc pirate scraper
-    if {![info exists ocean] || ![info exists pirate]} {
+    if {![info exists ocean] ||
+        (![info exists pirate] && [string length $notes_loc])} {
 	set cmd {./yarrg --find-window-only --quiet}
 	if {[info exists ocean]} { lappend cmd --ocean $ocean }
 	if {[info exists pirate]} { lappend cmd --pirate $pirate }
 	manyset [split [eval exec $cmd] " "] ocean pirate
+	if {![llength $ocean] || ![llength $pirate]} {
+	    error "$ocean $pirate ?"
+	}
     }
+    if {![info exists pirate]} { set pirate {}; glset no_owners 1 }
+    if {![string length $notes_loc]} { glset no_owners 1 }
+
     lappend scraper $ocean
 }
 
@@ -180,9 +199,9 @@ proc parse-notes {} {
     }
 }
 
-proc note-info {lno vid name description} {
+proc note-info {lno vid name island description} {
     global note_infos
-    lappend note_infos [list $lno $vid $name $description]
+    lappend note_infos [list $lno $vid $name $island $description]
 }
 
 proc display-note-infos {} {
@@ -192,7 +211,7 @@ proc display-note-infos {} {
     debug "display-note-infos $nmissing [array size notes]"
 
     if {[llength $note_infos]} {
-	set tiny "[llength $note_infos] warnings"
+	set tiny "[llength $note_infos] warning(s)"
     } elseif {$nmissing && [array size notes]} {
 	set tiny "$nmissing missing"
     } else {
@@ -202,15 +221,17 @@ proc display-note-infos {} {
     set infodata {}
 
     foreach info $note_infos {
-	manyset $info lno vid name description
+	manyset $info lno vid name island description
 	append infodata "vessel"
 	append infodata " $vid"
 	if {[string length $name]} { append infodata " $name" }
+	if {[string length $island]} { append infodata " ($island)" }
 	append infodata ": " $description "\n"
     }
 
     if {$nmissing} {
-	append infodata "$nmissing vessels not mentioned in notes:\n"
+	if {[string length $infodata]} { append infodata "\n" }
+	append infodata "$nmissing vessel(s) not mentioned in notes:\n"
 	set last_island {}
 	foreach info [lsort $note_missings] {
 	    manyset $info island name vid
@@ -222,53 +243,612 @@ proc display-note-infos {} {
 	}
     }
 
-    parser-control-failed-core .ctrl.notes notes \
+    parser-control-failed-core .cp.ctrl.notes notes \
 	white blue 0 \
 	$tiny \
-	"[llength $note_infos] warnings;\
-         $nmissing vessels missing" \
+	"[llength $note_infos] warning(s);\
+         $nmissing vessel(s) missing" \
 	"Full description of warnings and missing vessels:" \
 	$infodata
 }
 
+#---------- vessel properties ----------
+
+proc info-cache-update {} {
+    global info_source info_cache
+    file mkdir $info_cache
+    exec sh -c "cp -u icons/* $info_cache/."
+
+    if {[string length $info_source]} {
+	set cmdl [list \
+		  rsync -udLKtOzm \
+		  --exclude=*~ --exclude=*.bak --exclude=.* --exclude=*.tmp \
+		  $info_source/ $info_cache 2>@ stderr]
+	debug "INFO-CACHE $cmdl"
+	eval exec $cmdl
+    }
+
+    set f [open $info_cache/vessel-info]
+    glset vessel_size_data [read $f]
+    close $f
+}
+
+proc vesselinfo-init {} {
+    global vc_game2code vc_code2abbrev vc_code2full vc_codes
+
+    global vessel_size_data
+    manyset $vessel_size_data sizeinfos subclassinfos
+
+    set vc_codes {}
+    foreach {game code abbrev full} $sizeinfos {
+	if {![regexp {^[a-z][a-z]$} $code code]} { error "bad code" }
+	if {![regexp {^[a-z][a-z]$} $abbrev abbrev]} { error "bad abbrev" }
+	lappend vc_codes $code
+	set vc_game2code($game) $code
+	set vc_code2abbrev($code) $abbrev
+	set vc_code2full($code) $full
+	load-icon $abbrev
+    }
+
+    global vsc_code2report
+    global vsc_game2code
+    set vsc_game2code(null) {}
+    set vsc_code2report() Ordinary
+    set vsc_code2report(!) "(Special/L.E.)"
+    foreach {game code full} $subclassinfos {
+	if {![regexp {^[A-Z]$} $code code]} { error "bad code" }
+	set vsc_game2code($game) $code
+	set vsc_code2report($code) $full
+    }
+
+    load-icon atsea
+    set owners {ours dot query}
+    foreach b $owners { load-icon $b }
+    foreach a {battle borrow dot} {
+	load-icon $a
+	foreach b $owners { load-icon-combine $a $b }
+    }
+}
+
+proc load-icon {icon} {
+    global info_cache
+    image create bitmap icon/$icon -file $info_cache/$icon.xbm
+}
+
+proc load-icon-combine {args} {
+    global info_cache
+    set cmd {}
+    set delim "pnmcat -lr "
+    foreach icon $args {
+	append cmd $delim " <(xbmtopbm $info_cache/$icon.xbm)"
+	set delim " <(pbmmake -white 1 1)"
+    }
+    append cmd " | pbmtoxbm"
+    debug "load-icon-combine $cmd"
+    image create bitmap icon/[join $args +] -data [exec bash -c $cmd]
+}
+
+proc code-lockown2icon {lockown} {
+    manyset [split $lockown ""] lock notown
+    set l "
+	 [lindex {battle borrow dot} $lock]
+         [lindex {ours dot query {} {} dot} $notown]
+    "
+    if {[llength $l]} { return icon/[join $l +] } { return {} }
+}
+
+proc canvas-horiz-stack {xvar xoff y bind type args} {
+    upvar 1 $xvar x
+    upvar 1 canvas canvas
+    set id [eval $canvas create $type [expr {$x+$xoff}] $y $args]
+    set bbox [$canvas bbox $id]
+#   debug "CANVAS-HORIZ-STACK $type $x $xoff $id $bbox [list $args]"
+    set x [lindex $bbox 2]
+    $canvas bind $id <ButtonPress> $bind
+    return $id
+}
+
+proc code2canvas {code canvas x yvar qty qtylen bind} {
+    global vc_code2abbrev
+    upvar 1 $yvar y
+
+    manyset [split $code _] inport size subclass lockown xabbrev
+
+    set stackx $x
+    incr stackx 2
+    set imy [expr {$y+2}]
+
+    if {!$inport} { incr qtylen -1 }
+    if {$qtylen<=0} { set qtylen {} }
+    set qty [format "%${qtylen}s" $qty]
+
+    set qtyid [canvas-horiz-stack stackx 0 $y $bind \
+		   text -anchor nw -font fixed -text $qty]
+
+    if {!$inport} {
+	canvas-horiz-stack stackx 0 $imy $bind \
+	    image -anchor nw -image icon/atsea
+	incr stackx
+    }
+    
+    upvar #0 vc_code2abbrev($size) vcabb
+    if {![info exists vcabb]} {
+	set vcabb vc-$size
+	image create bitmap icon/$vcabb -data \
+	    [exec pbmtext -builtin fixed $size | pnminvert | pnmcrop >t.pnm]
+    }
+    canvas-horiz-stack stackx -1 $imy $bind \
+	    image -anchor nw -image icon/$vcabb
+
+    if {[string length $subclass]} {
+	canvas-horiz-stack stackx 0 $y $bind \
+	    text -anchor nw -font fixed -text \
+	    $subclass
+    }
+
+    incr stackx
+    set lockownicon [code-lockown2icon $lockown]
+    if {[string length $lockownicon]} {
+	canvas-horiz-stack stackx 0 $imy $bind \
+	    image -anchor nw -image $lockownicon
+	incr stackx
+    }
+    
+    if {[string length $xabbrev]} {
+	canvas-horiz-stack stackx 0 $y $bind \
+	    text -anchor nw -font fixed -text \
+	    $xabbrev
+    }
+    
+    set bbox [$canvas bbox $qtyid]
+    set ny [lindex $bbox 3]
+    set bid [$canvas create rectangle \
+		 $x $y $stackx $ny \
+		 -fill white]
+
+    set y $ny
+    $canvas lower $bid $qtyid
+
+    $canvas bind $bid <ButtonPress> $bind
+}
+
+proc show-report-decode {code} {
+    global vc_code2full
+
+    smash-prepare
+
+    manyset [split $code _] inport sizecode subclass lockown xabbrev
+    manyset [split $lockown ""] lock notown
+    
+    report-set inport [lindex {{At Sea} {In port}} $inport]
+
+    upvar #0 vc_code2full($sizecode) sizefull
+    upvar #0 smash_sizeinexact($sizecode) sizeinexact
+    set size_report $sizefull
+    if {[info exists sizeinexact]} { set size_report "($sizefull+)" }
+    report-set size $size_report
+
+    global smash_subclass
+    if {$smash_subclass >= 2} {
+	report-set subclass "(Any class)"
+    } elseif {[
+	       upvar #0 vsc_code2report($subclass) subclass_report
+	       info exists subclass_report
+	      ]} {
+	report-set subclass $subclass_report
+    } else {
+	report-set subclass "Class \"$subclass\""
+    }
+
+    report-set lock [lindex {
+	{Battle ready} {Unlocked} {Locked}
+	{(All lock states)} {(Not battle ready)}
+    } $lock]
+
+    global no_owners notes_loc
+    if {!$no_owners} {
+	switch -exact $notown {
+	    0 { report-set own "Yours" }
+	    1 { report-set own "Other pirate's" }
+	    2 { report-set own "Owner unknown" }
+	    3 { report-set own "(All ownerships)" }
+	    4 - 5 { report-set own "(Yours/unknown)" }
+	    default { report-set own "?? $notown" }
+	}
+    }
+
+    global smash_xabbrev_map
+    if {![string length $notes_loc]} {
+    } elseif {[llength $smash_xabbrev_map]} {
+	if {[string length $xabbrev]} {
+	    report-set xabbrev "(Flags: $xabbrev)"
+	} else {
+	    report-set xabbrev "(No flags)"
+	}
+    } else {
+	if {[string length $xabbrev]} {
+	    report-set xabbrev "Notes flags: $xabbrev"
+	} else {
+	    report-set xabbrev "No flags in notes"
+	}
+    }
+}
+
+#---------- common to smashing and filtering ----------
+
+proc make-control {parent ctrl label ekind} {
+    debug "MAKE-CONTROL [list $parent $ctrl $label $ekind]"
+    label $parent.lab_$ctrl -text $label -justify left
+    $ekind $parent.$ctrl
+    manyset [grid size $parent] dummy row
+    incr row
+    grid configure $parent.lab_$ctrl -row $row -column 0 -sticky nw -pady 4
+    grid configure $parent.$ctrl -row $row -column 1 -sticky w -pady 3
+    return $parent.$ctrl
+}
+
+proc begin-control-grid {cw count rows inrow} {
+    if {!$inrow} { set inrow [expr {($count + $rows) / $rows}] }
+    upvar #0 control_grid_properties($cw) props
+    set props [list $rows $inrow]
+    return $cw
+}
+
+proc make-control-grid-elem {cw kind ix ekind args} {
+    upvar #0 control_grid_properties($cw) props
+    manyset $props rows inrow
+
+    set ew $cw.$ix
+
+    debug "MAKE-CONTROL-GRID-ELEM $cw $kind $ix $ekind $rows $inrow $ew"
+
+    eval [list $ekind $ew] $args
+
+    switch -exact $kind {
+	ix {
+	    grid configure $ew -sticky sw \
+		-row [expr {$ix / $inrow}] \
+		-column [expr {$ix % $inrow}]
+	}
+	final {
+	    grid configure $ew -sticky se \
+		-row [expr {$rows-1}] \
+		-column [expr {$inrow-1}]
+	}
+	default {
+	    error "$kind ?"
+	}
+    }
+    return $ew
+}
+
+proc control-tickbox-flip {varsvn values} {
+    upvar #0 $varsvn vars
+    foreach val $values {
+	set vars($val) [expr {!$vars($val)}]
+    }
+    redraw-needed c.-tickbox-flip $varsvn $values
+}
+
+proc populate-control-grid-tickboxes {cw rows inrow varsvn values flipvalues
+				    label_kind valvn default_get label_get} {
+    debug "POPULATE-CONTROL-GRID-TICKBOXES $cw $rows $inrow $varsvn\
+             [list $values] $label_kind $valvn"
+
+    upvar #0 $varsvn vars
+    upvar 1 $valvn val
+    set count [llength $values]
+
+    begin-control-grid $cw $count $rows $inrow
+
+    for {set ix 0} {$ix < $count} {incr ix} {
+	set val [lindex $values $ix]
+	set vars($val) [uplevel 1 $default_get]
+	set ew [make-control-grid-elem $cw ix $ix checkbutton \
+		    -variable ${varsvn}($val) \
+		    -font fixed \
+		    -command [list redraw-needed c.-g.-tickbox $cw $val]]
+	$ew configure -$label_kind [uplevel 1 $label_get]
+	switch -exact $label_kind {
+	    image { $ew configure -height 16 }
+	}
+    }
+    [make-control-grid-elem $cw final invert button] \
+	configure \
+	-text flip -command [list control-tickbox-flip $varsvn $flipvalues] \
+	-padx 0 -pady 0
+}
+
+#---------- smashing ----------
+
+proc smash-code {code} {
+    manyset [split $code _] inport size subclass lockown xabbrev
+
+    upvar #0 smash_sizemap($size) smsize
+
+    global smash_subclass
+    if {$smash_subclass > 1} {
+	set subclass {}
+    } elseif {$smash_subclass && [string length $subclass]} {
+	set subclass !
+    }
+
+    global smash_owner
+    switch $smash_owner {
+	0 { }
+	1 { regsub {[12]$} $lockown 5 lockown }
+	2 {
+	    if {[regexp {^0.} $lockown]} {
+		# battle ready / all lock states
+		set lockown 03
+	    } elseif {[regexp {^.0} $lockown]} {
+		# not battle ready / yours
+		set lockown 40
+	    } else {
+		# state (not battle ready) / not known to be yours
+		regsub {.$} $lockown 4 lockown
+	    }
+	}
+	3 { regsub {.$} $lockown {3} lockown }
+	4 { set lockown 33 }
+    }
+
+    global smash_xabbrev_map
+    set xabbrev [string map $smash_xabbrev_map $xabbrev]
+
+    return [join [list $inport $smsize $subclass $lockown $xabbrev] _]
+}
+
+proc smash-prepare {} {
+    global vc_codes smash_sizemap smash_size smash_sizeinexact
+    set mapto {}
+    catch { unset smash_sizeplus }
+    foreach size $vc_codes {
+	if {!$smash_size($size)} {
+	    set mapto $size
+	} else {
+	    set smash_sizeinexact($mapto) 1
+	}
+	set smash_sizemap($size) $mapto
+    }
+
+    global smash_xabbrev_a smash_xabbrev_b smash_xabbrev_map
+    set smash_xabbrev_map {}
+    foreach a [split $smash_xabbrev_a ""] b [split $smash_xabbrev_b ""] {
+	if {![string length $a]} continue
+	lappend smash_xabbrev_map $a $b
+    }
+    debug "SMASH-PREPAE xabbrev_map=[list $smash_xabbrev_map]"
+}
+
+proc make-smasher {sma label ekind} {
+    return [make-control .smash $sma $label $ekind]
+}
+
+proc make-radio-smasher {sma label variable descs rows inrow} {
+    set w [make-smasher $sma $label frame]
+    begin-control-grid $w [llength $descs] $rows $inrow
+    for {set i 0} {$i < [llength $descs]} {incr i} {
+	make-control-grid-elem $w ix $i \
+	    radiobutton \
+	    -variable $variable -value $i -command redraw-needed \
+	    -text [lindex $descs $i]
+    }
+}
+
+proc make-smashers {} {
+    global vc_codes vc_code2abbrev
+    set cw [make-smasher size "Size\n round\n down" frame]
+    populate-control-grid-tickboxes $cw 2 0 smash_size \
+	$vc_codes [lrange $vc_codes 1 end] \
+	image val { expr 0 } { expr {"icon/$vc_code2abbrev($val)"} }
+    $cw.0 configure -state disabled
+
+    glset smash_subclass 0
+    make-radio-smasher subclass Class smash_subclass \
+	{Show Normal/LE Hide} 1 0
+
+    global no_owners
+    glset smash_owner [expr {$no_owners ? 3 : 0}]
+    make-radio-smasher owner Owner smash_owner \
+	{Show Yours? {For you} Lock Hide} 2 3
+
+    set cw [make-smasher xabbrev "Flags" frame]
+    foreach ix {1 3} ab {a b} width {14 12} {
+	set vn smash_xabbrev_$ab
+	global $vn
+	set $vn {}
+	entry $cw.$ix -textvariable $vn -width $width
+	trace add variable $vn write [list redraw-needed $vn]
+    }
+    set ix 0
+    foreach str {y/ / /d} { label $cw.$ix -text $str; incr ix 2 }
+    eval pack [lsort [winfo children $cw]] -side left
+}
+
+#---------- filtering ----------
+
+set filters {}
+
+proc filter-values/size {} { global vc_codes; return $vc_codes }
+proc filter-icon/size {code} {
+    upvar #0 vc_code2abbrev($code) abb
+    return icon/$abb
+}
+proc filter-default/size {code} { return 1 }
+proc filter-says-yes/size {codel} {
+    set sizecode [lindex $codel 1]
+    upvar #0 filter_size($sizecode) yes
+    return $yes
+}
+
+proc filter-values/lockown {} {
+    foreach lv {0 1 2} {
+	foreach ov {0 1 2} {
+	    lappend vals "$lv$ov"
+	}
+    }
+    return $vals
+}
+proc filter-icon/lockown {lockown} { return [code-lockown2icon $lockown] }
+proc filter-default/lockown {lockown} {
+    return [regexp {^[01]|^2[^1]} $lockown]
+}
+proc filter-says-yes/lockown {codel} {
+    set lockown [lindex $codel 3]
+    upvar #0 filter_lockown($lockown) yes
+    debug "FILTER-SAYS-YES/LOCKOWN $codel $lockown $yes"
+    return $yes
+}
+
+proc filter-validate/xabbre {re} {
+    if {[catch {
+	regexp -- $re {}
+    } emsg]} {
+	regsub {^.*:\s*} $emsg {} emsg
+	regsub {^.*(.{30})$} $emsg {\1} emsg
+	return $emsg
+    }
+    return {}
+}
+proc filter-says-yes/xabbre {codel} {
+    global filter_xabbre
+    set xabbrev [lindex $codel 4]
+    return [regexp -- $filter_xabbre $xabbrev]
+}
+
+proc make-tickbox-filter {fil label rows inrow} {
+    set values [filter-values/$fil]
+
+    if {![catch { info args filter-icon/$fil }]} {
+	set label_get { filter-icon/$fil $val }
+	set label_kind image
+    } else {
+	set label_get { filter-map/$fil $val }
+	set label_kind text
+    }
+
+    set fw [make-filter $fil $label frame]
+
+    populate-control-grid-tickboxes $fw $rows $inrow filter_$fil \
+	$values $values \
+	$label_kind val { filter-default/$fil $val } $label_get
+}
+
+proc entry-filter-changed {fw fil n1 n2 op} {
+    global errorInfo
+    upvar #0 filter_$fil realvar
+    upvar #0 filterentered_$fil entryvar
+    global def_background
+    debug "entry-filter-changed $fw $fil $entryvar"
+    if {[catch {
+	set error [filter-validate/$fil $entryvar]
+	if {[string length $error]} {
+	    $fw.error configure -text $error -foreground white -background red
+	} else {
+	    $fw.error configure -text { } -background $def_background
+	    set realvar $entryvar
+	    redraw-needed
+	}
+    } emsg]} {
+	puts stderr "FILTER CHECK ERROR $emsg $errorInfo"
+    }
+}
+
+proc make-entry-filter {fil label def} {
+    global filterentered_$fil
+    upvar #0 filter_$fil realvar
+    set realvar $def
+    set fw [make-filter $fil $label frame]
+    entry $fw.entry -textvariable filterentered_$fil
+    label $fw.error
+    glset def_background [$fw.error cget -background]
+    trace add variable filterentered_$fil write \
+	[list entry-filter-changed $fw $fil]
+    pack $fw.entry $fw.error -side top -anchor w
+}
+
+proc make-filter {fil label ekind} {
+    global filters
+    lappend filters $fil
+    return [make-control .filter $fil $label $ekind]
+}
+
+proc make-filters {} {
+    make-tickbox-filter size Size 2 0
+    make-tickbox-filter lockown "Lock/\nowner" 2 6
+    make-entry-filter xabbre "Flags\n regexp" {}
+}
+
+proc filterstyle-changed {n1 n2 op} {
+    global filterstyle
+    debug "filterstyle-changed $filterstyle"
+    redraw-needed
+}
+
+proc filters-say-yes {code} {
+    global filters filterstyle
+    set codel [split $code _]
+    set lockown [lindex $codel 3]
+    switch -exact $filterstyle {
+	0 { return 1 }
+	1 { return [filter-default/lockown $lockown] }
+	2 { return [regexp {^.0} $lockown] }
+	3 { }
+	default { error $filterstyle }
+    }
+    
+    foreach fil $filters {
+	if {![filter-says-yes/$fil $codel]} {
+	    debug "FILTERS-SAY-YES $code NO $fil"
+	    return 0
+	}
+    }
+    debug "FILTERS-SAY-YES $code YES $filters"
+    return 1
+}
+    
 #---------- loading and parsing the clipboard (vessel locations) ----------
 
 proc vessel {vin} {
     global pirate notes_used note_missings newnotes
     upvar 1 $vin vi
-    set abbrev {}
-    switch -exact [errexpect-arrayget vi inPort] {
-	true		{ }
-	false		{ append abbrev ? }
-	default		{ errexpect-error "unexpected inPort" }
-    }
-    switch -exact [errexpect-arrayget vi vesselClass] {
-	smsloop		{ set sz 00sl }
-	lgsloop		{ set sz 01ct }
-	dhow		{ set sz 02dh }
-	longship	{ set sz 03ls }
-	baghlah		{ set sz 04bg }
-	merchbrig	{ set sz 05mb }
-	warbrig		{ set sz 06wb }
-	xebec		{ set sz 07xe }
-	warfrig		{ set sz 08wf }
-	merchgal	{ set sz 09mg }
-	grandfrig	{ set sz 10gf }
-	default		{ errexpect-error "unknown class" }
-    }
-    append abbrev $sz
-    switch -exact [errexpect-arrayget vi vesselSubclass] {
-	null		{ }
-	icy		{ append abbrev F }
-	default		{ errexpect-error "unknown subclass ?" }
+
+    set codel {}
+    lappend codel [errexpect-arrayget-boolean vi inPort]
+
+    set gamesize [errexpect-arrayget vi vesselClass]
+    upvar #0 vc_game2code($gamesize) size
+    if {![info exists size]} {
+	set size "($gamesize)"
+	upvar #0 vc_code2abbrev($size) vcabb
+	set vcabb vc-$size
+	set data [exec pbmtext -builtin fixed " $gamesize " \
+		 | pnminvert | pnmcrop | pbmtoxbm]
+	debug "INVENTED ICON $vcabb $data"
+	image create bitmap icon/$vcabb -data $data
+	    
+	global vc_code2full
+	set vc_code2full($size) "Type \"$gamesize\""
+    }
+    lappend codel $size
+
+    set gamesubclass [errexpect-arrayget vi vesselSubclass]
+    upvar #0 vsc_game2code($gamesubclass) subclass
+    if {[info exists subclass]} {
+	lappend codel $subclass
+    } else {
+	lappend codel ($gamesubclass)
     }
+
     switch -exact [errexpect-arrayget vi isLocked]/[ \
                    errexpect-arrayget vi isBattleReady] {
-	true/false	{ append abbrev 2- }
-	false/false	{ append abbrev 1+ }
-	false/true	{ append abbrev 0* }
+	true/false	{ set lock 2 }
+	false/false	{ set lock 1 }
+	false/true	{ set lock 0 }
 	default		{ errexpect-error "unexpected isLocked/isBattleReady" }
     }
+
     set vid [errexpect-arrayget vi vesselId]
     upvar #0 notes($vid) note
     set realname [errexpect-arrayget vi vesselName]
@@ -279,35 +859,40 @@ proc vessel {vin} {
     if {[info exists note]} {
 	manyset $note lno notename owner xabbrev
 	if {[string compare -nocase $realname $notename]} {
-	    note-info $lno $vid $realname \
-		"notes say name is $notename - perhaps renamed"
+	    note-info $lno $vid $realname $island \
+		"notes say name is $notename"
 	}
 	if {[string length $owner]} {
 	    if {![string compare $owner $pirate]} {
-		append abbrev =
+		set notown 0
 	    } else {
-		append abbrev -
+		set notown 1
 	    }
+	} else {
+	    set notown 2
 	}
 	append abbrev $xabbrev
 	set notes_used($vid) 1
 
     } else {
+	set notown 2
 	lappend note_missings [list $island $realname $vid]
     }
+
+    lappend codel "$lock$notown" $xabbrev
     lappend newnotes [list $vid $realname $owner $xabbrev]
-    
-    set kk "$island $abbrev"
-    upvar #0 count($kk) k
-    if {![info exists k]} { set k 0 }
-    incr k
+    set kk "$island [join $codel _]"
+    upvar #0 found($kk) k
+    lappend k [list $vid $realname $owner]
+ 
+    debug "CODED $kk $vid $realname"
 }
 
 set clipboard {}
 proc parse-clipboard {} {
-    global clipboard count notes notes_used newnotes
+    global clipboard found notes notes_used newnotes
 
-    catch { unset count }
+    catch { unset found }
     catch { unset notes_used }
     glset note_infos {}
     glset note_missings {}
@@ -341,7 +926,7 @@ proc parse-clipboard {} {
 	foreach vid [lsort [array names notes]] {
 	    if {![info exists notes_used($vid)]} {
 		manyset $notes($vid) lno notename
-		note-info $lno $vid $notename \
+		note-info $lno $vid $notename {} \
 		    "vessel in notes no longer found"
 	    }
 	}
@@ -368,7 +953,7 @@ proc load-chart {} {
 	yppedia_chart_parse(\*STDIN, (new IO::File ">/dev/null"),
 		sub { sprintf "%d %d", @_; },
 		sub { printf "archlabel %d %d %s\n", @_; },
-		sub { printf "island %s %s\n", @_; },
+		sub { printf "island %s {%s} %s\n", @_; },
 		sub { printf "league %s %s %s.\n", @_; },
 		sub { printf STDERR "warning: %s: incomprehensible: %s", @_; }
 			);
@@ -376,8 +961,18 @@ proc load-chart {} {
     }]]
 }
 
-
-set scale 16
+proc init-scales {} {
+    global scales scaleix scale
+    set defscale 16
+    set scales {1 2 3 4 5 6 8}
+    set e12 {10 12 15 18 22 27 33 39 47 56 68 82}
+    foreach t $e12 {
+	if {$t < $defscale} { set scaleix [llength $scales] }
+	lappend scales $t
+    }
+    foreach t [lrange $e12 0 6] { lappend scales [expr {$t * 10}] }
+    set scale [lindex $scales $scaleix]
+}
 
 proc coord {c} {
 	global scale
@@ -385,17 +980,19 @@ proc coord {c} {
 }
 
 proc chart-got/archlabel {args} { }
-proc chart-got/island {x y args} {
-#	debug "ISLE $x $y $args"
+proc chart-got/island {x y isle sizecol} {
+	debug "ISLE $x $y $isle $sizecol"
 	global canvas isleloc
-	set isleloc($args) [list $x $y]
+	set isleloc($isle) [list $x $y]
 	set sz 5
 #	$canvas create oval \
 #		[expr {[coord $x] - $sz}] [expr {[coord $y] - $sz}] \
 #		[expr {[coord $x] + $sz}] [expr {[coord $y] + $sz}] \
 #		-fill blue
+	set colour "#888"
+	if {[string match *_col $sizecol]} { set colour black }
 	$canvas create text [coord $x] [coord $y] \
-		-text $args -anchor s
+		-text $isle -anchor s -fill $colour
 }
 proc chart-got/league {x1 y1 x2 y2 kind} {
 #	debug "LEAGUE $x1 $y1 $x2 $y2 $kind"
@@ -408,8 +1005,35 @@ proc chart-got/league {x1 y1 x2 y2 kind} {
 	}
 }
 
+proc debug-filter-array {array} {
+    upvar #0 $array a
+    set m " FILTER $array"
+    foreach k [lsort [array names a]] {
+	append m " $k=$a($k)"
+    }
+    debug $m
+}
+
+proc redraw-needed {args} {
+    global redraw_after
+    debug "REDRAW NEEDED $args"
+    if {[info exists redraw_after]} return
+
+    global filterstyle
+    debug " FILTER style $filterstyle"
+    debug-filter-array filter_size
+    debug-filter-array filter_lockown
+    global filter_xabbre
+    debug " FILTER xabbre $filter_xabbre"
+
+    set redraw_after [after 250 draw]
+}
+
 proc draw {} {
-    global chart count isleloc canvas
+    global chart found isleloc canvas redraw_after islandnames smfound
+
+    catch { after cancel $redraw_after }
+    catch { unset redraw_after }
     
     $canvas delete all
 
@@ -419,36 +1043,45 @@ proc draw {} {
 	eval chart-got/$proc [lrange $l 1 end]
     }
 
+    smash-prepare
+
+    catch { unset smfound }
+    foreach key [lsort [array names found]] {
+	regexp {^(.*) (\S+)$} $key dummy islandname code
+
+	if {![filters-say-yes $code]} continue
+
+	set smcode [smash-code $code]
+	debug "smashed $code => $smcode"
+	set smkey "$islandname $smcode"
+	foreach vessel $found($key) { lappend smfound($smkey) $vessel }
+    }
+
+    set islandnames {}
     set lastislandname {}
-    foreach key [lsort [array names count]] {
-	set c $count($key)
-#	debug "SHOWING $key $c"
-	regexp {^(.*) (\S+)$} $key dummy islandname abbrev
+    foreach smkey [lsort [array names smfound]] {
+	set c [llength $smfound($smkey)]
+	regexp {^(.*) (\S+)$} $smkey dummy islandname code
+	debug "SHOWING [list $smkey $c $islandname $code l=$lastislandname]"
+
 	if {[string compare $lastislandname $islandname]} {
 		manyset $isleloc($islandname) x y
 		set x [coord $x]
 		set y [coord $y]
 		set lastislandname $islandname
+	        lappend islandnames $islandname
 #		debug "START Y $y"
 	}
-	set text $abbrev
-	regsub -all {[0-9]} $text {} text
-	if {$c > 1} {
-		set text [format "%2d%s" $c $text]
-	} else {
-		set text [format "  %s" $text]
-	}
-	set id [$canvas create text $x $y \
-		-anchor nw -font fixed \
-		-text $text]
-	set bbox [$canvas bbox $id]
-	set bid [eval $canvas create rectangle $bbox -fill white]
-	$canvas lower $bid $id
-	manyset $bbox dummy dummy dummy y
+
+	if {$c > 1} { set qty [format %d $c] } else { set qty {} }
+	code2canvas $code $canvas $x y $qty 2 \
+	    [list show-report $islandname $code]
 #	debug "NEW Y $y"
     }
 
-    panner::updatecanvas-bbox .ctrl.pan
+    panner::updatecanvas-bbox .cp.ctrl.pan
+
+    islandnames-update
 }
 
 
@@ -456,7 +1089,7 @@ proc draw {} {
 
 proc parser-control-create {w base invokebuttontext etl_title} {
     frame $w
-    button $w.do -text $invokebuttontext -command invoke_$base
+    button $w.do -text $invokebuttontext -command invoke_$base -pady 3
 
     frame $w.resframe -width 120 -height 32
     button $w.resframe.res -text {} -anchor nw \
@@ -471,6 +1104,7 @@ proc parser-control-create {w base invokebuttontext etl_title} {
     toplevel $eb
     wm withdraw $eb
     wm title $eb "where-vessels - $etl_title"
+    wm protocol $eb WM_DELETE_WINDOW [list wm withdraw $eb]
 
     label $eb.title -text $etl_title
     pack $eb.title -side top
@@ -479,17 +1113,17 @@ proc parser-control-create {w base invokebuttontext etl_title} {
     pack $eb.close -side bottom
 
     frame $eb.emsg -bd 2 -relief groove
-    label $eb.emsg.lab -text "Error:"
+    label $eb.emsg.lab -anchor nw -text "Error:"
     text $eb.emsg.text -height 1
-    pack $eb.emsg.text -side bottom
+    pack $eb.emsg.text -side bottom -fill x
     pack $eb.emsg.lab -side left
 
-    pack $eb.emsg -side top -pady 2
+    pack $eb.emsg -side top -pady 2 -fill x
 
     frame $eb.text -bd 2 -relief groove
-    pack $eb.text -side bottom -pady 2
+    pack $eb.text -side bottom -pady 2 -fill both -expand y
     
-    label $eb.text.lab
+    label $eb.text.lab -anchor nw
 
     text $eb.text.text -width 85 \
 	-xscrollcommand [list $eb.text.xscroll set] \
@@ -502,10 +1136,15 @@ proc parser-control-create {w base invokebuttontext etl_title} {
     scrollbar $eb.text.yscroll -orient vertical \
 	-command [list $eb.text.text yview]
 
-    grid configure $eb.text.lab -row 0 -column 0 -sticky w
-    grid configure $eb.text.text -row 1 -column 0
+    grid configure $eb.text.lab -row 0 -column 0 -sticky w -columnspan 2
+    grid configure $eb.text.text -row 1 -column 0 -sticky news
     grid configure $eb.text.yscroll -sticky ns -row 1 -column 1
     grid configure $eb.text.xscroll -sticky ew -row 2 -column 0
+    grid rowconfigure $eb.text 0 -weight 0
+    grid rowconfigure $eb.text 1 -weight 1
+    grid rowconfigure $eb.text 2 -weight 0
+    grid columnconfigure $eb.text 0 -weight 1
+    grid columnconfigure $eb.text 1 -weight 0
 }
 
 proc parser-control-ok-core {w base background show} {
@@ -576,13 +1215,13 @@ proc reparse {base varname old fulldesc okshow noneshow parse ok} {
     manyset [errexpect-catch {
 	uplevel 1 $parse
 	if {[string length [string trim $var]]} {
-	    parser-control-ok .ctrl.$base $base $okshow
+	    parser-control-ok .cp.ctrl.$base $base $okshow
 	} else {
-	    parser-control-none .ctrl.$base $base $noneshow
+	    parser-control-none .cp.ctrl.$base $base $noneshow
 	}
     }] failed emsg lno ei
     if {$failed} {
-	parser-control-failed-expected .ctrl.$base $base \
+	parser-control-failed-expected .cp.ctrl.$base $base \
 	    $emsg $lno $ei $fulldesc $var
 	set var $old
 	uplevel 1 $parse
@@ -591,10 +1230,41 @@ proc reparse {base varname old fulldesc okshow noneshow parse ok} {
     }
 }
 
+#---------- island names selection etc. ----------
+
+proc islandnames-update {} {
+    global islandnames
+    .islands.count configure -text [format "ships at %d island(s)" \
+					[llength $islandnames]]
+}
+
+proc islandnames-select {} {
+    .islands.clip configure -relief sunken -state disabled
+    selection own -command islandnames-deselect .islands.clip
+}
+proc islandnames-deselect {} {
+    .islands.clip configure -relief raised -state normal
+}
+
+proc islandnames-handler {offset maxchars} {
+    global islandnames
+    return [string range [join $islandnames ", "] \
+		$offset [expr {$offset+$maxchars-1}]]
+}
+
 #---------- main user interface ----------
 
 proc widgets-setup {} {
-    global canvas debug pirate ocean
+    global canvas debug pirate ocean filterstyle notes_loc
+
+    wm geometry . 1200x800
+    if {[string length $pirate]} {
+	wm title . "where-vessels - $pirate on the $ocean ocean"
+    } else {
+	wm title . "where-vessels - $ocean ocean"
+    }
+
+    #----- map -----
 
     frame .f -border 1 -relief groove
     set canvas .f.c
@@ -602,44 +1272,155 @@ proc widgets-setup {} {
     pack $canvas -expand 1 -fill both
     pack .f -expand 1 -fill both -side left
 
-    frame .ctrl
-    pack .ctrl -side right
+    #----- control panels and filter -----
+
+    frame .cp
+    frame .smash -relief groove -bd 2 -padx 1
+    frame .filter -relief groove -bd 2 -padx 1
+    frame .islands -pady 2
+    pack .cp .filter .islands .smash -side top
+
+    label .smash.title -text {Display/combine details}
+    grid .smash.title -row 0 -column 0 -columnspan 2
+
+    set filterstyle 1
+    trace add variable filterstyle write filterstyle-changed
+
+    frame .filter.title
+    label .filter.title.title -text Show
+    pack .filter.title.title -side left
+    for {set fing 0} {$fing < 4} {incr fing} {
+	radiobutton .filter.title.f$fing \
+	    -variable filterstyle -value $fing \
+	    -text [lindex {All Useable Mine These:} $fing]
+	pack .filter.title.f$fing -side left
+    }
+
+    grid configure .filter.title -row 0 -column 0 -columnspan 2
+
+    #----- control panel -----
+
+    frame .cp.ctrl
+    pack .cp.ctrl -side left -anchor n
 
     debug "BBOX [$canvas bbox all]"
 
     panner::canvas-scroll-bbox .f.c
-    panner::create .ctrl.pan .f.c 120 120 $debug
+    panner::create .cp.ctrl.pan .f.c 120 120 $debug
 
-    pack .ctrl.pan -side top -pady 10 -padx 5
-    frame .ctrl.zoom
-    pack .ctrl.zoom -side top
+    pack .cp.ctrl.pan -side top -pady 0 -padx 5
+    frame .cp.ctrl.zoom
+    pack .cp.ctrl.zoom -side top
 
-    button .ctrl.zoom.out -text - -font {Courier 16} -command {zoom /2}
-    button .ctrl.zoom.in  -text + -font {Courier 16} -command {zoom *2}
-    pack .ctrl.zoom.out .ctrl.zoom.in -side left
+    foreach inout {out in} minplus {- +} {
+	button .cp.ctrl.zoom.$inout -text $minplus -font {Courier 16} \
+	    -command "zoom ${minplus}1" -pady 0
+	pack .cp.ctrl.zoom.$inout -side left
+    }
 
-    parser-control-create .ctrl.acquire \
+    parser-control-create .cp.ctrl.acquire \
 	acquire Acquire \
 	"Clipboard parsing error" \
 	
-    pack .ctrl.acquire -side top -pady 2
+    pack .cp.ctrl.acquire -side top -pady 2
 
-    parser-control-create .ctrl.notes \
+    parser-control-create .cp.ctrl.notes \
 	notes "Reload notes" \
 	"Vessel notes loading report" \
+
+    pack .cp.ctrl.notes -side top -pady 2
+
+    if {![string length $notes_loc]} {
+	.cp.ctrl.notes.do configure -state disabled
+    }	
 	
-    pack .ctrl.notes -side top -pady 2
+    #----- island name count and copy -----
+
+    label .islands.count
+    button .islands.clip -text "copy island names" -pady 2 -padx 2 \
+	 -command islandnames-select
+    selection handle .islands.clip islandnames-handler
+    pack .islands.count .islands.clip -side left
+
+    #----- decoding etc. report -----
+
+    frame .cp.report
+    pack .cp.report -side left -anchor n
+
+    label .cp.report.island -text { }
 
-    wm geometry . 1024x480
-    wm title . "where-vessels - $pirate on the $ocean ocean"
+    canvas .cp.report.abbrev -width 1 -height 15
+
+    frame .cp.report.code
+    label .cp.report.code.lab -text Code:
+    glset report_code { }
+    entry .cp.report.code.code -state readonly \
+	-textvariable report_code -width 15
+    pack .cp.report.code.lab .cp.report.code.code -side left
+    frame .cp.report.details -bd 2 -relief groove -padx 2 -pady 2
+
+    listbox .cp.report.list -height 5
+
+    pack .cp.report.island .cp.report.abbrev .cp.report.details \
+	.cp.report.list -side top
+    #pack .cp.report.code -side top
+    pack configure .cp.report.details -fill x
+
+    foreach sw {inport size subclass lock own xabbrev} {
+	label .cp.report.details.$sw -text { }
+	pack .cp.report.details.$sw -side top -anchor w
+    }
+}
+
+proc report-set {sw val} { .cp.report.details.$sw configure -text $val }
+
+proc show-report {islandname code} {
+    global no_owners
+    
+    .cp.report.island configure -text $islandname
+
+    .cp.report.abbrev delete all
+    set y 2
+    code2canvas $code .cp.report.abbrev 5 y {} 0 {}
+    manyset [.cp.report.abbrev bbox all] minx dummy maxx dummy
+    .cp.report.abbrev configure -width [expr {$maxx-$minx+4}]
+
+    glset report_code $code
+    show-report-decode $code
+
+    set kk "$islandname $code"
+    upvar #0 smfound($kk) k
+
+    .cp.report.list delete 0 end
+
+    foreach elem $k {
+	manyset $elem vid name owner
+	lappend owned($owner) $name
+    }
+
+    foreach owner [lsort [array names owned]] {
+	if {[string length $owner]} {
+	    set owndesc "$owner's"
+	} else {
+	    set owndesc "Owner unknown"
+	}
+	if {!$no_owners} {
+	    .cp.report.list insert end "$owndesc:"
+	}
+	foreach name $owned($owner) {
+	    .cp.report.list insert end " $name"
+	}
+    }
 }
 
-proc zoom {extail} {
-    global scale canvas
-    set nscale [expr "\$scale $extail"]
-    debug "ZOOM $scale $nscale"
-    if {$nscale < 1 || $nscale > 200} return
-    set scale $nscale
+proc zoom {amt} {
+    global scaleix scales scale canvas
+    incr scaleix $amt
+    if {$scaleix < 0} { set scaleix 0 }
+    set nscales [llength $scales]
+    if {$scaleix >= $nscales} { set scaleix [expr {$nscales-1}] }
+    set scale [lindex $scales $scaleix]
+    debug "ZOOM $amt $scaleix $scale"
     draw
 }
 
@@ -650,7 +1431,7 @@ proc invoke_acquire {} {
     if {[catch {
 	set clipboard [clipboard get]
     } emsg]} {
-	parser-control-failed-unexpected .ctrl.acquire acquire \
+	parser-control-failed-unexpected .cp.ctrl.acquire acquire \
 	    $emsg "fetching clipboard:\n\n$errorInfo"
 	return
     }
@@ -671,7 +1452,7 @@ proc invoke_notes {} {
     if {[catch {
 	load-notes
     } emsg]} {
-	parser-control-failed-unexpected .ctrl.notes notes \
+	parser-control-failed-unexpected .cp.ctrl.notes notes \
 	    $emsg "loading $notes_loc:\n\n$errorInfo"
 	return
     }
@@ -688,13 +1469,39 @@ proc invoke_notes {} {
 
 #---------- main program ----------
 
+init-scales
 parseargs
 argdefaults
 httpclientsetup where-vessels
+info-cache-update
+vesselinfo-init
 load-chart
 widgets-setup
+make-filters
+make-smashers
 
 set notes_data {}
-after idle invoke_notes
+if {[catch { parse-clipboard } emsg]} {
+    puts stderr "$emsg\n$errorInfo"
+    exit 1
+}
+if {[string length $notes_loc]} {
+    after idle invoke_notes
+}
 
 draw
+
+if {$debug} {
+    package require Tclx
+    commandloop -async \
+	-prompt1 { return "where-vessels% " } \
+	-prompt2 { return "> " }
+}
+
+# some runes I use:
+#
+# offline development
+#   ./where-vessels --notes ~/vessel-notes --vessel-info-source '' --pirate Aristarchus --ocean Midnight --debug --local-html-dir . --clipboard-file ~/clipboard-aristarchus
+#
+# updating published vessel info
+#   rsync -r --exclude=\*~ yarrg/icons/. ijackson@chiark.greenend.org.uk:/home/ftp/users/ijackson/yarrg/vessel-info/.