works again

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

diff --git a/applet.tcl b/applet.tcl
index 1a75f1419dd406f4348d08a235c31f40d8302057..8440092a9a495044e4d4c57ea28a8325a1d043a2 100644 (file)
--- a/applet.tcl
+++ b/applet.tcl
@@ -20,11 +20,16 @@
 #    which should examine b and do something appropriate.
 #    
 
+proc manyset {list args} {
+    foreach val $list var $args {
+        upvar 1 $var my
+        set my $val
+    }
+}
 
 
+package require Tclx
 package require tktray
-#load /home/ian/things/Systray/tktray-1.3.8/libtktray1.3.8.so
-
 
 wm withdraw .
 
@@ -60,7 +65,7 @@ proc msel {} {
     set posted 0
 }
 
-proc innerwindow-event {why} {
+proc innerwindow-resetup-required {why} {
     global innerwindow_after
 puts "IW-EVENT $why"
     if {[info exists innerwindow_after]} return
@@ -73,6 +78,8 @@ proc innerwindow-resetup {} {
 
 puts RESETUP
 
+    innerwindow-destroying
+
     catch { destroy .i.i.c }
     if {![winfo exists .i.i]} return
     destroy [frame .i.i.make-exist]
@@ -93,7 +100,7 @@ puts RESETUP
 #      set inner_lastw $w
 #      set inner_lasth $h
 #      innerwindow-ph-dummy configure -width $w -height 2
-       innerwindow [winfo id .i.i.b.c]
+       innerwindow-ready
 #    }
 }
 
@@ -107,7 +114,7 @@ proc setupinnerwindow {w} {
 
     destroy [frame .i.make-exist]
     destroy [frame .i.i.make-exist]
-    bind .i <<IconConfigure>> { innerwindow-event "%w" }
+    bind .i <<IconConfigure>> { innerwindow-resetup-required IconConfigure }
 }
 
 bind .i <ButtonPress> { pressed %b %X %Y }
@@ -167,3 +174,43 @@ proc tooltip_show {x y} {
 proc setimage {image} {
     .i configure -image $image
 }
+
+proc fork-then {ondeath inchild} {
+    global children errorCode errorInfo
+    foreach f {stdout stderr} {
+       if {[catch { flush $f } emsg]} {
+           catch { bgerror $emsg }
+       }
+    }
+    set pid [fork]
+    if {!$pid} { 
+       if {[catch { 
+           uplevel 1 $inchild
+       } emsg]} {
+           puts stderr "CHILD ERROR $emsg\n$errorCode\n$errorInfo\n"
+       }
+       kill KILL [id process]
+    }
+    set children($pid) $ondeath
+    return $pid
+}
+
+proc chld-handler {} {
+    global children
+    while 1 {
+       if {[catch { set got [wait -nohang] }]} break
+       if {![llength $got]} break
+       manyset $got pid how how2
+       if {[info exists children($pid)]} {
+           set l $children($pid)
+           unset children($pid)
+           if {[catch {
+               uplevel #0 [concat [list $l] $how $how2]
+           } emsg]} {
+               catch { bgerror $emsg }
+           }
+       }
+    }  
+}
+
+signal -restart trap CHLD { after idle chld-handler }