works again

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

diff --git a/applet.tcl b/applet.tcl
index 5c6ad29c44e1f55e7ef053f6a727094337325d0b..8440092a9a495044e4d4c57ea28a8325a1d043a2 100644 (file)
--- a/applet.tcl
+++ b/applet.tcl
@@ -1,10 +1,36 @@
 
 #----- general machinery -----
 
-package require tktray
-#load /home/ian/things/Systray/tktray-1.3.8/libtktray1.3.8.so
+# Interface:
+#
+#  tk::tktray widget is called .i
+#
+# Inner window:
+#  Caller that needs access to inner window should define
+#     proc innerwindow {} { ... }
+#  and run
+#     innerwindow
+#  This will create
+#     .i.i.b      frame to contain container
+#     .i.i.b.c    actual container
+# 
+#  Button presses
+#    Caller should provide
+#       proc pressed {b x y} { ... }
+#    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
+
 wm withdraw .
 
 tktray::icon .i -class example
@@ -16,7 +42,7 @@ foreach b {1 3} {
     menu .m$b -tearoff 0
 }
 
-proc pressed {b x y} {
+proc menubuttonpressed {b x y} {
     global posted
     tooltip_cancel
     if {$posted == $b} {
@@ -39,27 +65,56 @@ proc msel {} {
     set posted 0
 }
 
-proc setupinnerwindow {} {
-    global innerwindow_after innerwindow
-    catch { after cancel $innerwindow_after }
-    catch { unset innerwindow_after }
-    if {[info exists innerwindow]} return
-    set children {}
-    foreach child [winfo children .i] {
-       if {![winfo exists $child]} continue
-       lappend children $child
-    }
-    if {[llength $children]==1} {
-       set innerwindow [lindex $children 0]
-       bind $innerwindow <Destroy> {
-           innerwindow-unavailable
-           catch { unset innerwindow }
-           after idle setupinnerwindow
-       }
-       innerwindow-available
-    } else {
-       after 5000 setupinnerwindow
-    }
+proc innerwindow-resetup-required {why} {
+    global innerwindow_after
+puts "IW-EVENT $why"
+    if {[info exists innerwindow_after]} return
+    set innerwindow_after [after idle innerwindow-resetup]
+}
+
+proc innerwindow-resetup {} {
+    global innerwindow_after
+    unset innerwindow_after
+
+puts RESETUP
+
+    innerwindow-destroying
+
+    catch { destroy .i.i.c }
+    if {![winfo exists .i.i]} return
+    destroy [frame .i.i.make-exist]
+    catch { destroy .i.i.b.c }
+    catch { destroy .i.i.b }
+    frame .i.i.b
+    pack .i.i.b -fill both -side left -expand 1
+    frame .i.i.b.c -container 1 -background orange
+    pack .i.i.b.c -fill both -side left -expand 1
+    bind .i.i <ButtonPress> { pressed %b %X %Y }
+#
+    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
+       innerwindow-ready
+#    }
+}
+
+proc setupinnerwindow {w} {
+    global inner_lastw inner_lasth
+    set inner_lastw -2
+    set inner_lasth -2
+
+    image create photo innerwindow-ph-dummy -width $w -height 2
+    .i configure -image innerwindow-ph-dummy
+
+    destroy [frame .i.make-exist]
+    destroy [frame .i.i.make-exist]
+    bind .i <<IconConfigure>> { innerwindow-resetup-required IconConfigure }
 }
 
 bind .i <ButtonPress> { pressed %b %X %Y }
@@ -119,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 }