From: ian <ian>
Date: Sun, 1 Jun 2008 22:18:39 +0000 (+0000)
Subject: send point commands
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=47cc8d8bc3c4e14dd0e51e65a72a9a9d8272c010;p=trains.git

send point commands
---

diff --git a/hostside/gui b/hostside/gui
index de5ecb9..c52a98d 100755
--- a/hostside/gui
+++ b/hostside/gui
@@ -8,7 +8,7 @@ proc debug {m} { puts $m }
 
 proc sconn {m} {
     global sconn
-    puts "=> $m"
+    debug "=> $m"
     puts $sconn $m
 }
 
@@ -67,7 +67,6 @@ proc movpos-button-setdisplay {mid} {
 	default { manyset [lindex $poslocs $posn] x y }
     }
     place $w -anchor center -x $x -y $y
-puts "  $key $posn   place $w -anchor center -x $x -y $y"
 }
 
 proc bgerror {emsg} {
@@ -82,7 +81,7 @@ proc bgerror {emsg} {
 proc gui-pipe-readable {args} {
     global gui_pipe
     while {[gets $gui_pipe l] >= 0} {
-	puts "<gui-plan $l"
+	debug "<gui-plan $l"
     }
     if {[eof $gui_pipe]} {
 	close $gui_pipe
@@ -91,12 +90,13 @@ proc gui-pipe-readable {args} {
 }
 
 proc movpos-invoked {mid} {
+    global movfeatcommand
     movpos-button-gvars $mid
     switch -exact $posn {
 	0 { set new_posn 1 }
 	default { set new_posn 0 }
     }
-    puts "would set to $new_posn"
+    sconn "$movfeatcommand $seg $feat $new_posn"
 }
 
 proc train-event-eof {} {
@@ -155,9 +155,10 @@ register-event {^=connected} {} {
 
 register-event {^=failed} {} { error "multiplexer failed: $l" }
 register-event {^=denied} {} { error "multiplexer denied us: $l" }
+# register-event {^\+nack} {} { error "multiplexer does not understand" }
 
 append event_dispatch_body {
-    puts "ignored $l"
+    debug "ignored $l"
 }
 
 proc train-event-inputline {sconn l} $event_dispatch_body
@@ -181,7 +182,6 @@ proc layout-subseg-end {seg feat posn x y} {
     set sx [expr {$sx + $x}]
     set sy [expr {$sy + $y}]
     set sse [list $n $sx $sy]
- puts "$cpage $seg $feat $posn  $x $y : $sse"
     if {[string length $posn]} { layout-subseg-end $seg $feat {} $x $y }
 }
 
@@ -199,7 +199,6 @@ proc movpos-bindkey-1 {cpage key seg feat} {
     global posdeviation
     manyset [subseg-end-get-centroid $cpage $seg $feat {}] mx my
     set mid $seg/$feat
- puts "$mid centroid $mx $my"
     foreach posn {0 1} {
 	manyset [subseg-end-get-centroid $cpage $seg $feat $posn] x y
 	set dx [expr {$x-$mx}]; set dy [expr {$y-$my}]
@@ -212,7 +211,6 @@ proc movpos-bindkey-1 {cpage key seg feat} {
     lappend poslocs [list $mx $my]
     upvar #0 mp_details($mid) details
     set details [list $cpage $key $seg $feat $poslocs]
- puts "$mid  $details"
 
     bind . <Key-[string tolower $key]> [list movpos-invoked $mid]
 }
@@ -222,7 +220,6 @@ proc layout-data {} {
     upvar #0 ld_sse/$cpage sse
     catch { unset sse }
     set f ../layout/ours.dgram-$cpage.overlay-info
-    puts $f
     source $f
 
     upvar #0 movpos_bindings($cpage) bindings
@@ -245,6 +242,7 @@ proc main {} {
     setting server railway {[[0-9a-z:].*}
     setting geometry {} {[-+]\d+[-+]\d+}
     setting posdeviation 10 {\d+}
+    setting movfeatcommand {movfeat++} {(?:!movfeat|movfeat\+?\+?)}
     uplevel #0 source gui-config
     parse-argv {}
     foreach cpage $pages {