X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2Fwhere-vessels;h=d1ec483ba62ae3ebfeddf038ae42d12027cb291c;hp=d6ce007785919ea21f67911f8d1532ac9bcc018f;hb=3bd214ddeb747d70fd970a727db8a74bc2019c99;hpb=ea3cffe854b1c540bc68cd2218fdb2be732197fa

diff --git a/yarrg/where-vessels b/yarrg/where-vessels
index d6ce007..d1ec483 100755
--- a/yarrg/where-vessels
+++ b/yarrg/where-vessels
@@ -289,7 +289,7 @@ proc vesselclasses-init {} {
     global vsc_game2code
     set vsc_game2code(null) {}
     set vsc_code2report() Ordinary
-    set vsc_code2report(!) "Special/L.E."
+    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
@@ -297,10 +297,11 @@ proc vesselclasses-init {} {
     }
 
     load-icon atsea
+    set owners {ours dot query}
+    foreach b $owners { load-icon $b }
     foreach a {battle borrow dot} {
-	foreach b {ours dot query} {
-	    load-icon-combine $a $b
-	}
+	load-icon $a
+	foreach b $owners { load-icon-combine $a $b }
     }
 }
 
@@ -324,11 +325,11 @@ proc load-icon-combine {args} {
 
 proc code-lockown2icon {lockown} {
     manyset [split $lockown ""] lock notown
-    return icon/[
-		 lindex {battle borrow dot} $lock
-		]+[
-		   lindex {ours dot query} $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} {
@@ -336,6 +337,7 @@ proc canvas-horiz-stack {xvar xoff y bind type args} {
     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
@@ -380,9 +382,12 @@ proc code2canvas {code canvas x yvar qty qtylen bind} {
     }
 
     incr stackx
-    canvas-horiz-stack stackx 0 $imy $bind \
-	image -anchor nw -image [code-lockown2icon $lockown]
-    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 \
@@ -411,8 +416,13 @@ proc show-report-decode {code} {
     report-set inport [lindex {{At Sea} {In port}} $inport]
     report-set class $vc_code2full($classcode)
 
-    upvar #0 vsc_code2report($subclass) subclass_report
-    if {[info exists subclass_report]} {
+    global smash_subclass
+    if {$smash_subclass >= 2} {
+	report-set subclass "(Any subclass)"
+    } elseif {[
+	       upvar #0 vsc_code2report($subclass) subclass_report
+	       info exists subclass_report
+	      ]} {
 	report-set subclass $subclass_report
     } else {
 	report-set subclass "Subclass \"$subclass\""
@@ -420,12 +430,15 @@ proc show-report-decode {code} {
 
     report-set lock [lindex {
 	{Battle ready} {Unlocked} {Locked}
+	{(All lock states)} {(Not battle ready)}
     } $lock]
 
     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" }
     }
 
@@ -439,6 +452,7 @@ proc show-report-decode {code} {
 #---------- smashing ----------
 
 set smash_subclass 0
+set smash_owner 0
 
 proc smash-code {code} {
     manyset [split $code _] inport class subclass lockown xabbrev
@@ -450,13 +464,35 @@ proc smash-code {code} {
 	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 }
+    }
+
     return [join [list $inport $class $subclass $lockown $xabbrev] _]
 }
 
-proc make-radio-smasher {w label variable descs} {
-    frame $w
-    label $w.label -text $label
-    pack $w.label -side left
+proc make-smasher {sma label ekind} {
+    return [make-gridded-control .smash $sma $label $ekind]
+}
+
+proc make-radio-smasher {sma label variable descs} {
+    set w [make-smasher $sma $label frame]
     for {set i 0} {$i < [llength $descs]} {incr i} {
 	radiobutton $w.v$i \
 	    -variable $variable -value $i -command redraw-needed \
@@ -526,7 +562,7 @@ proc filter-tickbox-flip {fil} {
 
 proc make-tickbox-filter {fil label rows inrow} {
     upvar #0 filter_$fil vars
-    set fw [make-filter tickbox $fil $label frame]
+    set fw [make-filter $fil $label frame]
     set values [filter-values/$fil]
     set nvalues [llength $values]
     if {!$inrow} {
@@ -578,7 +614,7 @@ proc make-entry-filter {fil label def} {
     global filterentered_$fil
     upvar #0 filter_$fil realvar
     set realvar $def
-    set fw [make-filter entry $fil $label frame]
+    set fw [make-filter $fil $label frame]
     entry $fw.entry -textvariable filterentered_$fil
     label $fw.error
     glset def_background [$fw.error cget -background]
@@ -587,15 +623,21 @@ proc make-entry-filter {fil label def} {
     pack $fw.entry $fw.error -side top -anchor w
 }
 
-proc make-filter {kind fil label ekind} {
+proc make-gridded-control {parent name label ekind} {
+    debug "MAKE-GRIDDED-CONTROL [list $parent $name $label $ekind]"
+    label $parent.lab_$name -text $label -justify left
+    $ekind $parent.$name
+    manyset [grid size $parent] dummy row
+    incr row
+    grid configure $parent.lab_$name -row $row -column 0 -sticky nw -pady 4
+    grid configure $parent.$name -row $row -column 1 -sticky w -pady 3
+    return $parent.$name
+}
+
+proc make-filter {fil label ekind} {
     global filters
-    label .filter.lab_$fil -text $label -justify left
-    $ekind .filter.$fil
     lappend filters $fil
-    set nfilters [llength $filters]
-    grid configure .filter.lab_$fil -row $nfilters -column 0 -sticky nw -pady 4
-    grid configure .filter.$fil -row $nfilters -column 1 -sticky w -pady 3
-    return .filter.$fil
+    return [make-gridded-control .filter $fil $label $ekind]
 }
 
 proc make-filters {} {
@@ -840,6 +882,9 @@ proc draw {} {
     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"
@@ -850,10 +895,8 @@ proc draw {} {
     set lastislandname {}
     foreach smkey [lsort [array names smfound]] {
 	set c [llength $smfound($smkey)]
-#	debug "SHOWING $smkey $c"
 	regexp {^(.*) (\S+)$} $smkey dummy islandname code
-
-	if {![filters-say-yes $code]} continue
+	debug "SHOWING [list $smkey $c $islandname $code l=$lastislandname]"
 
 	if {[string compare $lastislandname $islandname]} {
 		manyset $isleloc($islandname) x y
@@ -1068,11 +1111,13 @@ proc widgets-setup {} {
     pack .cp .filter .islands .smash -side top
 
     label .smash.title -text Smash
-    pack .smash.title -side top
+    grid .smash.title -row 0 -column 0 -columnspan 2
 
-    make-radio-smasher .smash.subclass Subclass smash_subclass \
+    make-radio-smasher subclass Subclass smash_subclass \
 	{Show Normal/LE Hide}
-    pack .smash.subclass -side top
+
+    make-radio-smasher owner Owner smash_owner \
+	{Show Yours? You Lock Hide}
 
     set filterstyle 1
     trace add variable filterstyle write filterstyle-changed