fix respawn error handling

[chiark-tcl-applet.git] / applet.tcl

diff --git a/applet.tcl b/applet.tcl
index e3a27eda42fd2d464ee88854b929ee48adf00b3c..133eb13d4ab3d0731f4dd0a155f2085068d21968 100644 (file)
--- a/applet.tcl
+++ b/applet.tcl
@@ -56,22 +56,28 @@ package require tktray
 #
 # Alternatively of icon, it may provide other arrangements for
 # using the provided subwindow.  Such a caller should call
-#      applet::setup-subwindow WIDTH BORDER-COLOUR BORDER-WIDTH \
-#                ON-DESTROYING ON-READY
+#      applet::setup-subwindow ON-DESTROYING ON-READY
 #  Then the main code will call ON-DESTROYING just before
-#  destroying the inner window and recreating it, and ON-READY
+#  destroying the inner window and recreating it, and
+#  [concat ON-READY [list ORIENTATION]]
 #  just after.  The inner window to use is called .i.i.b.
 #
+#  This uses variables, in the applet namespace,
+#      w h border_colour border_width deforient
+#  These should be set before setup-subwindow is called and not
+#  modified thereafter.
+#
 #  The user of the subwindow machinery may call
 #      applet::subwindow-need-recreate
 #  if for any reason the inner window should be destroyed and recreated.
 #
 # Alternatively, it may request that a subprocess be spawned
 # repeatedly with the xid of a suitable window.
-#      applet::setup-subproc WIDTH BORDER-COLOUR BORDER-WIDTH \
-#                GET-CMDLINE
-#  Then the main code will call [concat GET_CMDLINE [list XID]]
+#      applet::setup-subproc GET-CMDLINE
+#  Then the main code will call [concat GET_CMDLINE [list XID ORIENTATION]]
 #  to get the command line to run.
+#
+#  This also uses the same variables as setup-subwindow.
 
 wm withdraw .
 
@@ -88,7 +94,7 @@ variable debug {}
 
 proc debug {m} {
     variable debug
-    if {![llength debug]} return
+    if {![llength $debug]} return
     uplevel #0 $debug [list $m]
 }
 
@@ -209,6 +215,12 @@ proc setimage {image} {
 variable subwindow_on_destroying
 variable subwindow_on_ready
 
+variable w 50
+variable h 50
+variable deforient horizontal
+variable border_colour darkblue
+variable border_width 1
+
 proc subwindow-need-recreate {} {
     variable innerwindow_after
     debug "IW-EVENT"
@@ -220,8 +232,9 @@ proc innerwindow-resetup {} {
     variable innerwindow_after
     variable subwindow_on_destroying
     variable subwindow_on_ready
-    variable subwindow_border_colour
-    variable subwindow_border_width
+    variable border_colour
+    variable border_width
+    variable deforient
     unset innerwindow_after
 
     debug RESETUP
@@ -232,34 +245,30 @@ proc innerwindow-resetup {} {
     uplevel #0 $subwindow_on_destroying
     catch { destroy .i.i.b }
 
-    frame .i.i.b -background darkblue -bd 1
+    set orientation [.i orientation]
+    debug "orientation $orientation"
+    if {![string compare $orientation unknown]} {
+       set orientation $deforient
+    }
+    .i configure -image applet::innerwindow-ph-$orientation
+
+    frame .i.i.b -background $border_colour -bd $border_width
     pack .i.i.b -fill both -side left -expand 1
-#
-    global inner_lastw inner_lasth
-    #set w [winfo width .i.i]
-#    set w [winfo width .i.i]
-#    set h [winfo height .i.i]
-
-#    if {$w != $inner_lastw || $h != $inner_lasth} {
-#      set inner_lastw $w
-#      set inner_lasth $h
-#      innerwindow-ph-dummy configure -width $w -height 2
-
-    uplevel #0 $subwindow_on_ready
-#    }
+
+    uplevel #0 $subwindow_on_ready [list $orientation]
 }
 
-proc setup-subwindow {w border_colour border_width on_destroying on_ready} {
-    foreach v {border_width border_colour on_destroying on_ready} {
+proc setup-subwindow {on_destroying on_ready} {
+    variable w
+    variable h
+
+    foreach v {on_destroying on_ready} {
        variable subwindow_$v [set $v]
     }
 
-    global inner_lastw inner_lasth
-    set inner_lastw -2
-    set inner_lasth -2
-
-    image create photo applet::innerwindow-ph-dummy -width $w -height 2
-    .i configure -image applet::innerwindow-ph-dummy
+    image create photo applet::innerwindow-ph-horizontal -width $w -height 2
+    image create photo applet::innerwindow-ph-vertical -width 2 -height $h
+    .i configure -image applet::innerwindow-ph-horizontal
 
     destroy [frame .i.make-exist]
     destroy [frame .i.i.make-exist]
@@ -273,10 +282,9 @@ proc setup-subwindow {w border_colour border_width on_destroying on_ready} {
 variable subproc none
 variable ratelimit {}
 
-proc setup-subproc {w border_colour border_width get_cmdline} {
+proc setup-subproc {get_cmdline} {
     variable subproc_get_cmdline $get_cmdline
-    setup-subwindow $w $border_colour $border_width \
-       applet::subproc-destroying applet::subproc-ready
+    setup-subwindow applet::subproc-destroying applet::subproc-ready
 }
 
 proc subproc-destroying {} {
@@ -292,8 +300,9 @@ proc subproc-destroying {} {
     }
 }
 
-proc subproc-ready {} {
+proc subproc-ready {orientation} {
     variable subproc
+    variable subproc_orientation $orientation
     debug "READY $subproc"
 
     frame .i.i.b.c -container 1 -background orange
@@ -317,9 +326,10 @@ proc run-child {} {
     variable subproc
     variable ratelimit
     variable subproc_get_cmdline
+    variable subproc_orientation
 
     set id [winfo id .i.i.b.c]
-    set cmd [uplevel #0 [concat [list $subproc_get_cmdline] $id]]
+    set cmd [uplevel #0 $subproc_get_cmdline [list $id $subproc_orientation]]
 
     debug "RUN-CHILD $subproc"
     set now [clock seconds]
@@ -328,7 +338,7 @@ proc run-child {} {
        set ratelimit [lrange $ratelimit 1 end]
     }
     if {[llength $ratelimit] > 10} {
-       debug stderr "crashing repeatedly, quitting $ratelimit"
+       puts stderr "crashing repeatedly, quitting $ratelimit"
        exit 127
     }