X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=applet.tcl;h=59a67ffcc185d136f8a6fe32499b85d7bf69f65f;hb=refs%2Fheads%2Fmaster;hp=66d1a81251e26ae700dc02f056bacd57d5fe2b93;hpb=37338efc873355a4ba7ec6994283e75a1fc1d7c3;p=chiark-tcl-applet.git

diff --git a/applet.tcl b/applet.tcl
index 66d1a81..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
@@ -49,36 +45,44 @@ 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 .
-
-tktray::icon .i -class example
-.i configure -docked 1
+namespace eval applet {
 
-fconfigure stdout -buffering line
+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 -----
 
@@ -91,15 +95,15 @@ proc menubuttonpressed {b x y} {
     variable posted
     tooltip-cancel
     if {$posted == $b} {
-	puts "unpost $posted toggle"
+	debug::debug "unpost $posted toggle"
      	.m$posted unpost
 	set posted 0
     } elseif {[winfo exists .m$b]} {
 	if {$posted} {
 	    .m$posted unpost
-	    puts "unpost $posted other"
+	    debug::debug "unpost $posted other"
 	}
-	puts "post $b"
+	debug::debug "post $b"
 	set posted $b
 	.m$b post $x $y
     }
@@ -172,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
 }
 
@@ -190,9 +196,32 @@ proc setimage {image} {
 variable subwindow_on_destroying
 variable subwindow_on_ready
 
-proc subwindow-need-recreate {} {
+variable w 50
+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 {evtype why} {
+    variable orientation
     variable innerwindow_after
-puts "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]
 }
@@ -201,12 +230,13 @@ 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
+    variable orientation
     unset innerwindow_after
 
-puts RESETUP
-
+    debug::debug RESETUP
 
     if {![winfo exists .i.i]} return
     destroy [frame .i.i.make-exist]
@@ -214,39 +244,35 @@ puts RESETUP
     uplevel #0 $subwindow_on_destroying
     catch { destroy .i.i.b }
 
-    frame .i.i.b -background darkblue -bd 1
+    set orientation [.i orientation]
+    debug::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]
+    #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"
     }
 }
 
@@ -255,15 +281,14 @@ 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 {} {
     variable subproc
-    puts "DESTROYING $subproc"
+    debug::debug "DESTROYING $subproc"
 
     catch { destroy .i.i.b.c }
 
@@ -274,9 +299,10 @@ proc subproc-destroying {} {
     }
 }
 
-proc subproc-ready {} {
+proc subproc-ready {orientation} {
     variable subproc
-    puts "READY $subproc"
+    variable subproc_orientation $orientation
+    debug::debug "READY $subproc"
 
     frame .i.i.b.c -container 1 -background orange
     pack .i.i.b.c -fill both -side left -expand 1
@@ -292,18 +318,19 @@ proc subproc-ready {} {
 	    error "unexpected state $subproc"
 	}
     }
-    puts "READY-done $subproc"
+    debug::debug "READY-done $subproc"
 }
 
 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]]
 
-    puts "RUN-CHILD $subproc"
+    debug::debug "RUN-CHILD $subproc"
     set now [clock seconds]
     lappend ratelimit $now
     while {[lindex $ratelimit 0] < {$now - 10}} {
@@ -318,11 +345,11 @@ proc run-child {} {
     set subproc [subproc::fork applet::child-died {
 	execl [lindex $cmd 0] [lrange $cmd 1 end]
     }]
-    puts "FORKED $subproc"
+    debug::debug "FORKED $subproc"
 }
 
 proc child-died {how how2} {
-    puts "DIED $how $how2"
+    debug::debug "DIED $how $how2"
     variable subproc
     switch -exact $subproc {
 	old {
@@ -331,7 +358,7 @@ proc child-died {how how2} {
 	}
 	default {
 	    set subproc none
-	    subwindow-need-recreate
+	    subwindow-need-recreate child-died child-died
 	}
     }
 }