X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-tcl-applet.git;a=blobdiff_plain;f=applet.tcl;h=59a67ffcc185d136f8a6fe32499b85d7bf69f65f;hp=c3c4c4e463a437f6fc4edc1ec64f1c569bcd5057;hb=HEAD;hpb=26a08255c2b85fb059d91c408c01851e87e7fa68

diff --git a/applet.tcl b/applet.tcl
index c3c4c4e..87c0a60 100644
--- a/applet.tcl
+++ b/applet.tcl
@@ -1,12 +1,8 @@
 # General purpose code for being a tray applet
 
-proc manyset {list args} {
-    foreach val $list var $args {
-        upvar 1 $var my
-        set my $val
-    }
-}
-
+# Copyright 2016,2020 Ian Jackson
+# SPDX-License-Identifier: GPL-3.0-or-later
+# There is NO WARRANTY.
 
 package require Tclx
 package require tktray
@@ -41,13 +37,6 @@ package require tktray
 #    menus, when an item is selected, call
 #      applet::msel
 #
-# Debug:
-# 
-#    Caller may call
-#       applet::setup-debug ON-DEBUG
-#    which will result in calls to [concat ON-DEBUG [list MESSAGE]]
-#    (or ON-DEBUG may be "" in which case messages are discarded)
-#
 # Icon:
 #
 #  Caller should call:
@@ -79,31 +68,21 @@ package require tktray
 #
 #  This also uses the same variables as setup-subwindow.
 
-wm withdraw .
-
-tktray::icon .i -class example
-.i configure -docked 1
-
-fconfigure stdout -buffering none
-fconfigure stderr -buffering none
-
-
 namespace eval applet {
 
-variable debug {}
+proc become {} {
+    wm withdraw .
 
-proc debug {m} {
-    variable debug
-    if {![llength $debug]} return
-    uplevel #0 $debug [list $m]
-}
+    tktray::icon .i -class example
+    .i configure -docked 1
 
-proc setup-debug {d} {
-    variable debug $d
+    fconfigure stdout -buffering none
+    fconfigure stderr -buffering none
 }
 
 # used by both menus and tooltips
 variable posted 0
+variable tooltip_offset {9 9}
 
 #----- menus -----
 
@@ -116,15 +95,15 @@ proc menubuttonpressed {b x y} {
     variable posted
     tooltip-cancel
     if {$posted == $b} {
-	debug "unpost $posted toggle"
+	debug::debug "unpost $posted toggle"
      	.m$posted unpost
 	set posted 0
     } elseif {[winfo exists .m$b]} {
 	if {$posted} {
 	    .m$posted unpost
-	    debug "unpost $posted other"
+	    debug::debug "unpost $posted other"
 	}
-	debug "post $b"
+	debug::debug "post $b"
 	set posted $b
 	.m$b post $x $y
     }
@@ -197,10 +176,12 @@ proc tooltip-set {s} {
 
 proc tooltip-show {x y} {
     variable tooltip_on_vis
-    incr x 9
-    incr y 9
+    variable tooltip_offset
+    incr x [lindex $tooltip_offset 0]
+    incr y [lindex $tooltip_offset 1]
     wm geometry .tt +$x+$y
     wm deiconify .tt
+    raise .tt
     uplevel #0 $tooltip_on_vis
 }
 
@@ -220,10 +201,27 @@ variable h 50
 variable deforient horizontal
 variable border_colour darkblue
 variable border_width 1
+variable tray_width X
+variable tray_height X
+variable orientation vertical
 
-proc subwindow-need-recreate {} {
+proc subwindow-need-recreate {evtype why} {
+    variable orientation
     variable innerwindow_after
-    debug "IW-EVENT"
+    variable tray_width
+    variable tray_height
+    debug::debug "IW-EVENT $evtype $why [winfo reqwidth .i] [winfo reqheight .i] [winfo width .i] [winfo height .i] $orientation"
+    switch -exact $orientation {
+	horizontal { set szv height }
+	vertical { set szv width }
+	unknown { return }
+    }
+    set new_sz [winfo req$szv .i]
+    if {![string compare $new_sz [set tray_$szv]]} {
+	return
+    }
+    set tray_$szv $new_sz
+#    switch -exact -- $evtype 35 { return }
     if {[info exists innerwindow_after]} return
     set innerwindow_after [after idle applet::innerwindow-resetup]
 }
@@ -235,9 +233,10 @@ proc innerwindow-resetup {} {
     variable border_colour
     variable border_width
     variable deforient
+    variable orientation
     unset innerwindow_after
 
-    debug RESETUP
+    debug::debug RESETUP
 
     if {![winfo exists .i.i]} return
     destroy [frame .i.i.make-exist]
@@ -246,7 +245,7 @@ proc innerwindow-resetup {} {
     catch { destroy .i.i.b }
 
     set orientation [.i orientation]
-    debug "orientation $orientation"
+    debug::debug "orientation $orientation"
     if {![string compare $orientation unknown]} {
 	set orientation $deforient
     }
@@ -271,9 +270,9 @@ proc setup-subwindow {on_destroying on_ready} {
     .i configure -image applet::innerwindow-ph-horizontal
 
     destroy [frame .i.make-exist]
-    destroy [frame .i.i.make-exist]
+    #destroy [frame .i.i.make-exist]
     bind .i <<IconConfigure>> { 
-	applet::subwindow-need-recreate
+	applet::subwindow-need-recreate %T "%T i=%i k=%K N=%N R=%R S=%S k=%k m=%m d=%d s=%s a=%a b=%b c=%c f=%f w,h=%w,%h o=%o p=%p t=%t x,y=%x,%y B=%B D=%D E=%E P=%P W=%W X,Y=%X,%Y"
     }
 }
 
@@ -289,7 +288,7 @@ proc setup-subproc {get_cmdline} {
 
 proc subproc-destroying {} {
     variable subproc
-    debug "DESTROYING $subproc"
+    debug::debug "DESTROYING $subproc"
 
     catch { destroy .i.i.b.c }
 
@@ -303,7 +302,7 @@ proc subproc-destroying {} {
 proc subproc-ready {orientation} {
     variable subproc
     variable subproc_orientation $orientation
-    debug "READY $subproc"
+    debug::debug "READY $subproc"
 
     frame .i.i.b.c -container 1 -background orange
     pack .i.i.b.c -fill both -side left -expand 1
@@ -319,7 +318,7 @@ proc subproc-ready {orientation} {
 	    error "unexpected state $subproc"
 	}
     }
-    debug "READY-done $subproc"
+    debug::debug "READY-done $subproc"
 }
 
 proc run-child {} {
@@ -331,14 +330,14 @@ proc run-child {} {
     set id [winfo id .i.i.b.c]
     set cmd [uplevel #0 $subproc_get_cmdline [list $id $subproc_orientation]]
 
-    debug "RUN-CHILD $subproc"
+    debug::debug "RUN-CHILD $subproc"
     set now [clock seconds]
     lappend ratelimit $now
     while {[lindex $ratelimit 0] < {$now - 10}} {
 	set ratelimit [lrange $ratelimit 1 end]
     }
     if {[llength $ratelimit] > 10} {
-	debug stderr "crashing repeatedly, quitting $ratelimit"
+	puts stderr "crashing repeatedly, quitting $ratelimit"
 	exit 127
     }
 
@@ -346,11 +345,11 @@ proc run-child {} {
     set subproc [subproc::fork applet::child-died {
 	execl [lindex $cmd 0] [lrange $cmd 1 end]
     }]
-    debug "FORKED $subproc"
+    debug::debug "FORKED $subproc"
 }
 
 proc child-died {how how2} {
-    debug "DIED $how $how2"
+    debug::debug "DIED $how $how2"
     variable subproc
     switch -exact $subproc {
 	old {
@@ -359,7 +358,7 @@ proc child-died {how how2} {
 	}
 	default {
 	    set subproc none
-	    subwindow-need-recreate
+	    subwindow-need-recreate child-died child-died
 	}
     }
 }