# General purpose code for being a tray applet
-proc manyset {list args} {
- foreach val $list var $args {
- upvar 1 $var my
- set my $val
- }
-}
-
-
package require Tclx
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:
#
# 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 .
namespace eval applet {
-variable debug {}
-
-proc debug {m} {
- variable debug
- if {![llength debug]} return
- uplevel #0 $debug [list $m]
-}
-
-proc setup-debug {d} {
- variable debug $d
-}
-
# used by both menus and tooltips
variable posted 0
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
}
incr y 9
wm geometry .tt +$x+$y
wm deiconify .tt
+ raise .tt
uplevel #0 $tooltip_on_vis
}
variable subwindow_on_destroying
variable subwindow_on_ready
+variable w 50
+variable h 50
+variable deforient horizontal
+variable border_colour darkblue
+variable border_width 1
+
proc subwindow-need-recreate {} {
variable innerwindow_after
- debug "IW-EVENT"
+ debug::debug "IW-EVENT"
if {[info exists innerwindow_after]} return
set innerwindow_after [after idle applet::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
unset innerwindow_after
- debug RESETUP
+ debug::debug RESETUP
if {![winfo exists .i.i]} return
destroy [frame .i.i.make-exist]
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]
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
- debug "DESTROYING $subproc"
+ debug::debug "DESTROYING $subproc"
catch { destroy .i.i.b.c }
}
}
-proc subproc-ready {} {
+proc subproc-ready {orientation} {
variable subproc
- debug "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
error "unexpected state $subproc"
}
}
- debug "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]]
- 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
}
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 {
~ian / chiark-tcl-applet.git / blobdiff