changelog: start 1.0-3

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

diff --git a/applet.tcl b/applet.tcl
index 57270a245c6e4363d059df2e0485a2c0a07371cf..87c0a6000bb51e725f204b309ace52c94c07c258 100644 (file)
--- a/applet.tcl
+++ b/applet.tcl
@@ -1,5 +1,9 @@
 # General purpose code for being a tray applet
 
+# Copyright 2016,2020 Ian Jackson
+# SPDX-License-Identifier: GPL-3.0-or-later
+# There is NO WARRANTY.
+
 package require Tclx
 package require tktray
 
@@ -64,19 +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
+namespace eval applet {
 
-fconfigure stdout -buffering none
-fconfigure stderr -buffering none
+proc become {} {
+    wm withdraw .
 
+    tktray::icon .i -class example
+    .i configure -docked 1
 
-namespace eval applet {
+    fconfigure stdout -buffering none
+    fconfigure stderr -buffering none
+}
 
 # used by both menus and tooltips
 variable posted 0
+variable tooltip_offset {9 9}
 
 #----- menus -----
 
@@ -170,8 +176,9 @@ 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
@@ -194,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::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]
 }
@@ -209,6 +233,7 @@ proc innerwindow-resetup {} {
     variable border_colour
     variable border_width
     variable deforient
+    variable orientation
     unset innerwindow_after
 
     debug::debug RESETUP
@@ -245,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"
     }
 }
 
@@ -333,7 +358,7 @@ proc child-died {how how2} {
        }
        default {
            set subproc none
-           subwindow-need-recreate
+           subwindow-need-recreate child-died child-died
        }
     }
 }